Skip to content

Commit d28deb6

Browse files
committed
Update to Kotlin 1.3.40 and fix dependencies
1 parent 1698e22 commit d28deb6

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

pom.xml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>26.0.0</version>
8+
<version>27.0.1</version>
99
<relativePath />
1010
</parent>
1111

@@ -80,15 +80,12 @@
8080
<license.licenseName>agpl_v3</license.licenseName>
8181
<license.copyrightOwners>Board of Regents of the University of
8282
Wisconsin-Madison.</license.copyrightOwners>
83-
<dynkt.version>1.0.2</dynkt.version>
84-
<dynkt-jsr223.version>${dynkt.version}</dynkt-jsr223.version>
85-
<kotlin.version>1.1.1</kotlin.version>
8683

8784
<!-- NB: Deploy releases to the SciJava Maven repository. -->
8885
<releaseProfiles>deploy-to-scijava</releaseProfiles>
8986

9087
<!-- NB: Work around duplicate classes issue in Kotlin dependencies-->
91-
<allowedDuplicateClasses>kotlin.*,org.jetbrains.*</allowedDuplicateClasses>
88+
<allowedDuplicateClasses>org/jetbrains/kotlin/daemon/common/*,kotlinx/coroutines/**</allowedDuplicateClasses>
9289
</properties>
9390

9491
<repositories>
@@ -105,12 +102,29 @@ Wisconsin-Madison.</license.copyrightOwners>
105102
<artifactId>scijava-common</artifactId>
106103
</dependency>
107104

108-
<!-- Third party dependencies -->
105+
<!-- Kotlin dependencies -->
106+
<dependency>
107+
<groupId>org.jetbrains.kotlin</groupId>
108+
<artifactId>kotlin-compiler-embeddable</artifactId>
109+
<version>${kotlin.version}</version>
110+
</dependency>
109111
<dependency>
110112
<groupId>org.jetbrains.kotlin</groupId>
111113
<artifactId>kotlin-script-util</artifactId>
112114
<version>${kotlin.version}</version>
113115
</dependency>
116+
<dependency>
117+
<groupId>org.jetbrains.kotlin</groupId>
118+
<artifactId>kotlin-script-runtime</artifactId>
119+
<version>${kotlin.version}</version>
120+
<scope>runtime</scope>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.jetbrains.kotlin</groupId>
124+
<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
125+
<version>${kotlin.version}</version>
126+
<scope>runtime</scope>
127+
</dependency>
114128

115129
<!-- Test dependencies -->
116130
<dependency>

0 commit comments

Comments
 (0)