Skip to content

Commit a66db26

Browse files
authored
Merge pull request #93 from bshtv/upgrade-to-kotlin-1-6-10
Upgrade to kotlin 1.6.10
2 parents 654fc14 + 6b6a86c commit a66db26

File tree

3 files changed

+11
-29
lines changed

3 files changed

+11
-29
lines changed

ki-shell/pom.xml

+9-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jetbrains.kotlinx</groupId>
66
<artifactId>ki</artifactId>
7-
<version>0.3.4-SNAPSHOT</version>
7+
<version>0.4.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>ki-shell</artifactId>
@@ -59,7 +59,7 @@
5959
</dependency>
6060
<dependency>
6161
<groupId>org.jetbrains.kotlin</groupId>
62-
<artifactId>kotlin-scripting-dependencies-maven</artifactId>
62+
<artifactId>kotlin-scripting-dependencies-maven-all</artifactId>
6363
<version>${kotlin.version}</version>
6464
</dependency>
6565
<dependency>
@@ -72,6 +72,11 @@
7272
<artifactId>kotlin-scripting-ide-services</artifactId>
7373
<version>${kotlin.version}</version>
7474
</dependency>
75+
<dependency>
76+
<groupId>org.jetbrains.kotlinx</groupId>
77+
<artifactId>kotlinx-coroutines-core</artifactId>
78+
<version>1.5.2</version>
79+
</dependency>
7580
<dependency>
7681
<groupId>junit</groupId>
7782
<artifactId>junit</artifactId>
@@ -129,10 +134,11 @@
129134
<plugin>
130135
<groupId>org.apache.maven.plugins</groupId>
131136
<artifactId>maven-compiler-plugin</artifactId>
132-
<version>3.5.1</version>
137+
<version>3.8.1</version>
133138
<configuration>
134139
<source>1.8</source>
135140
<target>1.8</target>
141+
<compilerArgument>-proc:none</compilerArgument>
136142
<encoding>UTF-8</encoding>
137143
</configuration>
138144
<executions>

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.jetbrains.kotlinx</groupId>
66
<artifactId>ki</artifactId>
7-
<version>0.3.4-SNAPSHOT</version>
7+
<version>0.4.0-SNAPSHOT</version>
88

99
<packaging>pom</packaging>
1010
<name>Ki Shell :: parent</name>
@@ -13,7 +13,7 @@
1313
<module>ki-shell</module>
1414
</modules>
1515
<properties>
16-
<kotlin.version>1.4.32</kotlin.version>
16+
<kotlin.version>1.6.10</kotlin.version>
1717
<jvm.version>1.8</jvm.version>
1818
</properties>
1919
<build>

src/jreleaser/distributions/ki/brew/Formula/ki.rb

-24
This file was deleted.

0 commit comments

Comments
 (0)