Skip to content

Commit 66ae60e

Browse files
committed
chore: 🤖 Update to Kotlin 1.4 and version bump
1 parent 055223b commit 66ae60e

File tree

5 files changed

+30
-17
lines changed

5 files changed

+30
-17
lines changed

core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jetbrains.kotlin.spark</groupId>
66
<artifactId>kotlin-spark-api-parent</artifactId>
7-
<version>0.3.2</version>
7+
<version>1.0.0-preview1</version>
88
</parent>
99
<artifactId>core</artifactId>
1010
<name>Kotlin Spark API: Scala core</name>

examples/pom.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.jetbrains.kotlin.spark</groupId>
88
<artifactId>kotlin-spark-api-parent</artifactId>
9-
<version>0.3.2</version>
9+
<version>1.0.0-preview1</version>
1010
</parent>
1111

1212
<groupId>org.jetbrains.kotlin.spark.examples</groupId>
@@ -17,9 +17,7 @@
1717

1818
<properties>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20-
<kotlin.version>1.3.72</kotlin.version>
2120
<kotlin.code.style>official</kotlin.code.style>
22-
<junit.version>4.12</junit.version>
2321
</properties>
2422

2523
<dependencies>

kotlin-spark-api/pom.xml

+4-11
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.jetbrains.kotlin.spark</groupId>
88
<artifactId>kotlin-spark-api-parent</artifactId>
9-
<version>0.3.2</version>
9+
<version>1.0.0-preview1</version>
1010
</parent>
1111

1212
<artifactId>kotlin-spark-api</artifactId>
@@ -16,10 +16,9 @@
1616

1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19-
<kotlin.version>1.3.72</kotlin.version>
2019
<kotlin.code.style>official</kotlin.code.style>
21-
<dokka.version>0.10.1</dokka.version>
22-
<kotest.version>4.1.3</kotest.version>
20+
<dokka.version>1.4.0-rc</dokka.version>
21+
<kotest.version>4.2.0.RC2</kotest.version>
2322
</properties>
2423

2524
<dependencies>
@@ -49,12 +48,6 @@
4948
<version>${kotest.version}</version>
5049
<scope>test</scope>
5150
</dependency>
52-
<dependency>
53-
<groupId>io.kotest</groupId>
54-
<artifactId>kotest-runner-console-jvm</artifactId>
55-
<version>${kotest.version}</version>
56-
<scope>test</scope>
57-
</dependency>
5851
<dependency>
5952
<groupId>io.kotest</groupId>
6053
<artifactId>kotest-extensions-allure-jvm</artifactId>
@@ -128,7 +121,7 @@
128121
<plugin>
129122
<groupId>org.jetbrains.dokka</groupId>
130123
<artifactId>dokka-maven-plugin</artifactId>
131-
<version>1.4.0-rc</version>
124+
<version>${dokka.version}</version>
132125
<configuration>
133126
<jdkVersion>8</jdkVersion>
134127
</configuration>

kotlin-spark-api/src/main/kotlin/org/jetbrains/spark/api/ApiV1.kt

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import java.time.LocalDate
3838
import java.util.concurrent.ConcurrentHashMap
3939
import kotlin.reflect.KClass
4040
import kotlin.reflect.KType
41-
import kotlin.reflect.full.declaredMemberProperties
4241
import kotlin.reflect.full.findAnnotation
4342
import kotlin.reflect.full.isSubclassOf
4443
import kotlin.reflect.full.primaryConstructor

pom.xml

+24-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jetbrains.kotlin.spark</groupId>
55
<artifactId>kotlin-spark-api-parent</artifactId>
6-
<version>0.3.2</version>
6+
<version>1.0.0-preview1</version>
77
<packaging>pom</packaging>
88
<name>kotlin-spark-api-parent</name>
9+
<properties>
10+
<kotlin.version>1.4.0</kotlin.version>
11+
</properties>
912
<modules>
1013
<module>kotlin-spark-api</module>
1114
<module>examples</module>
@@ -60,6 +63,26 @@
6063
</execution>
6164
</executions>
6265
</plugin>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-enforcer-plugin</artifactId>
69+
<version>3.0.0-M3</version>
70+
<executions>
71+
<execution>
72+
<id>enforce-maven</id>
73+
<goals>
74+
<goal>enforce</goal>
75+
</goals>
76+
<configuration>
77+
<rules>
78+
<requireMavenVersion>
79+
<version>3.5.4</version>
80+
</requireMavenVersion>
81+
</rules>
82+
</configuration>
83+
</execution>
84+
</executions>
85+
</plugin>
6386
</plugins>
6487
</build>
6588
<url>http://maven.apache.org</url>

0 commit comments

Comments
 (0)