diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index c78984bf1..e8e09ad3e 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -46,7 +46,7 @@ jobs: gradle-version: 8.3 arguments: | publishToSonatype - closeAndReleaseStagingRepository + closeAndReleaseStagingRepositories --info --warning-mode all -x test @@ -84,7 +84,7 @@ jobs: gradle-version: 8.3 arguments: | publishToSonatype - closeAndReleaseStagingRepository + closeAndReleaseStagingRepositories --info --warning-mode all -x test diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 2eb12138d..1f32ff235 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -56,7 +56,7 @@ jobs: gradle-version: 8.3 arguments: | publishToSonatype - closeAndReleaseStagingRepository + closeAndReleaseStagingRepositories --info --warning-mode all -x test diff --git a/.github/workflows/publish-v4-release.yml b/.github/workflows/publish-v4-release.yml index c14134321..e4b2f0ea8 100644 --- a/.github/workflows/publish-v4-release.yml +++ b/.github/workflows/publish-v4-release.yml @@ -76,7 +76,7 @@ jobs: gradle-version: 8.5 arguments: | publishToSonatype - closeAndReleaseStagingRepository + closeAndReleaseStagingRepositories --info --warning-mode all -x test @@ -114,7 +114,7 @@ jobs: gradle-version: 8.5 arguments: | publishToSonatype - closeAndReleaseStagingRepository + closeAndReleaseStagingRepositories --info --warning-mode all -x test diff --git a/.github/workflows/publish-v4-snapshot.yml b/.github/workflows/publish-v4-snapshot.yml index 3015cad60..3413d5aa4 100644 --- a/.github/workflows/publish-v4-snapshot.yml +++ b/.github/workflows/publish-v4-snapshot.yml @@ -74,7 +74,7 @@ jobs: gradle-version: 8.5 arguments: | publishToSonatype - closeAndReleaseStagingRepository + closeAndReleaseStagingRepositories --info --warning-mode all -x test diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 5cd8af17e..15025f57b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { implementation(libs.bundles.dokka) // see https://github.com/gradle-nexus/publish-plugin - implementation("io.github.gradle-nexus:publish-plugin:1.3.0") + implementation(libs.gradleNexusPublishPlugin) // suspend transform implementation(libs.suspend.transform.gradle) @@ -55,14 +55,3 @@ idea { } } -// tasks.withType(KotlinCompile::class.java).configureEach { -// kotlinOptions.languageVersion = "1.9" -// } - -// val compileKotlin: KotlinCompile by tasks -// compileKotlin.kotlinOptions.freeCompilerArgs += listOf( -// "-Xjvm-default=all", -// // "-opt-in=kotlin.RequiresOptIn", -// // see https://youtrack.jetbrains.com/issue/KTIJ-21563 -// "-Xskip-prerelease-check", -// ) diff --git a/buildSrc/src/main/kotlin/simbot.nexus-publish.gradle.kts b/buildSrc/src/main/kotlin/simbot.nexus-publish.gradle.kts index fa122e716..13774dffe 100644 --- a/buildSrc/src/main/kotlin/simbot.nexus-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/simbot.nexus-publish.gradle.kts @@ -57,7 +57,6 @@ logger.info("isReleaseOnly: {}", isReleaseOnly) logger.info("isPublishConfigurable: {}", isPublishConfigurable) -//if (!isCi || isPublishConfigurable) { val userInfo = love.forte.gradle.common.publication.sonatypeUserInfoOrNull if (userInfo == null) { @@ -81,7 +80,6 @@ nexusPublishConfig { logger.info("[nexus-publishing-configure] - [{}] configured.", name) -//} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5e71875d3..ff3d0dfbe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,17 +19,22 @@ reactor = "3.6.2" # simbots suspendTransform = "0.8.0-beta1" suspendReversal = "0.2.0" -gradleCommon = "0.3.0" +gradleCommon = "0.4.0" # tests mockk = "1.13.10" # detekt # https://detekt.dev/docs/intro detekt = "1.23.6" +# https://github.com/gradle-nexus/publish-plugin +gradleNexusPublishPlugin = "2.0.0" [libraries] # jetbrains-annotation jetbrains-annotations = "org.jetbrains:annotations:24.1.0" +# gradle-nexus:publish-plugin +gradleNexusPublishPlugin = { module = "io.github.gradle-nexus:publish-plugin", version.ref = "gradleNexusPublishPlugin" } + # dokka dokka-plugin = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version.ref = "dokka" } dokka-core = { group = "org.jetbrains.dokka", name = "dokka-core", version.ref = "dokka" }