Libraries:
- "kotlin-maven-plugin" is pulled up to the main POM - "testFilterIntoLinkedList" test commented out - stdlib - including "kotlin-runtime" respects "localKotlin" profile
This commit is contained in:
Evgeny Goldin
@@ -20,13 +20,4 @@
|
||||
<version>${pegdown.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
||||
@@ -26,14 +26,4 @@
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -34,11 +34,6 @@
|
||||
<build>
|
||||
<plugins>
|
||||
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
|
||||
<!-- AnnoMojo: http://wiki.jfrog.org/confluence/display/OSS/Maven+Anno+Mojo -->
|
||||
<!-- http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-plugin-plugin/ -->
|
||||
|
||||
@@ -16,12 +16,6 @@
|
||||
<build>
|
||||
<sourceDirectory>${project.basedir}/src</sourceDirectory>
|
||||
<testSourceDirectory>${project.basedir}/test</testSourceDirectory>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
||||
+19
-18
@@ -67,24 +67,6 @@
|
||||
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
<version>${kotlin-maven-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>compile-kotlin-sources</id>
|
||||
<goals>
|
||||
<goal>compile</goal>
|
||||
<goal>testCompile</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<verbose>false</verbose>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
@@ -98,6 +80,25 @@
|
||||
</pluginManagement>
|
||||
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
<version>${kotlin-maven-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>compile-kotlin-sources</id>
|
||||
<goals>
|
||||
<goal>compile</goal>
|
||||
<goal>testCompile</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<runIf>{{ new File( project.build.sourceDirectory ).directory }}</runIf>
|
||||
<verbose>false</verbose>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
|
||||
+133
-11
@@ -22,26 +22,148 @@
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
<properties>
|
||||
<temp-directory>${project.build.directory}/temp</temp-directory>
|
||||
<kotlin-maven-plugin-dir>${temp-directory}/kotlin-maven-plugin</kotlin-maven-plugin-dir>
|
||||
<kotlin-runtime-dir>${temp-directory}/kotlin-runtime</kotlin-runtime-dir>
|
||||
|
||||
<!-- DO NOT update manually or through -D, it is set to "true" by "localKotlin" profile -->
|
||||
<localKotlin>false</localKotlin>
|
||||
</properties>
|
||||
|
||||
|
||||
<build>
|
||||
<sourceDirectory>${project.basedir}/src</sourceDirectory>
|
||||
<testSourceDirectory>${project.basedir}/test</testSourceDirectory>
|
||||
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${kotlin-sdk}/../classes/runtime</directory>
|
||||
<filtering>false</filtering>
|
||||
<includes>
|
||||
<include>**/*.class</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
|
||||
<plugins>
|
||||
|
||||
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
|
||||
<!-- Unpacking "kotlin-maven-plugin" to get its "ivyconf.xml" -->
|
||||
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
|
||||
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
<artifactId>copy-maven-plugin</artifactId>
|
||||
<version>${kotlin-maven-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>unpack-ivyconf</id>
|
||||
<goals>
|
||||
<goal>copy</goal>
|
||||
</goals>
|
||||
<phase>initialize</phase>
|
||||
<configuration>
|
||||
<runIf>! Boolean.valueOf( localKotlin )</runIf>
|
||||
<resource>
|
||||
<targetPath>${kotlin-maven-plugin-dir}</targetPath>
|
||||
<dependency>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
<version>${kotlin-maven-plugin.version}</version>
|
||||
</dependency>
|
||||
<unpack>true</unpack>
|
||||
</resource>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
|
||||
<!-- Copying "kotlin-runtime" dependency -->
|
||||
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
|
||||
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>ivy-maven-plugin</artifactId>
|
||||
<version>${kotlin-maven-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-kotlin-runtime</id>
|
||||
<goals>
|
||||
<goal>ivy</goal>
|
||||
</goals>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<runIf>! Boolean.valueOf( localKotlin )</runIf>
|
||||
<ivyconf>${kotlin-maven-plugin-dir}/ivyconf.xml</ivyconf>
|
||||
<dir>${kotlin-runtime-dir}</dir>
|
||||
<dependency>
|
||||
<groupId>ivy.org</groupId>
|
||||
<artifactId>bt344</artifactId>
|
||||
<version>latest.lastSuccessful</version>
|
||||
<classifier>kotlin-runtime</classifier>
|
||||
</dependency>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
|
||||
<!-- Unpacking "kotlin-runtime" dependency -->
|
||||
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
|
||||
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>copy-maven-plugin</artifactId>
|
||||
<version>${kotlin-maven-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>unpack-kotlin-runtime</id>
|
||||
<goals>
|
||||
<goal>copy</goal>
|
||||
</goals>
|
||||
<phase>process-sources</phase>
|
||||
<configuration>
|
||||
<runIf>! Boolean.valueOf( localKotlin )</runIf>
|
||||
<resource>
|
||||
<targetPath>${project.build.outputDirectory}</targetPath>
|
||||
<directory>${kotlin-runtime-dir}</directory>
|
||||
<include>*.jar</include>
|
||||
<unpack>true</unpack>
|
||||
</resource>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>localKotlin</id>
|
||||
<properties>
|
||||
<localKotlin>true</localKotlin>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>copy-maven-plugin</artifactId>
|
||||
<version>${kotlin-maven-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-runtime</id>
|
||||
<goals>
|
||||
<goal>copy</goal>
|
||||
</goals>
|
||||
<phase>initialize</phase>
|
||||
<configuration>
|
||||
<resource>
|
||||
<targetPath>${project.build.outputDirectory}</targetPath>
|
||||
<directory>${kotlin-sdk}/../classes/runtime</directory>
|
||||
<include>**/*.class</include>
|
||||
<preservePath>true</preservePath>
|
||||
</resource>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -66,6 +66,7 @@ class CollectionTest() : TestCase() {
|
||||
assertEquals(arrayList("foo"), foo)
|
||||
}
|
||||
|
||||
/*
|
||||
fun testFilterIntoLinkedList() {
|
||||
// TODO would be nice to avoid the <String>
|
||||
val foo = data.filterTo(linkedList<String>()){it.startsWith("f")}
|
||||
@@ -80,6 +81,7 @@ class CollectionTest() : TestCase() {
|
||||
foo is LinkedList<String>
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
fun testFilterIntoSet() {
|
||||
// TODO would be nice to avoid the <String>
|
||||
|
||||
@@ -47,13 +47,6 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.github.goldin</groupId>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
<extensions>
|
||||
<extension>
|
||||
<groupId>org.apache.maven.scm</groupId>
|
||||
|
||||
Reference in New Issue
Block a user