chore: migrate to kotlin and ksp 2 (#28)

BedrockStreaming · Aug 21, 2024 · b733aea · b733aea
1 parent 0da9fdc
commit b733aea
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 84 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
 
       - name: Build project

diff --git a/.jitpack.yml b/.jitpack.yml
@@ -1,2 +1,2 @@
 jdk:
-  - openjdk11
+  - openjdk17
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,9 +1,9 @@
 import com.diffplug.gradle.spotless.SpotlessExtension
 
 plugins {
-    id("org.jetbrains.kotlinx.kover") version "0.5.0"
+    id("org.jetbrains.kotlinx.kover") version "0.8.3"
     id("com.diffplug.gradle.spotless") version "6.2.0" apply false
-    id("org.jetbrains.kotlin.jvm") version "1.7.22" apply false
+    id("org.jetbrains.kotlin.jvm") version "2.0.0" apply false
 }
 
 subprojects {

diff --git a/compiler-core/build.gradle.kts b/compiler-core/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -6,8 +7,8 @@ plugins {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "1.8"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
     }
 }
 

diff --git a/compiler-factory/build.gradle.kts b/compiler-factory/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -6,8 +7,8 @@ plugins {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "1.8"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
     }
 }
 

diff --git a/compiler-factory/src/main/java/toothpick/compiler/factory/generators/FactoryGenerator.kt b/compiler-factory/src/main/java/toothpick/compiler/factory/generators/FactoryGenerator.kt
@@ -144,7 +144,7 @@ internal class FactoryGenerator(
         }
 
         FunSpec.builder("createInstance")
-            .addModifiers(KModifier.OVERRIDE)
+            .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE)
             .addParameter("scope", Scope::class)
             .returns(sourceClassName)
             .apply {
@@ -210,7 +210,7 @@ internal class FactoryGenerator(
     private fun TypeSpec.Builder.emitGetTargetScope(): TypeSpec.Builder = apply {
         val scopeName = constructorInjectionTarget.scopeName
         FunSpec.builder("getTargetScope")
-            .addModifiers(KModifier.OVERRIDE)
+            .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE)
             .addParameter("scope", Scope::class)
             .returns(Scope::class)
             .addStatement(
@@ -236,7 +236,7 @@ internal class FactoryGenerator(
         val scopeName = constructorInjectionTarget.scopeName
         val hasScopeAnnotation = scopeName != null
         FunSpec.builder("hasScopeAnnotation")
-            .addModifiers(KModifier.OVERRIDE)
+            .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE)
             .returns(Boolean::class)
             .addStatement("return %L", hasScopeAnnotation)
             .build()
@@ -245,7 +245,7 @@ internal class FactoryGenerator(
 
     private fun TypeSpec.Builder.emitHasSingletonAnnotation(): TypeSpec.Builder = apply {
         FunSpec.builder("hasSingletonAnnotation")
-            .addModifiers(KModifier.OVERRIDE)
+            .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE)
             .returns(Boolean::class)
             .addStatement(
                 "return %L",
@@ -257,7 +257,7 @@ internal class FactoryGenerator(
 
     private fun TypeSpec.Builder.emitHasReleasableAnnotation(): TypeSpec.Builder = apply {
         FunSpec.builder("hasReleasableAnnotation")
-            .addModifiers(KModifier.OVERRIDE)
+            .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE)
             .returns(Boolean::class)
             .addStatement(
                 "return %L",
@@ -269,7 +269,7 @@ internal class FactoryGenerator(
 
     private fun TypeSpec.Builder.emitHasProvidesSingletonAnnotation(): TypeSpec.Builder = apply {
         FunSpec.builder("hasProvidesSingletonAnnotation")
-            .addModifiers(KModifier.OVERRIDE)
+            .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE)
             .returns(Boolean::class)
             .addStatement(
                 "return %L",
@@ -281,7 +281,7 @@ internal class FactoryGenerator(
 
     private fun TypeSpec.Builder.emitHasProvidesReleasableAnnotation(): TypeSpec.Builder = apply {
         FunSpec.builder("hasProvidesReleasableAnnotation")
-            .addModifiers(KModifier.OVERRIDE)
+            .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE)
             .returns(Boolean::class)
             .addStatement(
                 "return %L",

diff --git a/compiler-memberinjector/build.gradle.kts b/compiler-memberinjector/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -6,8 +7,8 @@ plugins {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "1.8"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
     }
 }
 

diff --git a/...tor/src/main/java/toothpick/compiler/memberinjector/generators/MemberInjectorGenerator.kt b/...tor/src/main/java/toothpick/compiler/memberinjector/generators/MemberInjectorGenerator.kt
@@ -110,7 +110,7 @@ internal class MemberInjectorGenerator(
     ): TypeSpec.Builder = apply {
         addFunction(
             FunSpec.builder("inject")
-                .addModifiers(KModifier.OVERRIDE)
+                .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE)
                 .addParameter("target", sourceClassName)
                 .addParameter("scope", Scope::class)
                 .apply {