Skip to content

Commit afed117

Browse files
committed
Manage kotlin artifacts more thoroughly
And ignore duplicate class conflicts between kotlin-daemon-client and kotlin-daemon-embeddable. I'm guessing that kotlin-daemon-embeddable is preferred as a dependency -- it's what kotlin-compiler-embeddable uses -- but the community wants to use kotlin-script-util, which depends on kotlin-daemon-client. I'm not sure how best to reconcile this, so for now we just ignore the problem.
1 parent 902b1b2 commit afed117

1 file changed

Lines changed: 52 additions & 3 deletions

File tree

pom.xml

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,14 @@
247247
Part of: junit:junit
248248
Also in: org.jmockit:jmockit
249249
Enables: junit:junit + org.jmockit:jmockit
250+
==
251+
Classes: org.jetbrains.kotlin.daemon.common.*
252+
Part of: kotlin-daemon-client, kotlin-daemon-embeddable
253+
Enables:
254+
org.jetbrains.kotlin:kotlin-compiler-embeddable (kotlin-daemon-embeddable) +
255+
org.jetbrains.kotlin:kotlin-script-util (kotlin-compiler-client)
250256
-->
251-
<scijava.allowedDuplicateClasses>com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner</scijava.allowedDuplicateClasses>
257+
<scijava.allowedDuplicateClasses>com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.jetbrains.kotlin.daemon.common.*,org.junit.runner.Runner</scijava.allowedDuplicateClasses>
252258
<!--
253259
NB: The scijava.allowedDuplicateClasses property above makes it easier to
254260
append to the list of allowed duplicate classes in downstream projects.
@@ -1085,9 +1091,17 @@
10851091

10861092
<!-- Kotlin - https://kotlinlang.org/ -->
10871093
<!-- NB: kotlin.version is defined in pom-scijava-base. -->
1094+
<kotlin-compiler-embeddable.version>${kotlin.version}</kotlin-compiler-embeddable.version>
1095+
<kotlin-daemon-embeddable.version>${kotlin.version}</kotlin-daemon-embeddable.version>
10881096
<kotlin-reflect.version>${kotlin.version}</kotlin-reflect.version>
1097+
<kotlin-script-runtime.version>${kotlin.version}</kotlin-script-runtime.version>
1098+
<kotlin-script-util.version>${kotlin.version}</kotlin-script-util.version>
1099+
<kotlin-scripting-common.version>${kotlin.version}</kotlin-scripting-common.version>
1100+
<kotlin-scripting-compiler-embeddable.version>${kotlin.version}</kotlin-scripting-compiler-embeddable.version>
1101+
<kotlin-scripting-jvm.version>${kotlin.version}</kotlin-scripting-jvm.version>
10891102
<kotlin-stdlib.version>${kotlin.version}</kotlin-stdlib.version>
10901103

1104+
10911105
<!-- Logback - https://logback.qos.ch/ -->
10921106
<logback.version>1.2.3</logback.version>
10931107
<logback-classic.version>${logback.version}</logback-classic.version>
@@ -3772,14 +3786,49 @@
37723786
<!-- Kotlin - https://kotlinlang.org/ -->
37733787
<dependency>
37743788
<groupId>org.jetbrains.kotlin</groupId>
3775-
<artifactId>kotlin-stdlib-jdk8</artifactId>
3776-
<version>${kotlin-stdlib.version}</version>
3789+
<artifactId>kotlin-compiler-embeddable</artifactId>
3790+
<version>${kotlin-compiler-embeddable.version}</version>
3791+
</dependency>
3792+
<dependency>
3793+
<groupId>org.jetbrains.kotlin</groupId>
3794+
<artifactId>kotlin-daemon-embeddable</artifactId>
3795+
<version>${kotlin-daemon-embeddable.version}</version>
37773796
</dependency>
37783797
<dependency>
37793798
<groupId>org.jetbrains.kotlin</groupId>
37803799
<artifactId>kotlin-reflect</artifactId>
37813800
<version>${kotlin-reflect.version}</version>
37823801
</dependency>
3802+
<dependency>
3803+
<groupId>org.jetbrains.kotlin</groupId>
3804+
<artifactId>kotlin-script-runtime</artifactId>
3805+
<version>${kotlin-script-runtime.version}</version>
3806+
</dependency>
3807+
<dependency>
3808+
<groupId>org.jetbrains.kotlin</groupId>
3809+
<artifactId>kotlin-script-util</artifactId>
3810+
<version>${kotlin-script-util.version}</version>
3811+
</dependency>
3812+
<dependency>
3813+
<groupId>org.jetbrains.kotlin</groupId>
3814+
<artifactId>kotlin-scripting-common</artifactId>
3815+
<version>${kotlin-scripting-common.version}</version>
3816+
</dependency>
3817+
<dependency>
3818+
<groupId>org.jetbrains.kotlin</groupId>
3819+
<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
3820+
<version>${kotlin-scripting-compiler-embeddable.version}</version>
3821+
</dependency>
3822+
<dependency>
3823+
<groupId>org.jetbrains.kotlin</groupId>
3824+
<artifactId>kotlin-scripting-jvm</artifactId>
3825+
<version>${kotlin-scripting-jvm.version}</version>
3826+
</dependency>
3827+
<dependency>
3828+
<groupId>org.jetbrains.kotlin</groupId>
3829+
<artifactId>kotlin-stdlib-jdk8</artifactId>
3830+
<version>${kotlin-stdlib.version}</version>
3831+
</dependency>
37833832

37843833
<!-- Logback - http://logback.qos.ch/ -->
37853834
<dependency>

0 commit comments

Comments
 (0)