Skip to content

Commit 74c39bc

Browse files
yoleyole
committed
Merge branch 'main-class' of https://github.com/ansell/kotlin-examples-jetbrains into ansell-main-class
2 parents 96f3950 + 2422ba2 commit 74c39bc

File tree

4 files changed

+98
-15
lines changed

4 files changed

+98
-15
lines changed

‎maven/hello-world/pom.xml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<properties>
1313
<kotlin.version>1.0.1-2</kotlin.version>
14-
<junit.version>4.10</junit.version>
15-
14+
<junit.version>4.12</junit.version>
15+
<main.class>hello.HelloKt</main.class>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
</properties>
1818

@@ -65,6 +65,19 @@
6565
</execution>
6666
</executions>
6767
</plugin>
68+
<plugin>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-jar-plugin</artifactId>
71+
<version>2.6</version>
72+
<configuration>
73+
<archive>
74+
<manifest>
75+
<addClasspath>true</addClasspath>
76+
<mainClass>${main.class}</mainClass>
77+
</manifest>
78+
</archive>
79+
</configuration>
80+
</plugin>
6881
<plugin>
6982
<groupId>org.codehaus.mojo</groupId>
7083
<artifactId>exec-maven-plugin</artifactId>
@@ -78,7 +91,7 @@
7891
</execution>
7992
</executions>
8093
<configuration>
81-
<mainClass>hello.HelloKt</mainClass>
94+
<mainClass>${main.class}</mainClass>
8295
</configuration>
8396
</plugin>
8497
</plugins>

‎maven/mixed-code-hello-world/.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
target
22
.idea
3+
4+
.settings/
5+
.classpath
6+
.project

‎maven/mixed-code-hello-world/pom.xml‎

Lines changed: 78 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<properties>
1313
<kotlin.version>1.0.1-2</kotlin.version>
14-
<junit.version>4.10</junit.version>
15-
14+
<junit.version>4.12</junit.version>
15+
<main.class>kotlin.KotlinHelloKt</main.class>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
</properties>
1818

@@ -43,22 +43,88 @@
4343
<artifactId>kotlin-maven-plugin</artifactId>
4444
<groupId>org.jetbrains.kotlin</groupId>
4545
<version>${kotlin.version}</version>
46-
47-
<configuration/>
4846
<executions>
4947
<execution>
5048
<id>compile</id>
51-
<phase>process-sources</phase>
52-
<goals>
53-
<goal>compile</goal>
54-
</goals>
49+
<goals> <goal>compile</goal> </goals>
50+
<configuration>
51+
<sourceDirs>
52+
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
53+
<sourceDir>${project.basedir}/src/main/java</sourceDir>
54+
</sourceDirs>
55+
</configuration>
5556
</execution>
5657
<execution>
5758
<id>test-compile</id>
58-
<phase>process-test-sources</phase>
59-
<goals>
60-
<goal>test-compile</goal>
61-
</goals>
59+
<goals> <goal>test-compile</goal> </goals>
60+
<configuration>
61+
<sourceDirs>
62+
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
63+
<sourceDir>${project.basedir}/src/test/java</sourceDir>
64+
</sourceDirs>
65+
</configuration>
66+
</execution>
67+
</executions>
68+
</plugin>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-compiler-plugin</artifactId>
72+
<version>3.5.1</version>
73+
<executions>
74+
<!-- Replacing default-compile as it is treated specially by maven -->
75+
<execution>
76+
<id>default-compile</id>
77+
<phase>none</phase>
78+
</execution>
79+
<!-- Replacing default-testCompile as it is treated specially by maven -->
80+
<execution>
81+
<id>default-testCompile</id>
82+
<phase>none</phase>
83+
</execution>
84+
<execution>
85+
<id>java-compile</id>
86+
<phase>compile</phase>
87+
<goals> <goal>compile</goal> </goals>
88+
</execution>
89+
<execution>
90+
<id>java-test-compile</id>
91+
<phase>test-compile</phase>
92+
<goals> <goal>testCompile</goal> </goals>
93+
</execution>
94+
</executions>
95+
</plugin>
96+
<plugin>
97+
<groupId>org.apache.maven.plugins</groupId>
98+
<artifactId>maven-jar-plugin</artifactId>
99+
<version>2.6</version>
100+
<configuration>
101+
<archive>
102+
<manifest>
103+
<addClasspath>true</addClasspath>
104+
<mainClass>${main.class}</mainClass>
105+
</manifest>
106+
</archive>
107+
</configuration>
108+
</plugin>
109+
<plugin>
110+
<groupId>org.apache.maven.plugins</groupId>
111+
<artifactId>maven-assembly-plugin</artifactId>
112+
<version>2.6</version>
113+
<executions>
114+
<execution>
115+
<id>make-assembly</id>
116+
<phase>package</phase>
117+
<goals> <goal>single</goal> </goals>
118+
<configuration>
119+
<archive>
120+
<manifest>
121+
<mainClass>${main.class}</mainClass>
122+
</manifest>
123+
</archive>
124+
<descriptorRefs>
125+
<descriptorRef>jar-with-dependencies</descriptorRef>
126+
</descriptorRefs>
127+
</configuration>
62128
</execution>
63129
</executions>
64130
</plugin>

‎maven/mixed-code-hello-world/src/main/java/hello/KotlinHello.kt‎ renamed to ‎maven/mixed-code-hello-world/src/main/kotlin/hello/KotlinHello.kt‎

File renamed without changes.

0 commit comments

Comments
 (0)