Revert Gradle version, keep other changes

arrow-kt · Jan 31, 2024 · b5bd0a0 · b5bd0a0
1 parent fc3a3ff
commit b5bd0a0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 55 deletions.
diff --git a/arrow-gradle-config-formatter/build.gradle.kts b/arrow-gradle-config-formatter/build.gradle.kts
@@ -7,20 +7,13 @@ gradlePlugin {
   plugins {
     named("io.arrow-kt.arrow-gradle-config-formatter") {
       id = "io.arrow-kt.arrow-gradle-config-formatter"
+      tags.set(listOf("Arrow", "formatter"))
       displayName = "Arrow formatter Gradle Config"
       description = "Basic formatter Gradle config for Arrow projects"
     }
   }
 }
 
-pluginBundle {
-  tags =
-    listOf(
-      "Arrow",
-      "formatter",
-    )
-}
-
 dependencies {
   compileOnly(libs.kotlin.gradlePlugin)
   implementation(libs.spotless)

diff --git a/arrow-gradle-config-kotlin/build.gradle.kts b/arrow-gradle-config-kotlin/build.gradle.kts
@@ -7,20 +7,13 @@ gradlePlugin {
   plugins {
     named("io.arrow-kt.arrow-gradle-config-kotlin") {
       id = "io.arrow-kt.arrow-gradle-config-kotlin"
+      tags.set(listOf("Arrow", "Arrow multiplatform"))
       displayName = "Arrow Kotlin Gradle Config"
       description = "Basic Gradle config for Kotlin Arrow projects"
     }
   }
 }
 
-pluginBundle {
-  tags =
-    listOf(
-      "Arrow",
-      "Arrow multiplatform",
-    )
-}
-
 dependencies {
   compileOnly(libs.kotlin.gradlePlugin)
 }

diff --git a/arrow-gradle-config-nexus/build.gradle.kts b/arrow-gradle-config-nexus/build.gradle.kts
@@ -7,20 +7,13 @@ gradlePlugin {
   plugins {
     named("io.arrow-kt.arrow-gradle-config-nexus") {
       id = "io.arrow-kt.arrow-gradle-config-nexus"
+      tags.set(listOf("Arrow", "Arrow Nexus"))
       displayName = "Arrow Nexus Gradle Config"
       description = "Basic Nexus Gradle config for Arrow publications"
     }
   }
 }
 
-pluginBundle {
-  tags =
-    listOf(
-      "Arrow",
-      "Arrow Nexus",
-    )
-}
-
 dependencies {
   implementation(libs.gradleNexus.publishPlugin)
 }

diff --git a/arrow-gradle-config-publish/build.gradle.kts b/arrow-gradle-config-publish/build.gradle.kts
@@ -10,20 +10,13 @@ gradlePlugin {
   plugins {
     named("io.arrow-kt.arrow-gradle-config-publish") {
       id = "io.arrow-kt.arrow-gradle-config-publish"
+      tags.set(listOf("Arrow", "Arrow publish multiplatform"))
       displayName = "Arrow Kotlin publishing Gradle Config"
       description = "Basic publishing Gradle config for Kotlin Arrow projects"
     }
   }
 }
 
-pluginBundle {
-  tags =
-    listOf(
-      "Arrow",
-      "Arrow publish multiplatform",
-    )
-}
-
 dependencies {
   // compileOnly(libs.android)
   compileOnly(libs.kotlin.gradlePlugin)

diff --git a/arrow-gradle-config-versioning/build.gradle.kts b/arrow-gradle-config-versioning/build.gradle.kts
@@ -7,20 +7,13 @@ gradlePlugin {
   plugins {
     named("io.arrow-kt.arrow-gradle-config-versioning") {
       id = "io.arrow-kt.arrow-gradle-config-versioning"
+      tags.set(listOf("Arrow", "Arrow versioning"))
       displayName = "Arrow Versioning Gradle Config"
       description = "Basic versioning Gradle config for Arrow projects"
     }
   }
 }
 
-pluginBundle {
-  tags =
-    listOf(
-      "Arrow",
-      "Arrow versioning",
-    )
-}
-
 dependencies {
   api(libs.javiersc.semver.semverGradlePlugin)
   implementation(libs.gradle.publishPlugin)

diff --git a/build-src/src/main/kotlin/SignPublications.kt b/build-src/src/main/kotlin/SignPublications.kt
@@ -1,13 +1,10 @@
 import org.gradle.api.Project
 import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.tasks.AbstractPublishToMaven
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.getByName
-import org.gradle.kotlin.dsl.withType
-import org.gradle.plugins.signing.Sign
 import org.gradle.plugins.signing.SigningExtension
 
-fun Project.signPublications(createMavenFromJava: Boolean = false) {
+fun Project.signPublications() {
   configure<SigningExtension> {
     if (shouldSign) {
       try {
@@ -16,15 +13,6 @@ fun Project.signPublications(createMavenFromJava: Boolean = false) {
         useGpgCmd()
       }
       sign(project.extensions.getByName<PublishingExtension>("publishing").publications)
-      if (!createMavenFromJava) {
-        tasks.withType<AbstractPublishToMaven> {
-          afterEvaluate { dependsOn("javadocJar") }
-          dependsOn(tasks.withType<Sign>())
-        }
-        tasks.withType<Sign> {
-          afterEvaluate { dependsOn("javadocJar") }
-        }
-      }
     }
   }
 }

diff --git a/build-src/src/main/kotlin/publish-kotlin-jvm.gradle.kts b/build-src/src/main/kotlin/publish-kotlin-jvm.gradle.kts
@@ -20,4 +20,4 @@ project.tasks.creating(Jar::class) {
 
 setupPublishing(docsJar, sourcesJar, createMavenFromJava = true)
 
-signPublications(createMavenFromJava = true)
+signPublications()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ coroutines = "1.7.3"
 dokka = "1.9.10"
 gradlePublish = "0.21.0"
 javierscSemverGradlePlugin = "0.5.0-rc.6"
-kotlin = "1.9.22"
+kotlin = "1.9.20"
 nexusPublish = "1.3.0"
 spotless = "6.25.0"