Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build!: remove hardcoded lit dependency #80

Merged
merged 5 commits into from
Jan 9, 2024
Merged

build!: remove hardcoded lit dependency #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8cc905e
build: set version to 4.0.0-SNAPSHOT
javier-godoy Jan 9, 2024
01df50e
build: set vaadin version to 24.3.2
javier-godoy Jan 9, 2024
7f6ed5d
chore: ignore bundles
javier-godoy Jan 9, 2024
b2e4acb
build!: remove hardcoded lit dependency
javier-godoy Jan 9, 2024
b158607
fix: import customElement from lit/decorators
javier-godoy Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ types.d.ts
/frontend/index.html
vite.generated.ts
vite.config.ts
/src/main/dev-bundle
/src/main/dev-bundle
/src/main/bundles
68 changes: 5 additions & 63 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.flowingcode.vaadin.addons.demo</groupId>
<artifactId>commons-demo</artifactId>
<version>3.10.0-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>

<name>Commons Demo</name>
<description>Common classes for add-ons demo</description>
Expand All @@ -21,10 +21,10 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<vaadin.version>14.10.3</vaadin.version>
<jetty.version>9.4.36.v20210114</jetty.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<vaadin.version>24.3.2</vaadin.version>
<jetty.version>11.0.12</jetty.version>
</properties>

<organization>
Expand Down Expand Up @@ -79,36 +79,8 @@
<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<!-- Replace artifactId with vaadin-core to use only free components -->
<artifactId>vaadin-core</artifactId>
<optional>true</optional>
<exclusions>
<!-- Webjars are only needed when running in Vaadin 13 compatibility mode -->
<exclusion>
<groupId>com.vaadin.webjar</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bowergithub.insites</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bowergithub.polymer</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bowergithub.polymerelements</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bowergithub.webcomponents</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -304,36 +276,6 @@
</plugins>
</build>
</profile>

<profile>
<id>v23</id>
<properties>
<vaadin.version>23.2.10</vaadin.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
</profile>
<profile>
<id>v24</id>
<properties>
<vaadin.version>24.2.6</vaadin.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<jetty.version>11.0.12</jetty.version>
</properties>
<repositories>
<repository>
<id>vaadin-prerelease</id>
<url>https://maven.vaadin.com/vaadin-prereleases</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>vaadin-prerelease</id>
<url>https://maven.vaadin.com/vaadin-prereleases</url>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>

</project>
2 changes: 0 additions & 2 deletions src/main/java/com/flowingcode/vaadin/addons/demo/SourceCodeViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.vaadin.flow.component.HasSize;
import com.vaadin.flow.component.UI;
import com.vaadin.flow.component.dependency.JsModule;
import com.vaadin.flow.component.dependency.NpmPackage;
import com.vaadin.flow.component.html.Div;
import com.vaadin.flow.dom.Element;
import com.vaadin.flow.server.VaadinService;
Expand All @@ -36,7 +35,6 @@

@SuppressWarnings("serial")
@JsModule("./code-viewer.ts")
@NpmPackage(value = "lit", version = "2.5.0")
public class SourceCodeViewer extends Div implements HasSize {

private final Element codeViewer;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/resources/frontend/code-viewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
* #L%
*/
import {
customElement,
html,
LitElement
} from "lit-element";

import {customElement} from 'lit/decorators/custom-element.js';
import "./prism.js";

(function () {
Expand Down