arrow-kt · serras · Jan 30, 2024 · Jan 30, 2024 · Jan 30, 2024
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -26,24 +26,21 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Java
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
 
-      - name: Build and test with Gradle
-        uses: gradle/[email protected]
-        with:
-          arguments: build
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
-#      - name: Publish snapshot
-#        if: ${{ (github.event_name == 'push') || (github.event_name == 'workflow_dispatch') }}
-#        run: ./gradlew publishToSonatype "-Psemver.stage=snapshot"
+      - name: Build and test with Gradle
+        run: ./gradlew build
 
       - name: Stop Gradle daemons
         run: ./gradlew --stop
diff --git a/.github/workflows/generate-tag.yaml b/.github/workflows/generate-tag.yaml
@@ -31,20 +31,21 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Java
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Build with Gradle
-        uses: gradle/[email protected]
-        with:
-          arguments: build -x spotlessCheck "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}"
+        run: ./gradlew build -x spotlessCheck "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}"
 
       - name: Stop Gradle daemons
         run: ./gradlew --stop
@@ -63,15 +64,16 @@ jobs:
           token: ${{ secrets.TOKEN_GITHUB_ACTION }}
 
       - name: Set up Java
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
 
-      - name: Generate Tag
-        uses: gradle/[email protected]
-        with:
-          arguments: createSemverTag "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}"
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Generate tag
+        run: ./gradlew createSemverTag "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}"
 
       - name: Push changes to tag
         run: git push --follow-tags

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -21,28 +21,29 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Java
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Build and test with Gradle
-        uses: gradle/[email protected]
-        with:
-          arguments: build -x spotlessCheck --scan --stacktrace
+        run: ./gradlew build -x spotlessCheck --scan --stacktrace
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v5
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.SIGNING_KEY }}
           passphrase: ${{ secrets.SIGNING_KEY_PASSPHRASE }}
 
-      - name: Publish to MavenCentral
+      - name: Publish to Maven Central
         run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
 
       - name: Publish to Gradle Plugin Portal

diff --git a/arrow-gradle-config-dokka-fence-workaround/src/main/kotlin/DokkaFenceWorkaround.kt b/arrow-gradle-config-dokka-fence-workaround/src/main/kotlin/DokkaFenceWorkaround.kt
@@ -266,7 +266,7 @@ class PatchedDocTagToContentConverter : DocTagToContentConverter() {
     dci: DCI,
     sourceSets: Set<DokkaConfiguration.DokkaSourceSet>,
     styles: Set<Style>,
-    extra: PropertyContainer<ContentNode>
+    extras: PropertyContainer<ContentNode>
   ): List<ContentNode> {
     fun buildChildren(
       docTag: DocTag,
@@ -279,7 +279,7 @@ class PatchedDocTagToContentConverter : DocTagToContentConverter() {
           dci,
           sourceSets,
           styles + newStyles,
-          newExtras?.let { extra + it } ?: extra
+          newExtras?.let { extras + it } ?: extras
         )
       }
 
@@ -294,7 +294,7 @@ class PatchedDocTagToContentConverter : DocTagToContentConverter() {
         )
       )
     } else {
-      super.buildContent(docTag, dci, sourceSets, styles, extra)
+      super.buildContent(docTag, dci, sourceSets, styles, extras)
     }
   }
 }
diff --git a/arrow-gradle-config-formatter/build.gradle.kts b/arrow-gradle-config-formatter/build.gradle.kts
@@ -6,21 +6,14 @@ plugins {
 gradlePlugin {
   plugins {
     named("io.arrow-kt.arrow-gradle-config-formatter") {
+      tags = listOf("Arrow", "formatter")
       id = "io.arrow-kt.arrow-gradle-config-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
@@ -6,21 +6,14 @@ plugins {
 gradlePlugin {
   plugins {
     named("io.arrow-kt.arrow-gradle-config-kotlin") {
+      tags = listOf("Arrow", "Arrow multiplatform")
       id = "io.arrow-kt.arrow-gradle-config-kotlin"
       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-kotlin/src/main/kotlin/io.arrow-kt.arrow-gradle-config-kotlin.gradle.kts b/arrow-gradle-config-kotlin/src/main/kotlin/io.arrow-kt.arrow-gradle-config-kotlin.gradle.kts
@@ -120,7 +120,7 @@ if (isKotlinMultiplatform) {
         dependsOn(wasmWasiMain)
       }
 
-      val nonJvmMain = create("nonJvmMain") {
+      create("nonJvmMain") {
         dependsOn(nativeMain)
         dependsOn(jsMain)
         dependsOn(wasmMain)

diff --git a/arrow-gradle-config-nexus/build.gradle.kts b/arrow-gradle-config-nexus/build.gradle.kts
@@ -6,21 +6,14 @@ plugins {
 gradlePlugin {
   plugins {
     named("io.arrow-kt.arrow-gradle-config-nexus") {
+      tags = listOf("Arrow", "Arrow Nexus")
       id = "io.arrow-kt.arrow-gradle-config-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
@@ -8,31 +8,24 @@ plugins {
 gradlePlugin {
   plugins {
     named("io.arrow-kt.arrow-gradle-config-publish") {
+      tags = listOf("Arrow", "Arrow publish multiplatform")
       id = "io.arrow-kt.arrow-gradle-config-publish"
       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)
   implementation(libs.dokka.gradlePlugin)
   implementation(libs.gradle.publishPlugin)
 }
 
-kotlin.sourceSets["main"].kotlin.srcDirs("$buildDir/generated-sources/version/kotlin")
+kotlin.sourceSets["main"].kotlin.srcDirs("${layout.buildDirectory}/generated-sources/version/kotlin")
 
-file("$buildDir/generated-sources/version/kotlin/ArrowGradleConfigVersion.kt").apply {
+file("${layout.buildDirectory}/generated-sources/version/kotlin/ArrowGradleConfigVersion.kt").apply {
   ensureParentDirsCreated()
   createNewFile()
   writeText(

diff --git a/arrow-gradle-config-versioning/build.gradle.kts b/arrow-gradle-config-versioning/build.gradle.kts
@@ -6,21 +6,14 @@ plugins {
 gradlePlugin {
   plugins {
     named("io.arrow-kt.arrow-gradle-config-versioning") {
+      tags = listOf("Arrow", "Arrow versioning")
       id = "io.arrow-kt.arrow-gradle-config-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/publish-gradle-plugin.gradle.kts b/build-src/src/main/kotlin/publish-gradle-plugin.gradle.kts
@@ -4,7 +4,7 @@ plugins {
   signing
 }
 
-pluginBundle {
+gradlePlugin {
   website = property("pom.url").toString()
   vcsUrl = property("pom.smc.url").toString()
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,9 +4,9 @@ arrow = "1.2.1"
 arrowGradleConfig = "0.11.0"
 coroutines = "1.7.3"
 dokka = "1.9.10"
-gradlePublish = "0.21.0"
+gradlePublish = "1.2.1"
 javierscSemverGradlePlugin = "0.5.0-rc.6"
-kotlin = "1.9.22"
+kotlin = "1.9.20"
 nexusPublish = "1.3.0"
 spotless = "6.25.0"