azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include the runtime classes in the mvn build stdlib

Browse Source
This commit is contained in:
James Strachan
2012-03-19 17:13:56 +00:00
parent 9333e5c11e
commit 1c408cdbda
3 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/kotlin-java/pom.xml
-9
View File
@@ -14,20 +14,11 @@
<artifactId>kotlin-java</artifactId> <artifactId>kotlin-java</artifactId>
<dependencies> <dependencies>
<!--
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>stdlib</artifactId> <artifactId>stdlib</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
-->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${project.version}</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/kotlin-runtime.jar</systemPath>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
libraries/pom.xml
+43 -28
View File
@@ -20,6 +20,7 @@
<maven.compiler.target>1.6</maven.compiler.target> <maven.compiler.target>1.6</maven.compiler.target>
<pegdown.version>1.1.0</pegdown.version> <pegdown.version>1.1.0</pegdown.version>
<surefire-version>2.5</surefire-version> <surefire-version>2.5</surefire-version>
<maven-jar-plugin.version>2.4</maven-jar-plugin.version>
</properties> </properties>
<repositories> <repositories>
@@ -65,7 +66,7 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<verbose>false</verbose> <verbose>false</verbose>
</configuration> </configuration>
</plugin> </plugin>
@@ -82,6 +83,20 @@
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-version}</version> <version>${surefire-version}</version>
@@ -109,33 +124,33 @@
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<profiles> <profiles>
<profile> <profile>
<id>localKotlin</id> <id>localKotlin</id>
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.github.goldin</groupId> <groupId>com.github.goldin</groupId>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin-maven-plugin.version}</version> <version>${kotlin-maven-plugin.version}</version>
<configuration> <configuration>
<kotlinJars> <kotlinJars>
<jar>${kotlin-sdk}/lib/kotlin-build-tools.jar</jar> <jar>${kotlin-sdk}/lib/kotlin-build-tools.jar</jar>
<jar>${kotlin-sdk}/lib/kotlin-compiler.jar</jar> <jar>${kotlin-sdk}/lib/kotlin-compiler.jar</jar>
<jar>${kotlin-sdk}/lib/kotlin-runtime.jar</jar> <jar>${kotlin-sdk}/lib/kotlin-runtime.jar</jar>
<jar>${kotlin-sdk}/lib/intellij-core.jar</jar> <jar>${kotlin-sdk}/lib/intellij-core.jar</jar>
<jar>${kotlin-sdk}/lib/picocontainer.jar</jar> <jar>${kotlin-sdk}/lib/picocontainer.jar</jar>
<jar>${kotlin-sdk}/lib/trove4j.jar</jar> <jar>${kotlin-sdk}/lib/trove4j.jar</jar>
<jar>${kotlin-sdk}/lib/guava-11.0.1.jar</jar> <jar>${kotlin-sdk}/lib/guava-11.0.1.jar</jar>
<jar>${kotlin-sdk}/lib/asm-commons.jar</jar> <jar>${kotlin-sdk}/lib/asm-commons.jar</jar>
<jar>${kotlin-sdk}/lib/asm.jar</jar> <jar>${kotlin-sdk}/lib/asm.jar</jar>
</kotlinJars> </kotlinJars>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
libraries/stdlib/pom.xml
+11
View File
@@ -31,6 +31,17 @@
<build> <build>
<sourceDirectory>${project.basedir}/src</sourceDirectory> <sourceDirectory>${project.basedir}/src</sourceDirectory>
<testSourceDirectory>${project.basedir}/test</testSourceDirectory> <testSourceDirectory>${project.basedir}/test</testSourceDirectory>
<resources>
<resource>
<directory>${kotlin-sdk}/../classes/runtime</directory>
<filtering>false</filtering>
<includes>
<include>**/*.class</include>
</includes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.github.goldin</groupId> <groupId>com.github.goldin</groupId>