diff --git a/CHANGELOG.md b/CHANGELOG.md index ba71800c..93a44096 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ Changelog ========= +Version 0.12.2 +-------------- + +_2021-08-20_ + +* **Fix:** `RecordsJsonAdapterFactory` now properly respects `@JsonQualifier` annotations on components. +* **Fix:** `RecordsJsonAdapterFactory` now supports non-public constructors (i.e. package or file-private). +* **Fix:** Crash in `moshi-ksp` when dealing with generic typealias properites. + Version 0.12.1 -------------- diff --git a/gradle.properties b/gradle.properties index 5c63bab7..23174eda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 \ --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED GROUP=dev.zacsweers.moshix -VERSION_NAME=0.13.0-SNAPSHOT +VERSION_NAME=0.12.2 POM_DESCRIPTION=Moshi Extensions POM_URL=https://github.com/ZacSweers/MoshiX POM_SCM_URL=https://github.com/ZacSweers/MoshiX diff --git a/moshi-ksp/moshi-ksp/src/main/kotlin/dev/zacsweers/moshix/ksp/KotlinPoetSp.kt b/moshi-ksp/moshi-ksp/src/main/kotlin/dev/zacsweers/moshix/ksp/KotlinPoetSp.kt index d374766d..699af7b4 100644 --- a/moshi-ksp/moshi-ksp/src/main/kotlin/dev/zacsweers/moshix/ksp/KotlinPoetSp.kt +++ b/moshi-ksp/moshi-ksp/src/main/kotlin/dev/zacsweers/moshix/ksp/KotlinPoetSp.kt @@ -58,8 +58,8 @@ internal fun KSType.toTypeName(typeParamResolver: TypeParameterResolver): TypeNa } val args = arguments.map { it.toTypeName(typeParamResolver) } val firstPass = decl.type.resolve().toTypeName(extraResolver).copy(nullable = isMarkedNullable) - return if (args.isNotEmpty()) { - firstPass.rawType().parameterizedBy(args).copy(nullable = firstPass.isNullable) + if (args.isNotEmpty()) { + firstPass.rawType().parameterizedBy(args) } else { firstPass } diff --git a/settings.gradle.kts b/settings.gradle.kts index a1d6ce73..84b854a7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -37,15 +37,12 @@ include(":moshi-ksp:extra-moshi-test-module") include(":moshi-ksp:moshi-ksp") include(":moshi-ksp:tests") include(":moshi-metadata-reflect") -include(":moshi-sealed:runtime") +include(":moshi-records-reflect") include(":moshi-sealed:codegen") include(":moshi-sealed:codegen-ksp") -include(":moshi-sealed:reflect") +include(":moshi-sealed:java-sealed-reflect") include(":moshi-sealed:metadata-reflect") +include(":moshi-sealed:reflect") +include(":moshi-sealed:runtime") include(":moshi-sealed:sample") - -if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) { - include(":moshi-records-reflect") - include(":moshi-sealed:java-sealed-reflect") - include(":moshi-sealed:sealed-interfaces-samples:java") -} +include(":moshi-sealed:sealed-interfaces-samples:java")