Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump kotlinpoet from 1.14.2 to 1.15.3 #276

Merged
merged 2 commits into from
Dec 29, 2023
Merged

Bump kotlinpoet from 1.14.2 to 1.15.3 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4566549
Bump kotlinpoet from 1.14.2 to 1.15.3
dependabot[bot] Dec 4, 2023
4e3ac94
Fix the compilation errors
ansman Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions compiler/src/main/kotlin/se/ansman/kotshi/kapt/AdaptersProcessingStep.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/main/kotlin/se/ansman/kotshi/kapt/AnnotationModelValueVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions compiler/src/main/kotlin/se/ansman/kotshi/kapt/FactoryProcessingStep.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions compiler/src/main/kotlin/se/ansman/kotshi/kapt/KmClasses.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/AdapterGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/DataClassAdapterGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/EnumAdapterGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/main/kotlin/se/ansman/kotshi/kapt/generators/ObjectAdapterGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading