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

Treat pom scope=runtime as compile to make gradle poms usable #128

Closed
wants to merge 3 commits into from
Closed

Treat pom scope=runtime as compile to make gradle poms usable #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b17a99
Treat pom scope=runtime as compile to make gradle poms usable
niloc132 Mar 1, 2022
0bb2294
Trying to add more dependencies?
niloc132 Mar 2, 2022
bc8cb5b
Stop using test-only repo
niloc132 Mar 3, 2022
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
7 changes: 5 additions & 2 deletions j2cl-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.2</version>
<executions>
<execution>
<goals>
Expand All @@ -139,14 +139,17 @@
</executions>
<configuration>
<cloneProjectsTo>${project.build.directory}/it-tests</cloneProjectsTo>
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<goals>
<goal>package -e</goal>
</goals>
<environmentVariables>
<MAVEN_OPTS>-ea</MAVEN_OPTS>
</environmentVariables>
<extraArtifacts>
<artifact>com.google.jsinterop:jsinterop-annotations:1.0.2</artifact>
<artifact>com.google.jsinterop:jsinterop:1.0.2:pom</artifact>
</extraArtifacts>
</configuration>
</plugin>

Expand Down
155 changes: 155 additions & 0 deletions j2cl-maven-plugin/src/it/gwt-modules-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>gwt-modules-project</groupId>
<artifactId>gwt-modules-project</artifactId>
<version>1.0</version>

<properties>
</properties>

<dependencies>
<dependency>
<groupId>org.gwtproject.http</groupId>
<artifactId>gwt-http</artifactId>
<version>1.0.0-RC3</version>
</dependency>
<dependency>
<groupId>org.gwtproject.json</groupId>
<artifactId>gwt-json</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<!-- Several dependencies are commented out until #127 is fixed -->
<!-- <dependency>-->
<!-- <groupId>org.gwtproject.layout</groupId>-->
<!-- <artifactId>gwt-layout</artifactId>-->
<!-- <version>1.0.0-RC1</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.gwtproject.event</groupId>-->
<!-- <artifactId>gwt-event-dom</artifactId>-->
<!-- <version>1.0.0-RC1</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.gwtproject.event</groupId>
<artifactId>gwt-event-legacy</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.gwtproject.event</groupId>
<artifactId>gwt-logical-event</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.gwtproject.animation</groupId>-->
<!-- <artifactId>gwt-animation</artifactId>-->
<!-- <version>1.0.0-RC1</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.gwtproject.aria</groupId>-->
<!-- <artifactId>gwt-aria</artifactId>-->
<!-- <version>1.0.0-RC1</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.gwtproject.dom</groupId>-->
<!-- <artifactId>gwt-dom</artifactId>-->
<!-- <version>1.0.0-RC1</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.gwtproject.xhr</groupId>
<artifactId>gwt-xhr</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.gwtproject.safehtml</groupId>
<artifactId>gwt-safehtml</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.gwtproject.safehtml</groupId>
<artifactId>gwt-safecss</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.gwtproject.regexp</groupId>
<artifactId>gwt-regexp</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.gwtproject.core</groupId>
<artifactId>gwt-core</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.gwtproject.xml</groupId>
<artifactId>gwt-xml</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.gwtproject.callback</groupId>
<artifactId>gwt-callback</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.gwtproject.timer</groupId>
<artifactId>gwt-timer</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.gwtproject.typedarrays</groupId>
<artifactId>gwt-typedarrays</artifactId>
<version>1.0.0-RC2</version>
</dependency>
<dependency>
<groupId>org.gwtproject.user.window</groupId>
<artifactId>gwt-window</artifactId>
<version>1.0.0-RC2</version>
</dependency>
<dependency>
<groupId>org.gwtproject.place</groupId>
<artifactId>gwt-places</artifactId>
<version>1.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.gwtproject.user.history</groupId>
<artifactId>gwt-history</artifactId>
<version>1.0.0-RC1</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<repositories>
<repository>
<id>google-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
</repository>
</repositories>
</project>
40 changes: 0 additions & 40 deletions j2cl-maven-plugin/src/it/settings.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/AbstractBuildMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ private Dependency.Scope translateScope(String scope) {
case Artifact.SCOPE_PROVIDED:
return Dependency.Scope.COMPILE;
case Artifact.SCOPE_RUNTIME:
return Dependency.Scope.RUNTIME;
return Dependency.Scope.BOTH;
// These two should already be removed by earlier filtering, throw anyway
case Artifact.SCOPE_IMPORT:
case Artifact.SCOPE_SYSTEM:
Expand Down