More work on conventions plugin

lukebemishprojects · Mar 26, 2024 · c8b3843 · c8b3843
1 parent d449bf2
commit c8b3843
Show file tree

Hide file tree

Showing 39 changed files with 1,630 additions and 1,738 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/build_pr.yml b/.github/workflows/build_pr.yml
@@ -22,19 +22,19 @@
                         "restore-keys": "${{ runner.os }}-gradle-"
                     },
                     "name": "Cache",
-                    "uses": "actions/cache/restore@v3"
+                    "uses": "actions/cache/restore@v4"
                 },
                 {
                     "with": {
                         "cache-read-only": true,
                         "gradle-home-cache-cleanup": true
                     },
                     "name": "Setup Gradle",
-                    "uses": "gradle/gradle-build-action@v2"
+                    "uses": "gradle/gradle-build-action@v3"
                 },
                 {
                     "name": "Build",
-                    "run": "./gradlew checkLicenses build",
+                    "run": "./gradlew build",
                     "id": "build",
                     "env": {
                         "PR_NUMBER": "${{ github.event.pull_request.number }}"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,6 +1,9 @@
 {
     "jobs": {
         "build": {
+            "outputs": {
+                "version": "${{ steps.record_version_capture_version.outputs.version }}"
+            },
             "runs-on": "ubuntu-22.04",
             "permissions": {
                 "contents": "write"
@@ -24,14 +27,14 @@
                         "restore-keys": "${{ runner.os }}-gradle-"
                     },
                     "name": "Cache",
-                    "uses": "actions/cache@v3"
+                    "uses": "actions/cache@v4"
                 },
                 {
                     "with": {
                         "gradle-home-cache-cleanup": true
                     },
                     "name": "Setup Gradle",
-                    "uses": "gradle/gradle-build-action@v2"
+                    "uses": "gradle/gradle-build-action@v3"
                 },
                 {
                     "uses": "fregante/setup-git-user@v2"
@@ -43,43 +46,85 @@
                     "env": {
                         "BUILD_CACHE_PASSWORD": "${{ secrets.BUILD_CACHE_PASSWORD }}",
                         "BUILD_CACHE_USER": "${{ secrets.BUILD_CACHE_USER }}",
-                        "BUILD_CACHE_URL": "${{ secrets.BUILD_CACHE_URL }}",
-                        "RELEASE_MAVEN_PASSWORD": "${{ secrets.RELEASE_MAVEN_PASSWORD }}",
-                        "RELEASE_MAVEN_USER": "github",
-                        "RELEASE_MAVEN_URL": "https://maven.lukebemish.dev/releases/",
-                        "CURSEFORGE_KEY": "${{ secrets.CURSEFORGE_KEY }}",
-                        "MODRINTH_KEY": "${{ secrets.MODRINTH_KEY }}"
+                        "BUILD_CACHE_URL": "${{ secrets.BUILD_CACHE_URL }}"
                     }
                 },
                 {
                     "name": "Build",
-                    "run": "./gradlew checkLicenses build",
+                    "run": "./gradlew build",
                     "id": "build",
                     "env": {
                         "BUILD_CACHE_PASSWORD": "${{ secrets.BUILD_CACHE_PASSWORD }}",
                         "BUILD_CACHE_USER": "${{ secrets.BUILD_CACHE_USER }}",
-                        "BUILD_CACHE_URL": "${{ secrets.BUILD_CACHE_URL }}",
-                        "RELEASE_MAVEN_PASSWORD": "${{ secrets.RELEASE_MAVEN_PASSWORD }}",
-                        "RELEASE_MAVEN_USER": "github",
-                        "RELEASE_MAVEN_URL": "https://maven.lukebemish.dev/releases/",
-                        "CURSEFORGE_KEY": "${{ secrets.CURSEFORGE_KEY }}",
-                        "MODRINTH_KEY": "${{ secrets.MODRINTH_KEY }}"
+                        "BUILD_CACHE_URL": "${{ secrets.BUILD_CACHE_URL }}"
                     }
                 },
                 {
                     "run": "git push && git push --tags"
                 },
+                {
+                    "name": "Record Version",
+                    "run": "./gradlew recordVersion",
+                    "id": "record_version",
+                    "env": {
+                        "BUILD_CACHE_PASSWORD": "${{ secrets.BUILD_CACHE_PASSWORD }}",
+                        "BUILD_CACHE_USER": "${{ secrets.BUILD_CACHE_USER }}",
+                        "BUILD_CACHE_URL": "${{ secrets.BUILD_CACHE_URL }}"
+                    }
+                },
+                {
+                    "name": "Capture Recorded Version",
+                    "run": "echo version=$(cat build/recordVersion.txt) >> \"$GITHUB_OUTPUT\"",
+                    "id": "record_version_capture_version"
+                }
+            ]
+        },
+        "publish": {
+            "needs": [
+                "build"
+            ],
+            "runs-on": "ubuntu-22.04",
+            "steps": [
+                {
+                    "name": "Setup Java",
+                    "run": "echo \"JAVA_HOME=$JAVA_HOME_17_X64\" >> \"$GITHUB_ENV\""
+                },
+                {
+                    "with": {
+                        "fetch-depth": "0",
+                        "ref": "refs/tags/${{needs.build.outputs.version}}",
+                        "persist-credentials": "false"
+                    },
+                    "name": "Checkout",
+                    "uses": "actions/checkout@v4"
+                },
+                {
+                    "with": {
+                        "path": "**/.gradle/loom-cache",
+                        "key": "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}",
+                        "restore-keys": "${{ runner.os }}-gradle-"
+                    },
+                    "name": "Cache",
+                    "uses": "actions/cache/restore@v4"
+                },
+                {
+                    "with": {
+                        "cache-read-only": true,
+                        "gradle-home-cache-cleanup": true
+                    },
+                    "name": "Setup Gradle",
+                    "uses": "gradle/gradle-build-action@v3"
+                },
                 {
                     "name": "Publish",
-                    "run": "./gradlew publish",
+                    "run": "./gradlew publish closeAndReleaseSonatypeStagingRepository",
                     "id": "publish",
                     "env": {
                         "BUILD_CACHE_PASSWORD": "${{ secrets.BUILD_CACHE_PASSWORD }}",
                         "BUILD_CACHE_USER": "${{ secrets.BUILD_CACHE_USER }}",
                         "BUILD_CACHE_URL": "${{ secrets.BUILD_CACHE_URL }}",
-                        "RELEASE_MAVEN_PASSWORD": "${{ secrets.RELEASE_MAVEN_PASSWORD }}",
-                        "RELEASE_MAVEN_USER": "github",
-                        "RELEASE_MAVEN_URL": "https://maven.lukebemish.dev/releases/",
+                        "SONATYPE_PASSWORD": "${{ secrets.SONATYPE_PASSWORD }}",
+                        "SONATYPE_USER": "${{ secrets.SONATYPE_USER }}",
                         "CURSEFORGE_KEY": "${{ secrets.CURSEFORGE_KEY }}",
                         "MODRINTH_KEY": "${{ secrets.MODRINTH_KEY }}"
                     }

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -22,19 +22,19 @@
                         "restore-keys": "${{ runner.os }}-gradle-"
                     },
                     "name": "Cache",
-                    "uses": "actions/cache/restore@v3"
+                    "uses": "actions/cache/restore@v4"
                 },
                 {
                     "with": {
                         "cache-read-only": true,
                         "gradle-home-cache-cleanup": true
                     },
                     "name": "Setup Gradle",
-                    "uses": "gradle/gradle-build-action@v2"
+                    "uses": "gradle/gradle-build-action@v3"
                 },
                 {
                     "name": "Build",
-                    "run": "./gradlew checkLicenses build",
+                    "run": "./gradlew build",
                     "id": "build",
                     "env": {
                         "BUILD_CACHE_PASSWORD": "${{ secrets.BUILD_CACHE_PASSWORD }}",

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,11 @@
 plugins {
-    alias libs.plugins.quilt.licenser apply false
-    alias libs.plugins.mdg.plugin
-    alias libs.plugins.managedversioning
+    alias libs.plugins.mdg apply false
+    alias cLibs.plugins.managedversioning
     alias libs.plugins.architectury.loom apply false
 }
 
 managedVersioning {
-    versionFile.set rootProject.file('version.properties')
+    versionFile.set project.file('version.properties')
     metadataVersion.set libs.versions.minecraft
     versionPRs()
     versionSnapshots()
@@ -19,7 +18,7 @@ managedVersioning {
             gradleJob {
                 buildCache()
                 name.set 'build'
-                gradlew 'Build', 'checkLicenses', 'build'
+                gradlew 'Build', 'build'
                 gradlew 'Publish', 'publish'
                 mavenSnapshot('github')
             }
@@ -35,12 +34,19 @@ managedVersioning {
                 }
                 readOnly.set false
                 gradlew 'Tag Release', 'tagRelease'
-                gradlew 'Build', 'checkLicenses', 'build'
+                gradlew 'Build', 'build'
                 step {
                     run.set 'git push && git push --tags'
                 }
-                gradlew 'Publish', 'publish'
-                mavenRelease('github')
+                recordVersion 'Record Version', 'version'
+            }
+            gradleJob {
+                buildCache()
+                name.set 'publish'
+                needs.add('build')
+                tag.set('${{needs.build.outputs.version}}')
+                gradlew 'Publish', 'publish', 'closeAndReleaseSonatypeStagingRepository'
+                mavenCentral()
                 modPublishing()
             }
         }
@@ -49,7 +55,7 @@ managedVersioning {
             pullRequest.set(true)
             gradleJob {
                 name.set 'build'
-                gradlew 'Build', 'checkLicenses', 'build'
+                gradlew 'Build', 'build'
                 gradlew 'Publish', 'publish'
                 pullRequestArtifact()
             }
@@ -80,41 +86,4 @@ artifacts {
     add 'license', file("LICENSE")
 }
 
-modsDotGroovy {
-    dslVersion = libs.versions.mdg.dsl.get()
-    platform 'multiloader'
-    multiloader {
-        forge = [project(":neoforge")]
-        fabric = [project(":fabriquilt")]
-        quilt = []
-    }
-}
-
-subprojects { p ->
-    apply plugin: 'maven-publish'
-    apply plugin: 'java-library'
-    apply plugin: libs.plugins.quilt.licenser.get().pluginId
-
-    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
-    java.withSourcesJar()
-    java.withJavadocJar()
-
-    license {
-        rule rootProject.file('header.txt')
-        exclude '**/*.mcmeta'
-        exclude '**/package-info.java'
-    }
-
-    jar {
-        manifest {
-            attributes([
-                'Implementation-Commit-Time': managedVersioning.timestamp.get(),
-                'Implementation-Commit': managedVersioning.hash.get()
-            ])
-        }
-    }
-
-    managedVersioning.publishing.mavenPullRequest(publishing)
-    managedVersioning.publishing.mavenSnapshot(publishing)
-    managedVersioning.publishing.mavenRelease(publishing)
-}
+managedVersioning.publishing.mavenCentral()
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -1,3 +1,7 @@
 plugins {
-    id 'groovy-gradle-plugin'
+    alias cLibs.plugins.conventions.buildsrc
+}
+
+dependencies {
+    implementation cLibs.conventions.java
 }
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
@@ -0,0 +1,13 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = "Luke's Maven"
+            url = 'https://maven.lukebemish.dev/releases'
+        }
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id 'dev.lukebemish.conventions'
+}
diff --git a/buildSrc/src/main/groovy/convention.consumer.gradle b/buildSrc/src/main/groovy/convention.consumer.gradle
@@ -38,3 +38,9 @@ tasks.named("sourcesJar", Jar) {
     dependsOn(configurations.commonResources)
     from(configurations.commonResources)
 }
+
+['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each {
+    configurations."$it".outgoing {
+        capability("$group:$artifact_id-common:$version")
+    }
+}