From 01679d315dbb2369e093d69c12cfe0e28ffbafb5 Mon Sep 17 00:00:00 2001
From: Evgeny Goldin <evgenyg@gmail.com>
Date: Wed, 21 Mar 2012 15:21:12 +0100
Subject: [PATCH] Cleanup - "localKotlin" profile is eliminated, it is now the
 default behavior

---
 libraries/pom.xml        |  46 ++++-----------
 libraries/stdlib/pom.xml | 123 +++------------------------------------
 2 files changed, 18 insertions(+), 151 deletions(-)

diff --git a/libraries/pom.xml b/libraries/pom.xml
index afcad513d8c..ad71a7cf210 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -96,6 +96,17 @@
                 <configuration>
                     <runIf>{{ new File( project.build.sourceDirectory ).directory }}</runIf>
                     <verbose>false</verbose>
+                    <kotlinJars>
+                        <jar>${kotlin-sdk}/lib/kotlin-build-tools.jar</jar>
+                        <jar>${kotlin-sdk}/lib/kotlin-compiler.jar</jar>
+                        <jar>${kotlin-sdk}/lib/kotlin-runtime.jar</jar>
+                        <jar>${kotlin-sdk}/lib/intellij-core.jar</jar>
+                        <jar>${kotlin-sdk}/lib/picocontainer.jar</jar>
+                        <jar>${kotlin-sdk}/lib/trove4j.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.jar</jar>
+                    </kotlinJars>
                 </configuration>
             </plugin>
 
@@ -134,39 +145,4 @@
         </plugins>
     </build>
 
-
-    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-    <!-- Run "mvn clean install -PlocalKotlin" to use locally built Kotlin jars in ${kotlin-sdk}/lib -->
-    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-
-    <profiles>
-        <profile>
-            <id>localKotlin</id>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>com.github.goldin</groupId>
-                            <artifactId>kotlin-maven-plugin</artifactId>
-                            <version>${kotlin-maven-plugin.version}</version>
-                            <configuration>
-                                <kotlinJars>
-                                    <jar>${kotlin-sdk}/lib/kotlin-build-tools.jar</jar>
-                                    <jar>${kotlin-sdk}/lib/kotlin-compiler.jar</jar>
-                                    <jar>${kotlin-sdk}/lib/kotlin-runtime.jar</jar>
-                                    <jar>${kotlin-sdk}/lib/intellij-core.jar</jar>
-                                    <jar>${kotlin-sdk}/lib/picocontainer.jar</jar>
-                                    <jar>${kotlin-sdk}/lib/trove4j.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.jar</jar>
-                                </kotlinJars>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index ae4cb7e382d..88f8cf56949 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -23,104 +23,32 @@
     </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>
 
         <plugins>
 
-            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-            <!-- Unpacking "kotlin-maven-plugin" to get its "ivyconf.xml" -->
-            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+            <!-- Unpacking "kotlin-runtime.jar" to ${project.build.outputDirectory} -->
+            <!-- so that its content is packed together with our jar                -->
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
 
             <plugin>
                 <groupId>com.github.goldin</groupId>
                 <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>
+                <version>0.2.3.8</version>
                 <executions>
                     <execution>
                         <id>unpack-kotlin-runtime</id>
                         <goals>
                             <goal>copy</goal>
                         </goals>
-                        <phase>process-sources</phase>
+                        <phase>initialize</phase>
                         <configuration>
-                            <runIf>! Boolean.valueOf( localKotlin )</runIf>
                             <resource>
                                 <targetPath>${project.build.outputDirectory}</targetPath>
-                                <directory>${kotlin-runtime-dir}</directory>
-                                <include>*.jar</include>
+                                <file>${kotlin-sdk}/lib/kotlin-runtime.jar</file>
                                 <unpack>true</unpack>
                             </resource>
                         </configuration>
@@ -129,41 +57,4 @@
             </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>