From c9222a370c274b4a872aaf4061eb57493e2a9472 Mon Sep 17 00:00:00 2001 From: Nicklas Ansman Date: Fri, 19 Jul 2024 21:42:27 -0400 Subject: [PATCH] Prepare for release 3.0.0 --- README.md | 12 ++++++------ gradle-plugin/build.gradle.kts | 1 + .../src/main/kotlin/published-library.gradle.kts | 1 + gradle.properties | 2 +- gradle/libs.versions.toml | 2 ++ publish.sh | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e77e173..400b788 100644 --- a/README.md +++ b/README.md @@ -70,10 +70,10 @@ the module wide setting). ### Annotations * `@JsonSerializable` is the annotation used to generate `JsonAdapter`'s. Should only be placed on data classes, enums, sealed classes and objects. -* `@KotshiJsonAdapterFactory` makes Kotshi generate a JsonAdapter factory. Should be placed on an abstract class that implements `JsonAdapter.Factory`. +* `@KotshiJsonAdapterFactory` makes Kotshi generate a JsonAdapter factory. Should be placed on an object that implements `JsonAdapter.Factory`. * `@JsonDefaultValue` can be used to annotate a fallback for enums or sealed classes when an unknown entry is encountered. The default is to thrown an exception. * `@JsonProperty` can be used to customize how a property or enum entry is serialized to and from JSON. -* `@Polymorphic` and `@PolymorphicLabel` used on sealed classes and their implementions. +* `@Polymorphic` and `@PolymorphicLabel` used on sealed classes and their implementations. * `@RegisterJsonAdapter` registers a json adapter into the Kotshi json adapter factory. ### Default Values @@ -160,7 +160,7 @@ Examples: } dependencies { - val kotshiVersion = "2.15.0" + val kotshiVersion = "3.0.0" implementation("se.ansman.kotshi:api:$kotshiVersion") ksp("se.ansman.kotshi:compiler:$kotshiVersion") } @@ -176,7 +176,7 @@ Examples: } dependencies { - val kotshiVersion = "2.15.0" + val kotshiVersion = "3.0.0" implementation("se.ansman.kotshi:api:$kotshiVersion") kapt("se.ansman.kotshi:compiler:$kotshiVersion") } @@ -192,7 +192,7 @@ Examples: } dependencies { - def kotshiVersion = "2.15.0" + def kotshiVersion = "3.0.0" implementation "se.ansman.kotshi:api:$kotshiVersion" ksp "se.ansman.kotshi:compiler:$kotshiVersion" } @@ -208,7 +208,7 @@ Examples: } dependencies { - def kotshiVersion = "2.15.0" + def kotshiVersion = "3.0.0" implementation "se.ansman.kotshi:api:$kotshiVersion" kapt "se.ansman.kotshi:compiler:$kotshiVersion" } diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index afffeb6..aed49bc 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -8,6 +8,7 @@ dependencies { implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) api(libs.kotlin.gradlePlugin) api(libs.dokka.gradlePlugin) + api(libs.sonatypePublishFix) implementation(gradleKotlinDsl()) } diff --git a/gradle-plugin/src/main/kotlin/published-library.gradle.kts b/gradle-plugin/src/main/kotlin/published-library.gradle.kts index 193762e..176d3c6 100644 --- a/gradle-plugin/src/main/kotlin/published-library.gradle.kts +++ b/gradle-plugin/src/main/kotlin/published-library.gradle.kts @@ -7,6 +7,7 @@ plugins { id("maven-publish") id("signing") id("org.jetbrains.dokka") + id("se.ansman.sonatype-publish-fix") } version = providers.gradleProperty("version").get() diff --git a/gradle.properties b/gradle.properties index 825464e..01a71f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.16.0-SNAPSHOT +version=3.0.0 kapt.include.compile.classpath=false kapt.incremental.apt=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index daf648e..8e2d77a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,6 +16,8 @@ kotlinx-binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibili kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlin-metadata = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin" } +sonatypePublishFix = "se.ansman.sonatype-publish-fix:gradle-plugin:1.0.0" + dokka-gradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.20" auto-common = "com.google.auto:auto-common:1.2.2" diff --git a/publish.sh b/publish.sh index 2340db8..1d72bfd 100755 --- a/publish.sh +++ b/publish.sh @@ -2,4 +2,4 @@ ./gradlew clean PASSPHRASE=$(op read op://private/GnuPG/password | xargs) -./gradlew publishAllPublicationsToMavenCentralRepository -PsignArtifacts=true "-Psigning.gnupg.passphrase=$PASSPHRASE" --no-parallel --no-configuration-cache \ No newline at end of file +./gradlew publishAllPublicationsToMavenCentralRepository -PsignArtifacts=true -Psigning.gnupg.keyName=7A743C13 "-Psigning.gnupg.passphrase=$PASSPHRASE" \ No newline at end of file