chore: 🤖 Update to Kotlin 1.4 and version bump

Kotlin · Aug 18, 2020 · 66ae60e · 66ae60e
1 parent 055223b
commit 66ae60e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jetbrains.kotlin.spark</groupId>
     <artifactId>kotlin-spark-api-parent</artifactId>
-    <version>0.3.2</version>
+    <version>1.0.0-preview1</version>
   </parent>
   <artifactId>core</artifactId>
   <name>Kotlin Spark API: Scala core</name>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jetbrains.kotlin.spark</groupId>
     <artifactId>kotlin-spark-api-parent</artifactId>
-    <version>0.3.2</version>
+    <version>1.0.0-preview1</version>
   </parent>
 
   <groupId>org.jetbrains.kotlin.spark.examples</groupId>
@@ -17,9 +17,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <kotlin.version>1.3.72</kotlin.version>
     <kotlin.code.style>official</kotlin.code.style>
-    <junit.version>4.12</junit.version>
   </properties>
 
   <dependencies>

diff --git a/kotlin-spark-api/pom.xml b/kotlin-spark-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jetbrains.kotlin.spark</groupId>
     <artifactId>kotlin-spark-api-parent</artifactId>
-    <version>0.3.2</version>
+    <version>1.0.0-preview1</version>
   </parent>
 
   <artifactId>kotlin-spark-api</artifactId>
@@ -16,10 +16,9 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <kotlin.version>1.3.72</kotlin.version>
     <kotlin.code.style>official</kotlin.code.style>
-    <dokka.version>0.10.1</dokka.version>
-    <kotest.version>4.1.3</kotest.version>
+    <dokka.version>1.4.0-rc</dokka.version>
+    <kotest.version>4.2.0.RC2</kotest.version>
   </properties>
 
   <dependencies>
@@ -49,12 +48,6 @@
       <version>${kotest.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.kotest</groupId>
-      <artifactId>kotest-runner-console-jvm</artifactId>
-      <version>${kotest.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>io.kotest</groupId>
       <artifactId>kotest-extensions-allure-jvm</artifactId>
@@ -128,7 +121,7 @@
       <plugin>
         <groupId>org.jetbrains.dokka</groupId>
         <artifactId>dokka-maven-plugin</artifactId>
-        <version>1.4.0-rc</version>
+        <version>${dokka.version}</version>
         <configuration>
           <jdkVersion>8</jdkVersion>
         </configuration>

diff --git a/kotlin-spark-api/src/main/kotlin/org/jetbrains/spark/api/ApiV1.kt b/kotlin-spark-api/src/main/kotlin/org/jetbrains/spark/api/ApiV1.kt
@@ -38,7 +38,6 @@ import java.time.LocalDate
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
-import kotlin.reflect.full.declaredMemberProperties
 import kotlin.reflect.full.findAnnotation
 import kotlin.reflect.full.isSubclassOf
 import kotlin.reflect.full.primaryConstructor

diff --git a/pom.xml b/pom.xml
@@ -3,9 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jetbrains.kotlin.spark</groupId>
   <artifactId>kotlin-spark-api-parent</artifactId>
-  <version>0.3.2</version>
+  <version>1.0.0-preview1</version>
   <packaging>pom</packaging>
   <name>kotlin-spark-api-parent</name>
+  <properties>
+    <kotlin.version>1.4.0</kotlin.version>
+  </properties>
   <modules>
     <module>kotlin-spark-api</module>
     <module>examples</module>
@@ -60,6 +63,26 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.0.0-M3</version>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>3.5.4</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <url>http://maven.apache.org</url>