JS backend: maven projects: extract library js-files to target/js/lib, set scope=test for stdlib in browser-example*
This commit is contained in:
Michael Nedzelsky
@@ -26,13 +26,13 @@
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- testing -->
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-stdlib</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- testing -->
|
||||
<dependency>
|
||||
<groupId>org.seleniumhq.selenium</groupId>
|
||||
<artifactId>selenium-java</artifactId>
|
||||
@@ -90,14 +90,14 @@
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-js-library</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<outputDirectory>${project.build.directory}/js</outputDirectory>
|
||||
<outputDirectory>${project.build.directory}/js/lib</outputDirectory>
|
||||
<includes>*.js</includes>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-js-library-example</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<outputDirectory>${project.build.directory}/js</outputDirectory>
|
||||
<outputDirectory>${project.build.directory}/js/lib</outputDirectory>
|
||||
<includes>*.js</includes>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" src="src/js/jquery.js"></script>
|
||||
<script src="target/js/kotlin.js"></script>
|
||||
<script src="target/js/kotlin-js-library-example.js"></script>
|
||||
<script src="target/js/lib/kotlin.js"></script>
|
||||
<script src="target/js/lib/kotlin-js-library-example.js"></script>
|
||||
<script type="text/javascript" src="target/js/browser-example-with-library.js"></script>
|
||||
|
||||
<!--
|
||||
|
||||
@@ -17,11 +17,17 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-stdlib</artifactId>
|
||||
<artifactId>kotlin-js-library</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- testing -->
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-stdlib</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.seleniumhq.selenium</groupId>
|
||||
<artifactId>selenium-java</artifactId>
|
||||
@@ -34,11 +40,6 @@
|
||||
<version>${selenium.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-js-library</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@@ -58,13 +59,6 @@
|
||||
<goal>js</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>compile</id>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>compile</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>test-compile</id>
|
||||
<phase>test-compile</phase>
|
||||
@@ -91,7 +85,7 @@
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-js-library</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<outputDirectory>${project.build.directory}/js</outputDirectory>
|
||||
<outputDirectory>${project.build.directory}/js/lib</outputDirectory>
|
||||
<includes>*.js</includes>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" src="src/js/jquery.js"></script>
|
||||
<script src="target/js/kotlin.js"></script>
|
||||
<script src="target/js/lib/kotlin.js"></script>
|
||||
<script type="text/javascript" src="target/js/browser-example.js"></script>
|
||||
|
||||
<!--
|
||||
|
||||
@@ -29,6 +29,9 @@
|
||||
<copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib.jar"
|
||||
tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
|
||||
overwrite="true" verbose="true"/>
|
||||
<copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib-sources.jar"
|
||||
tofile="${basedir}/target/${project.artifactId}-${project.version}-sources.jar"
|
||||
overwrite="true" verbose="true"/>
|
||||
</tasks>
|
||||
</configuration>
|
||||
<goals>
|
||||
@@ -37,29 +40,6 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.3.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>install-library</id>
|
||||
<phase>install</phase>
|
||||
<goals>
|
||||
<goal>install-file</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<file>${kotlin-dist}/kotlinc/lib/kotlin-jslib-sources.jar</file>
|
||||
<classifier>sources</classifier>
|
||||
<groupId>${groupId}</groupId>
|
||||
<artifactId>${artifactId}</artifactId>
|
||||
<version>${version}</version>
|
||||
<packaging>jar</packaging>
|
||||
<generatePom>false</generatePom>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-js-library</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<outputDirectory>${project.build.directory}/js</outputDirectory>
|
||||
<outputDirectory>${project.build.directory}/js/lib</outputDirectory>
|
||||
<includes>*.js</includes>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
|
||||
<script src="qunit.js"></script>
|
||||
|
||||
<script src="../../../target/js/kotlin.js"></script>
|
||||
<script src="../../../target/js/kotlin-js-tests.js"></script>
|
||||
<script src="../../../target/js/lib/kotlin.js"></script>
|
||||
<script src="../../../target/js/lib/kotlin-js-tests.js"></script>
|
||||
|
||||
<script src="deepEqual.js"></script>
|
||||
<script src="swarminject.js"></script>
|
||||
|
||||
Reference in New Issue
Block a user