Convert Java to Kotlin for fun #1

TinyLake · Jun 9, 2024 · 3ff7409 · 3ff7409
1 parent 0fe5b94
commit 3ff7409
Show file tree

Hide file tree

Showing 81 changed files with 15,573 additions and 13,797 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,8 +26,8 @@ buildscript{
 }
 
 plugins{
-    id "org.jetbrains.kotlin.jvm" version "1.9.20"
-    id "org.jetbrains.kotlin.kapt" version "1.9.20"
+    id "org.jetbrains.kotlin.jvm" version "2.0.0"
+    id "org.jetbrains.kotlin.kapt" version "2.0.0"
 }
 
 allprojects{
@@ -141,6 +141,7 @@ project(":core"){
     apply plugin: "kotlin-kapt"
 
     kapt{
+        useBuildCache = true
         javacOptions{
             option("-source", "16")
             option("-target", "1.8")

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     kotlin("jvm")
     id("mindustryX.buildExt")
 }
+
 sourceSets.main {
     java.setSrcDirs(listOf("src/", layout.buildDirectory.dir("/generated/sources/annotationProcessor/java/main")))
     kotlin.setSrcDirs(listOf("src/"))
@@ -15,6 +16,7 @@ tasks{
     withType<KotlinCompile>().configureEach {
         kotlinOptions {
             jvmTarget = "1.8"
+            freeCompilerArgs = listOf("-Xjvm-default=all")
         }
     }