chore: upgrade to Kotlin 1.7 (#24)

BedrockStreaming · Jun 24, 2022 · 58a9576 · 58a9576
1 parent 6df6ec1
commit 58a9576
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 79 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ import com.diffplug.gradle.spotless.SpotlessExtension
 plugins {
     id("org.jetbrains.kotlinx.kover") version "0.5.0"
     id("com.diffplug.gradle.spotless") version "6.2.0" apply false
-    id("org.jetbrains.kotlin.jvm") version "1.6.10" apply false
+    id("org.jetbrains.kotlin.jvm") version "1.7.0" apply false
 }
 
 subprojects {

diff --git a/compiler-core/src/main/java/toothpick/compiler/common/ToothpickProcessor.kt b/compiler-core/src/main/java/toothpick/compiler/common/ToothpickProcessor.kt
@@ -33,7 +33,6 @@ import com.google.devtools.ksp.symbol.KSFunctionDeclaration
 import com.google.devtools.ksp.symbol.KSNode
 import com.google.devtools.ksp.symbol.KSType
 import com.google.devtools.ksp.symbol.Variance
-import com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview
 import com.squareup.kotlinpoet.ksp.writeTo
 import toothpick.compiler.common.generators.TPCodeGenerator
 import toothpick.compiler.common.generators.error
@@ -44,7 +43,7 @@ import toothpick.compiler.common.generators.warn
 import java.io.IOException
 import javax.inject.Inject
 
-@OptIn(KspExperimental::class, KotlinPoetKspPreview::class)
+@OptIn(KspExperimental::class)
 abstract class ToothpickProcessor(
     processorOptions: Map<String, String>,
     private val codeGenerator: CodeGenerator,

diff --git a/...ore/src/main/java/toothpick/compiler/common/generators/targets/VariableInjectionTarget.kt b/...ore/src/main/java/toothpick/compiler/common/generators/targets/VariableInjectionTarget.kt
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:OptIn(KspExperimental::class, KotlinPoetKspPreview::class)
+@file:OptIn(KspExperimental::class)
 
 package toothpick.compiler.common.generators.targets
 
@@ -32,7 +32,6 @@ import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.TypeName
-import com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview
 import com.squareup.kotlinpoet.ksp.toClassName
 import com.squareup.kotlinpoet.ksp.toTypeName
 import toothpick.compiler.common.generators.error

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
@@ -29,7 +29,6 @@ import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.asClassName
-import com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview
 import com.squareup.kotlinpoet.ksp.addOriginatingKSFile
 import com.squareup.kotlinpoet.ksp.toClassName
 import com.squareup.kotlinpoet.ksp.toKModifier
@@ -50,7 +49,6 @@ import javax.inject.Singleton
  * Typically, a factory is created for a class a soon as it contains an [javax.inject.Inject] annotated constructor.
  * See Optimistic creation of factories in TP wiki.
  */
-@OptIn(KotlinPoetKspPreview::class)
 internal class FactoryGenerator(
     private val constructorInjectionTarget: ConstructorInjectionTarget
 ) : TPCodeGenerator {

diff --git a/compiler-factory/src/test/java/toothpick/compiler/factory/FactoryTest.kt b/compiler-factory/src/test/java/toothpick/compiler/factory/FactoryTest.kt
@@ -85,7 +85,7 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestEmptyConstructor__Factory : Factory<TestEmptyConstructor> {
               public override fun createInstance(scope: Scope): TestEmptyConstructor = TestEmptyConstructor()
@@ -155,7 +155,7 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestEmptyConstructor__Factory : Factory<TestEmptyConstructor> {
               public override fun createInstance(scope: Scope): TestEmptyConstructor = TestEmptyConstructor()
@@ -225,7 +225,7 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestEmptyConstructor__Factory : Factory<TestEmptyConstructor> {
               public override fun createInstance(scope: Scope): TestEmptyConstructor = TestEmptyConstructor()
@@ -389,7 +389,7 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             protected class `Wrapper${'$'}TestConstructorInProtectedClass__Factory` :
                 Factory<Wrapper.TestConstructorInProtectedClass> {
@@ -461,7 +461,7 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestConstructorInPackageClass__Factory : Factory<TestConstructorInPackageClass> {
               public override fun createInstance(scope: Scope): TestConstructorInPackageClass =
@@ -580,7 +580,7 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class Test2Constructors__Factory : Factory<Test2Constructors> {
               public override fun createInstance(scope: Scope): Test2Constructors = Test2Constructors()
@@ -652,12 +652,12 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestNonEmptyConstructor__Factory : Factory<TestNonEmptyConstructor> {
               @Suppress(
                 "UNCHECKED_CAST",
-                "NAME_SHADOWING"
+                "NAME_SHADOWING",
               )
               public override fun createInstance(scope: Scope): TestNonEmptyConstructor {
                 val scope = getTargetScope(scope)
@@ -736,12 +736,12 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestNonEmptyConstructor__Factory : Factory<TestNonEmptyConstructor> {
               @Suppress(
                 "UNCHECKED_CAST",
-                "NAME_SHADOWING"
+                "NAME_SHADOWING",
               )
               public override fun createInstance(scope: Scope): TestNonEmptyConstructor {
                 val scope = getTargetScope(scope)
@@ -820,12 +820,12 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestNonEmptyConstructor__Factory : Factory<TestNonEmptyConstructor> {
               @Suppress(
                 "UNCHECKED_CAST",
-                "NAME_SHADOWING"
+                "NAME_SHADOWING",
               )
               public override fun createInstance(scope: Scope): TestNonEmptyConstructor {
                 val scope = getTargetScope(scope)
@@ -993,12 +993,12 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestNonEmptyConstructor__Factory : Factory<TestNonEmptyConstructor> {
               @Suppress(
                 "UNCHECKED_CAST",
-                "NAME_SHADOWING"
+                "NAME_SHADOWING",
               )
               public override fun createInstance(scope: Scope): TestNonEmptyConstructor {
                 val scope = getTargetScope(scope)
@@ -1182,13 +1182,13 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestClassConstructorThrowingException__Factory :
                 Factory<TestClassConstructorThrowingException> {
               @Suppress(
                 "UNCHECKED_CAST",
-                "NAME_SHADOWING"
+                "NAME_SHADOWING",
               )
               public override fun createInstance(scope: Scope): TestClassConstructorThrowingException {
                 val scope = getTargetScope(scope)
@@ -1274,12 +1274,12 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestNonEmptyConstructor__Factory : Factory<TestNonEmptyConstructor> {
               @Suppress(
                 "UNCHECKED_CAST",
-                "NAME_SHADOWING"
+                "NAME_SHADOWING",
               )
               public override fun createInstance(scope: Scope): TestNonEmptyConstructor {
                 val scope = getTargetScope(scope)
@@ -1361,7 +1361,7 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestEmptyConstructor__Factory : Factory<TestEmptyConstructor> {
               public override fun createInstance(scope: Scope): TestEmptyConstructor = TestEmptyConstructor()
@@ -1453,12 +1453,12 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestNonEmptyConstructor__Factory : Factory<TestNonEmptyConstructor> {
               @Suppress(
                 "UNCHECKED_CAST",
-                "NAME_SHADOWING"
+                "NAME_SHADOWING",
               )
               public override fun createInstance(scope: Scope): TestNonEmptyConstructor {
                 val scope = getTargetScope(scope)
@@ -1551,7 +1551,7 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestEmptyConstructor__Factory : Factory<TestEmptyConstructor> {
               public override fun createInstance(scope: Scope): TestEmptyConstructor = TestEmptyConstructor()
@@ -1646,12 +1646,12 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestNonEmptyConstructor__Factory : Factory<TestNonEmptyConstructor> {
               @Suppress(
                 "UNCHECKED_CAST",
-                "NAME_SHADOWING"
+                "NAME_SHADOWING",
               )
               public override fun createInstance(scope: Scope): TestNonEmptyConstructor {
                 val scope = getTargetScope(scope)
@@ -1739,12 +1739,12 @@ class FactoryTest {
             
             @Suppress(
               "ClassName",
-              "RedundantVisibilityModifier"
+              "RedundantVisibilityModifier",
             )
             public class TestNonEmptyConstructor__Factory : Factory<TestNonEmptyConstructor> {
               @Suppress(
                 "UNCHECKED_CAST",
-                "NAME_SHADOWING"
+                "NAME_SHADOWING",
               )
               public override fun createInstance(scope: Scope): TestNonEmptyConstructor {
                 val scope = getTargetScope(scope)

diff --git a/...tor/src/main/java/toothpick/compiler/memberinjector/generators/MemberInjectorGenerator.kt b/...tor/src/main/java/toothpick/compiler/memberinjector/generators/MemberInjectorGenerator.kt
@@ -28,7 +28,6 @@ import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.asClassName
-import com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview
 import com.squareup.kotlinpoet.ksp.addOriginatingKSFile
 import com.squareup.kotlinpoet.ksp.toClassName
 import com.squareup.kotlinpoet.ksp.toKModifier
@@ -48,7 +47,6 @@ import javax.inject.Inject
  *
  * Typically, a [MemberInjector] is created for a class a soon as it contains an [Inject] annotated field or method.
  */
-@OptIn(KotlinPoetKspPreview::class)
 internal class MemberInjectorGenerator(
     private val sourceClass: KSClassDeclaration,
     private val superClassThatNeedsInjection: KSClassDeclaration?,