no dependency on external maven plugin

2012-04-04 15:42:54 +04:00
parent b34e9fe305
commit 50e3e01284
8 changed files with 189 additions and 109 deletions
@@ -14,6 +14,12 @@
    <artifactId>stdlib</artifactId>

    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>runtime</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
        <dependency>
            <groupId>org.jetbrains.kotlin</groupId>
            <artifactId>kunit</artifactId>
@@ -22,40 +28,11 @@
        </dependency>
    </dependencies>

-
    <build>
        <sourceDirectory>${project.basedir}/src</sourceDirectory>
        <testSourceDirectory>${project.basedir}/test</testSourceDirectory>

        <plugins>
-
-            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-            <!-- 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>0.2.3.8</version>
-                <executions>
-                    <execution>
-                        <id>unpack-kotlin-runtime</id>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <phase>initialize</phase>
-                        <configuration>
-                            <resource>
-                                <targetPath>${project.build.outputDirectory}</targetPath>
-                                <file>${kotlin-sdk}/lib/kotlin-runtime.jar</file>
-                                <unpack>true</unpack>
-                            </resource>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
            <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>exec-maven-plugin</artifactId>
@@ -72,6 +49,22 @@
                    <classpathScope>test</classpathScope>
                </configuration>
            </plugin>
+
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
        </plugins>
    </build>
 </project>