From df301e2fc887172794529efb455d4942b5e2c1e8 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 17:59:01 -0500 Subject: [PATCH 01/15] Update dependencies --- gradle/libs.versions.toml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7219fb266..c091ce8e7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,37 +1,37 @@ [versions] autoService = "1.0" -gjf = "1.11.0" +gjf = "1.15.0" jvmTarget = "1.8" -kotlin = "1.6.10" -kotlinCompileTesting = "1.4.7" -kotlinpoet = "1.10.2" -ksp = "1.6.10-1.0.2" -ktlint = "0.41.0" +kotlin = "1.7.0" +kotlinCompileTesting = "1.4.9-alpha01" +kotlinpoet = "1.11.0" +ksp = "1.7.0-1.0.6" +ktlint = "0.45.2" [plugins] -dokka = { id = "org.jetbrains.dokka", version.ref = "kotlin" } +dokka = { id = "org.jetbrains.dokka", version = "1.6.21" } japicmp = { id = "me.champeau.gradle.japicmp", version = "0.2.9" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.18.0" } +mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.20.0" } mavenShadow = { id = "com.github.johnrengelman.shadow", version = "7.0.0" } -spotless = { id = "com.diffplug.spotless", version = "6.1.0" } +spotless = { id = "com.diffplug.spotless", version = "6.7.1" } [libraries] -asm = "org.ow2.asm:asm:9.2" +asm = "org.ow2.asm:asm:9.3" autoCommon = "com.google.auto:auto-common:1.1" autoService = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoService" } autoService-ksp = "dev.zacsweers.autoservice:auto-service-ksp:1.0.0" -guava = "com.google.guava:guava:30.1.1-jre" +guava = "com.google.guava:guava:31.1-jre" jsr305 = "com.google.code.findbugs:jsr305:3.0.2" kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" } kotlinpoet-metadata = { module = "com.squareup:kotlinpoet-metadata", version.ref = "kotlinpoet" } kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" } -kotlinxMetadata = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.0" +kotlinxMetadata = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.2" ksp = { module = "com.google.devtools.ksp:symbol-processing", version.ref = "ksp" } ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" } -okio = "com.squareup.okio:okio:3.0.0" +okio = "com.squareup.okio:okio:3.1.0" # Test libs assertj = "org.assertj:assertj-core:3.11.1" From 8fa2b24ecc4e503b427b3660502a93d4d310979a Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 17:59:09 -0500 Subject: [PATCH 02/15] Remove now-unnecessary jvm args --- gradle.properties | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3dff31126..4d3fb2a50 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,4 @@ # Memory for Dokka https://github.com/Kotlin/dokka/issues/1405 -# --add-opens for GJF https://github.com/google/google-java-format#jdk-16 -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 \ - --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ - --add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ - --add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \ - --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ - --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kapt.include.compile.classpath=false From dc35f79b489f57e2210b6be77c07532b9711665d Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 17:59:20 -0500 Subject: [PATCH 03/15] Update ktlint API in spotless --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6a0324f84..64cfc20ac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,17 +48,17 @@ spotless { java { configureCommonJavaFormat() target("**/*.java") - targetExclude("**/build/**",) + targetExclude("**/build/**") } kotlin { - ktlint(libs.versions.ktlint.get()).userData(mapOf("indent_size" to "2")) + ktlint(libs.versions.ktlint.get()).editorConfigOverride(mapOf("indent_size" to "2")) target("**/*.kt") trimTrailingWhitespace() endWithNewline() targetExclude("**/Dependencies.kt", "**/build/**") } kotlinGradle { - ktlint(libs.versions.ktlint.get()).userData(mapOf("indent_size" to "2")) + ktlint(libs.versions.ktlint.get()).editorConfigOverride(mapOf("indent_size" to "2")) target("**/*.gradle.kts") trimTrailingWhitespace() endWithNewline() From 7cfe5bbe5a4ece6716863cf1a024b66a3209efde Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 17:59:38 -0500 Subject: [PATCH 04/15] Update actions versions + remove unused matrix in name --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a619001b..d7778ca08 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: - name: 'Kotlin ${{ matrix.kotlin-version }} | Test Mode ${{ matrix.kotlin-test-mode }}' + name: 'Test Mode ${{ matrix.kotlin-test-mode }}' runs-on: ubuntu-latest strategy: @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 @@ -30,7 +30,7 @@ jobs: ${{ runner.os }}-gradle- - name: Configure JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '17' From adc10cffa3646afeb57fd7d3e97886f5a5a45c86 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 17:59:46 -0500 Subject: [PATCH 05/15] Gradle 7.4.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e0..aa991fcea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 0578f3e7ffad60092ad44a801145fe4bdc876ff9 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 18:00:46 -0500 Subject: [PATCH 06/15] Update -Xopt-in to -opt-in --- examples/build.gradle.kts | 2 +- moshi-kotlin-codegen/build.gradle.kts | 8 ++++---- moshi-kotlin-tests/build.gradle.kts | 2 +- moshi-kotlin-tests/codegen-only/build.gradle.kts | 2 +- moshi/build.gradle.kts | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 23bfa131f..0e249b2c7 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { tasks.withType().configureEach { kotlinOptions { freeCompilerArgs += listOf( - "-Xopt-in=kotlin.ExperimentalStdlibApi" + "-opt-in=kotlin.ExperimentalStdlibApi" ) } } diff --git a/moshi-kotlin-codegen/build.gradle.kts b/moshi-kotlin-codegen/build.gradle.kts index bd0058151..10480965d 100644 --- a/moshi-kotlin-codegen/build.gradle.kts +++ b/moshi-kotlin-codegen/build.gradle.kts @@ -16,10 +16,10 @@ tasks.withType().configureEach { kotlinOptions { @Suppress("SuspiciousCollectionReassignment") freeCompilerArgs += listOf( - "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=com.squareup.kotlinpoet.metadata.KotlinPoetMetadataPreview", - "-Xopt-in=com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview", - "-Xopt-in=com.squareup.moshi.kotlin.codegen.api.InternalMoshiCodegenApi", + "-opt-in=kotlin.RequiresOptIn", + "-opt-in=com.squareup.kotlinpoet.metadata.KotlinPoetMetadataPreview", + "-opt-in=com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview", + "-opt-in=com.squareup.moshi.kotlin.codegen.api.InternalMoshiCodegenApi", ) } } diff --git a/moshi-kotlin-tests/build.gradle.kts b/moshi-kotlin-tests/build.gradle.kts index beee30229..bd9375c1d 100644 --- a/moshi-kotlin-tests/build.gradle.kts +++ b/moshi-kotlin-tests/build.gradle.kts @@ -42,7 +42,7 @@ tasks.withType().configureEach { allWarningsAsErrors = useWError @Suppress("SuspiciousCollectionReassignment") freeCompilerArgs += listOf( - "-Xopt-in=kotlin.ExperimentalStdlibApi" + "-opt-in=kotlin.ExperimentalStdlibApi" ) } } diff --git a/moshi-kotlin-tests/codegen-only/build.gradle.kts b/moshi-kotlin-tests/codegen-only/build.gradle.kts index 2e6a82f1f..d4aafe3dd 100644 --- a/moshi-kotlin-tests/codegen-only/build.gradle.kts +++ b/moshi-kotlin-tests/codegen-only/build.gradle.kts @@ -43,7 +43,7 @@ tasks.withType().configureEach { allWarningsAsErrors = useWError @Suppress("SuspiciousCollectionReassignment") freeCompilerArgs += listOf( - "-Xopt-in=kotlin.ExperimentalStdlibApi" + "-opt-in=kotlin.ExperimentalStdlibApi" ) } } diff --git a/moshi/build.gradle.kts b/moshi/build.gradle.kts index b83c158d9..20dfe6c1c 100644 --- a/moshi/build.gradle.kts +++ b/moshi/build.gradle.kts @@ -61,12 +61,12 @@ tasks.withType() .configureEach { kotlinOptions { val toAdd = mutableListOf( - "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=kotlin.contracts.ExperimentalContracts", + "-opt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.contracts.ExperimentalContracts", "-Xjvm-default=enable" ) if (name.contains("test", true)) { - toAdd += "-Xopt-in=kotlin.ExperimentalStdlibApi" + toAdd += "-opt-in=kotlin.ExperimentalStdlibApi" } @Suppress("SuspiciousCollectionReassignment") // It's not suspicious freeCompilerArgs += toAdd From 0244d5fc103a79d4ee7cba5ca1bca002f784dc9f Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 18:01:06 -0500 Subject: [PATCH 07/15] Update jvm-default to all instead of enable --- moshi/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moshi/build.gradle.kts b/moshi/build.gradle.kts index 20dfe6c1c..58f820f99 100644 --- a/moshi/build.gradle.kts +++ b/moshi/build.gradle.kts @@ -63,7 +63,7 @@ tasks.withType() val toAdd = mutableListOf( "-opt-in=kotlin.RequiresOptIn", "-opt-in=kotlin.contracts.ExperimentalContracts", - "-Xjvm-default=enable" + "-Xjvm-default=all" ) if (name.contains("test", true)) { toAdd += "-opt-in=kotlin.ExperimentalStdlibApi" From f989d75fa359dc75b2834e7402c7f4b78de3ccfa Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 18:01:25 -0500 Subject: [PATCH 08/15] Update deprecated comment API in KP --- .../com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moshi-kotlin-codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt b/moshi-kotlin-codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt index 00b7ee023..00a17f3d5 100644 --- a/moshi-kotlin-codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt +++ b/moshi-kotlin-codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt @@ -184,7 +184,7 @@ public class AdapterGenerator( val generatedAdapter = generateType().let(typeHook) val result = FileSpec.builder(className.packageName, adapterName) - result.addComment("Code generated by moshi-kotlin-codegen. Do not edit.") + result.addFileComment("Code generated by moshi-kotlin-codegen. Do not edit.") result.addAnnotation(COMMON_SUPPRESS) result.addType(generatedAdapter) val proguardConfig = if (generateProguardRules) { From 5dc642907ed35c9b1d8f7f9ba910f85abb063415 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 18:01:42 -0500 Subject: [PATCH 09/15] ktlint formatting change --- moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.kt b/moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.kt index 593192405..5e73f91ef 100644 --- a/moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.kt +++ b/moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.kt @@ -425,15 +425,15 @@ internal class JsonUtf8Reader : JsonReader { return when { last == NUMBER_CHAR_DIGIT && fitsInLong && - (value != Long.MIN_VALUE || negative) - && (value != 0L || !negative) -> { + (value != Long.MIN_VALUE || negative) && + (value != 0L || !negative) -> { peekedLong = if (negative) value else -value buffer.skip(i) setPeeked(PEEKED_LONG) } last == NUMBER_CHAR_DIGIT || - last == NUMBER_CHAR_FRACTION_DIGIT - || last == NUMBER_CHAR_EXP_DIGIT -> { + last == NUMBER_CHAR_FRACTION_DIGIT || + last == NUMBER_CHAR_EXP_DIGIT -> { peekedNumberLength = i.toInt() setPeeked(PEEKED_NUMBER) } From a4ad328408780d063998e8c23d94c3a678cc76e5 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 18:03:52 -0500 Subject: [PATCH 10/15] Update escapes in test --- .../squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/moshi-kotlin-tests/src/test/kotlin/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt b/moshi-kotlin-tests/src/test/kotlin/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt index 5543d488e..8f84bcde2 100644 --- a/moshi-kotlin-tests/src/test/kotlin/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt +++ b/moshi-kotlin-tests/src/test/kotlin/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt @@ -288,7 +288,7 @@ class KotlinJsonAdapterTest { } catch (expected: IllegalArgumentException) { assertThat(expected).hasMessageThat().isEqualTo( "No default value for transient constructor parameter #0 " + - "a of fun (kotlin.Int): " + + "a of fun ``(kotlin.Int): " + "com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterTest.RequiredTransientConstructorParameter" ) } @@ -304,7 +304,7 @@ class KotlinJsonAdapterTest { } catch (expected: IllegalArgumentException) { assertThat(expected).hasMessageThat().isEqualTo( "No default value for ignored constructor parameter #0 " + - "a of fun (kotlin.Int): " + + "a of fun ``(kotlin.Int): " + "com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterTest.RequiredIgnoredConstructorParameter" ) } @@ -550,7 +550,7 @@ class KotlinJsonAdapterTest { fail() } catch (expected: IllegalArgumentException) { assertThat(expected).hasMessageThat().isEqualTo( - "No property for required constructor parameter #0 a of fun (" + + "No property for required constructor parameter #0 a of fun ``(" + "kotlin.Int, kotlin.Int): ${NonPropertyConstructorParameter::class.qualifiedName}" ) } From 699bd43636e5b4a1da2bcd164b65ea3ec04ec541 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 18:09:29 -0500 Subject: [PATCH 11/15] Explicitly define apt embeddable dep to fix conflicting kct version KCT shipped an alpha built against a snapshot from kotlin :facepalm: --- gradle/libs.versions.toml | 1 + moshi-kotlin-codegen/build.gradle.kts | 1 + 2 files changed, 2 insertions(+) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c091ce8e7..3bf3cdd82 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,6 +23,7 @@ autoService = { module = "com.google.auto.service:auto-service-annotations", ver autoService-ksp = "dev.zacsweers.autoservice:auto-service-ksp:1.0.0" guava = "com.google.guava:guava:31.1-jre" jsr305 = "com.google.code.findbugs:jsr305:3.0.2" +kotlin-annotationProcessingEmbeddable = { module = "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable", version.ref = "kotlin" } kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" } diff --git a/moshi-kotlin-codegen/build.gradle.kts b/moshi-kotlin-codegen/build.gradle.kts index 10480965d..610992b89 100644 --- a/moshi-kotlin-codegen/build.gradle.kts +++ b/moshi-kotlin-codegen/build.gradle.kts @@ -72,6 +72,7 @@ dependencies { testImplementation(libs.ksp) testImplementation(libs.ksp.api) testImplementation(libs.kotlin.compilerEmbeddable) + testImplementation(libs.kotlin.annotationProcessingEmbeddable) testImplementation(libs.kotlinCompileTesting.ksp) // Copy these again as they're not automatically included since they're shaded From f8b674a2fedae37989d8a6fdd5a119b9e7afafd2 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 11 Jun 2022 18:09:39 -0500 Subject: [PATCH 12/15] Upgrade to JDK 18 --- .github/workflows/build.yml | 2 +- build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7778ca08..796436bc2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '17' + java-version: '18' - name: Test run: ./gradlew build check --stacktrace -PkotlinTestMode=${{ matrix.kotlin-test-mode }} diff --git a/build.gradle.kts b/build.gradle.kts index 64cfc20ac..8d50a4a9a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -70,7 +70,7 @@ subprojects { pluginManager.withPlugin("java") { configure { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(18)) } } if (project.name != "records-tests") { From 0fd03032f0f46c006ac8debe13856bca86e89732 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sun, 12 Jun 2022 22:31:58 -0400 Subject: [PATCH 13/15] No longer shade kotlinpoet-ksp --- moshi-kotlin-codegen/build.gradle.kts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/moshi-kotlin-codegen/build.gradle.kts b/moshi-kotlin-codegen/build.gradle.kts index 610992b89..97ec6c927 100644 --- a/moshi-kotlin-codegen/build.gradle.kts +++ b/moshi-kotlin-codegen/build.gradle.kts @@ -54,10 +54,7 @@ dependencies { exclude(group = "com.squareup", module = "kotlinpoet") exclude(group = "com.google.guava") } - shade(libs.kotlinpoet.ksp) { - exclude(group = "org.jetbrains.kotlin") - exclude(group = "com.squareup", module = "kotlinpoet") - } + implementation(libs.kotlinpoet.ksp) implementation(libs.guava) implementation(libs.asm) From 3ebbdc23c80b794accfd142e3107f3352162c789 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sun, 12 Jun 2022 22:32:15 -0400 Subject: [PATCH 14/15] Remove unused kotlin-reflect dependency from code gen --- moshi-kotlin-codegen/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/moshi-kotlin-codegen/build.gradle.kts b/moshi-kotlin-codegen/build.gradle.kts index 97ec6c927..9dbaf4fa0 100644 --- a/moshi-kotlin-codegen/build.gradle.kts +++ b/moshi-kotlin-codegen/build.gradle.kts @@ -44,7 +44,6 @@ val shade: Configuration = configurations.maybeCreate("compileShaded") configurations.getByName("compileOnly").extendsFrom(shade) dependencies { implementation(project(":moshi")) - implementation(kotlin("reflect")) shade(libs.kotlinxMetadata) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib") } From 1fcb1fd2ef613090c7edca70e8043a55dcbfabe3 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Mon, 13 Jun 2022 16:54:43 -0400 Subject: [PATCH 15/15] Update kotlinpoet to 1.12.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3bf3cdd82..a31ed4751 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ gjf = "1.15.0" jvmTarget = "1.8" kotlin = "1.7.0" kotlinCompileTesting = "1.4.9-alpha01" -kotlinpoet = "1.11.0" +kotlinpoet = "1.12.0" ksp = "1.7.0-1.0.6" ktlint = "0.45.2"