diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32721e1..9b95e15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,9 +46,10 @@ jobs: run: ./gradlew -PRELEASE_SIGNING_ENABLED=false publishToMavenLocal build - name: Publish the artifacts env: - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SECRET_PASSPHRASE }} run: ./gradlew publishAllPublicationsToMavenCentralRepository --no-parallel --stacktrace env: diff --git a/gradle.properties b/gradle.properties index 139056d..bafa1c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,6 +27,6 @@ POM_DEVELOPER_NAME=Square, Inc. POM_DEVELOPER_URL=https://github.com/squareup/ SONATYPE_STAGING_PROFILE=com.squareup -SONATYPE_HOST=S01 +SONATYPE_HOST=CENTRAL_PORTAL RELEASE_SIGNING_ENABLED=true SONATYPE_AUTOMATIC_RELEASE=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 122c826..87841f9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -kotlin = "1.8.20" +kotlin = "1.9.20" kotlinDsl = "4.1.1" -dokka = "1.8.20" +dokka = "1.9.20" kotlinx = "1.7.3" -kotlinSerialization = "1.5.1" +kotlinSerialization = "1.6.0" gradleTAPI = "7.4.2" @@ -21,7 +21,7 @@ koin = "3.3.0" jgit = "6.4.0.202211300538-r" -vanniktech = "0.25.3" +vanniktech = "0.34.0" [libraries] # Plugins diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c747538..be2dc79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/plugins/src/main/kotlin/com/squareup/plugins/Utils.kt b/plugins/src/main/kotlin/com/squareup/plugins/Utils.kt index 2474b1d..0156ccc 100644 --- a/plugins/src/main/kotlin/com/squareup/plugins/Utils.kt +++ b/plugins/src/main/kotlin/com/squareup/plugins/Utils.kt @@ -30,7 +30,6 @@ import org.jetbrains.dokka.Platform import org.jetbrains.dokka.gradle.DokkaPlugin import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension -import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin import org.jetbrains.kotlin.gradle.utils.notCompatibleWithConfigurationCacheCompat import java.io.File @@ -62,7 +61,7 @@ internal fun Project.configureDokka() { } internal fun Project.configureJVM() { - apply() + plugins.apply("org.jetbrains.kotlin.jvm") configure { sourceCompatibility = JavaVersion.VERSION_17