Bump kotlinpoet from 1.14.2 to 1.15.3 (#276)

* Bump kotlinpoet from 1.14.2 to 1.15.3 Bumps `kotlinpoet` from 1.14.2 to 1.15.3. Updates `com.squareup:kotlinpoet` from 1.14.2 to 1.15.3 - [Release notes](https://github.com/square/kotlinpoet/releases) - [Changelog](https://github.com/square/kotlinpoet/blob/main/docs/changelog.md) - [Commits](square/kotlinpoet@1.14.2...1.15.3) Updates `com.squareup:kotlinpoet-metadata` from 1.14.2 to 1.15.3 - [Release notes](https://github.com/square/kotlinpoet/releases) - [Changelog](https://github.com/square/kotlinpoet/blob/main/docs/changelog.md) - [Commits](square/kotlinpoet@1.14.2...1.15.3) Updates `com.squareup:kotlinpoet-ksp` from 1.14.2 to 1.15.3 - [Release notes](https://github.com/square/kotlinpoet/releases) - [Changelog](https://github.com/square/kotlinpoet/blob/main/docs/changelog.md) - [Commits](square/kotlinpoet@1.14.2...1.15.3) --- updated-dependencies: - dependency-name: com.squareup:kotlinpoet dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.squareup:kotlinpoet-metadata dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.squareup:kotlinpoet-ksp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Fix the compilation errors --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicklas Ansman <[email protected]>
ansman · Dec 29, 2023 · f52fef4 · f52fef4
1 parent 9feeea9
commit f52fef4
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/compiler/src/main/kotlin/se/ansman/kotshi/kapt/AdaptersProcessingStep.kt b/compiler/src/main/kotlin/se/ansman/kotshi/kapt/AdaptersProcessingStep.kt
@@ -4,10 +4,8 @@ package se.ansman.kotshi.kapt
 
 import com.google.auto.common.MoreElements
 import com.google.common.collect.SetMultimap
-import com.squareup.kotlinpoet.metadata.isData
-import com.squareup.kotlinpoet.metadata.isEnum
-import com.squareup.kotlinpoet.metadata.isObject
 import kotlinx.metadata.Modality
+import kotlinx.metadata.isData
 import kotlinx.metadata.modality
 import se.ansman.kotshi.Errors
 import se.ansman.kotshi.JsonDefaultValue

diff --git a/compiler/src/main/kotlin/se/ansman/kotshi/kapt/AnnotationModelValueVisitor.kt b/compiler/src/main/kotlin/se/ansman/kotshi/kapt/AnnotationModelValueVisitor.kt
@@ -25,13 +25,13 @@ import com.squareup.kotlinpoet.U_SHORT
 import com.squareup.kotlinpoet.U_SHORT_ARRAY
 import com.squareup.kotlinpoet.WildcardTypeName
 import com.squareup.kotlinpoet.asTypeName
-import com.squareup.kotlinpoet.metadata.isNullable
 import com.squareup.kotlinpoet.tags.TypeAliasTag
 import kotlinx.metadata.KmClassifier
 import kotlinx.metadata.KmFlexibleTypeUpperBound
 import kotlinx.metadata.KmType
 import kotlinx.metadata.KmTypeProjection
 import kotlinx.metadata.KmVariance
+import kotlinx.metadata.isNullable
 import kotlinx.metadata.isSecondary
 import se.ansman.kotshi.model.AnnotationModel
 import javax.lang.model.element.AnnotationMirror

diff --git a/compiler/src/main/kotlin/se/ansman/kotshi/kapt/FactoryProcessingStep.kt b/compiler/src/main/kotlin/se/ansman/kotshi/kapt/FactoryProcessingStep.kt
@@ -8,8 +8,6 @@ import com.google.common.collect.SetMultimap
 import com.squareup.kotlinpoet.DelicateKotlinPoetApi
 import com.squareup.kotlinpoet.asTypeName
 import com.squareup.kotlinpoet.asTypeVariableName
-import com.squareup.kotlinpoet.metadata.isClass
-import com.squareup.kotlinpoet.metadata.isObject
 import com.squareup.moshi.JsonAdapter
 import kotlinx.metadata.ClassKind
 import kotlinx.metadata.Modality

diff --git a/compiler/src/main/kotlin/se/ansman/kotshi/kapt/KmClasses.kt b/compiler/src/main/kotlin/se/ansman/kotshi/kapt/KmClasses.kt
@@ -0,0 +1,8 @@
+package se.ansman.kotshi.kapt
+
+import kotlinx.metadata.KmClass
+import kotlinx.metadata.kind
+
+val KmClass.isClass get() = kind == kotlinx.metadata.ClassKind.CLASS
+val KmClass.isObject get() = kind == kotlinx.metadata.ClassKind.OBJECT
+val KmClass.isEnum get() = kind == kotlinx.metadata.ClassKind.ENUM_CLASS
diff --git a/compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/AdapterGenerator.kt b/compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/AdapterGenerator.kt
@@ -6,10 +6,10 @@ import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.TypeName
 import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.TypeVariableName
-import com.squareup.kotlinpoet.metadata.isInner
 import com.squareup.kotlinpoet.tag
 import kotlinx.metadata.KmClass
 import kotlinx.metadata.Visibility
+import kotlinx.metadata.isInner
 import kotlinx.metadata.visibility
 import se.ansman.kotshi.Errors
 import se.ansman.kotshi.Polymorphic

diff --git a/compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/DataClassAdapterGenerator.kt b/compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/DataClassAdapterGenerator.kt
@@ -2,10 +2,10 @@ package se.ansman.kotshi.kapt.generators
 
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.ParameterSpec
-import com.squareup.kotlinpoet.metadata.isData
 import com.squareup.kotlinpoet.tag
 import kotlinx.metadata.KmClass
 import kotlinx.metadata.KmConstructor
+import kotlinx.metadata.isData
 import kotlinx.metadata.jvm.signature
 import se.ansman.kotshi.Errors
 import se.ansman.kotshi.Errors.privateDataClassProperty

diff --git a/compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/EnumAdapterGenerator.kt b/compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/EnumAdapterGenerator.kt
@@ -1,12 +1,12 @@
 package se.ansman.kotshi.kapt.generators
 
 import com.squareup.kotlinpoet.TypeSpec
-import com.squareup.kotlinpoet.metadata.isEnum
 import kotlinx.metadata.KmClass
 import se.ansman.kotshi.Errors
 import se.ansman.kotshi.Types.Kotshi.jsonDefaultValue
 import se.ansman.kotshi.kapt.KaptProcessingError
 import se.ansman.kotshi.kapt.MetadataAccessor
+import se.ansman.kotshi.kapt.isEnum
 import se.ansman.kotshi.kapt.jsonName
 import se.ansman.kotshi.model.EnumJsonAdapter
 import se.ansman.kotshi.model.GeneratableJsonAdapter

diff --git a/compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/ObjectAdapterGenerator.kt b/compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/ObjectAdapterGenerator.kt
@@ -1,10 +1,10 @@
 package se.ansman.kotshi.kapt.generators
 
-import com.squareup.kotlinpoet.metadata.isObject
 import kotlinx.metadata.KmClass
 import kotlinx.metadata.isData
 import se.ansman.kotshi.Errors
 import se.ansman.kotshi.kapt.MetadataAccessor
+import se.ansman.kotshi.kapt.isObject
 import se.ansman.kotshi.kapt.logKotshiWarning
 import se.ansman.kotshi.model.GeneratableJsonAdapter
 import se.ansman.kotshi.model.GlobalConfig

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin = "1.9.22"
 auto-service = "1.1.1"
-kotlinpoet = "1.14.2"
+kotlinpoet = "1.15.3"
 compileTesting = "1.5.0"
 incap = "1.0.0"
 ksp = "1.9.22-1.0.16"