build: Bump gradle/plugins, use shared workflows

Author: zml2008

.github/workflows/check-license.yaml

@@ -1,29 +1,12 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
 name: License Check
 
 on:
   push:
-    branches: [ stable-7, 'api-*' ]
+    branches: "**"
+    tags-ignore: ["**"]
   pull_request:
-    branches: [ stable-7, 'api-*' ]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: "${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}"
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          distribution: adopt
-          java-version: 11
-      - name: Build with Gradle
-        run: ./gradlew checkLicenses
+  call-check:
+    uses: SpongePowered/.github/.github/workflows/shared-check-license.yaml@master
+    secrets: inherit

.github/workflows/check-style.yaml

@@ -1,29 +1,12 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Checkstyle Run
+name: Checkstyle
 
 on:
   push:
-    branches: [ stable-7, 'api-*' ]
+    branches: "**"
+    tags-ignore: ["**"]
   pull_request:
-    branches: [ stable-7, 'api-*' ]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: "${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}"
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          distribution: adopt
-          java-version: 11
-      - name: Build with Gradle
-        run: ./gradlew checkstyleAll
+  call-check:
+    uses: SpongePowered/.github/.github/workflows/shared-check-style.yaml@master
+    secrets: inherit

.github/workflows/ci.yaml

@@ -10,93 +10,9 @@ on:
   release:
     types: [released]
 
-env:
-  PROJECT_NAME: spongeapi
-
 jobs:
-  build:
-    # Only run on PRs if the source branch is on someone else's repo
-    if: "${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}"
-
-    runs-on: "${{ matrix.os }}"
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, windows-latest]
-    steps:
-      # Setup
-      - name: Check out
-        uses: actions/checkout@v2
-        with:
-          ssh-key: ${{ secrets.SPONGE_JD_DEPLOY_KEY }}
-      - name: Setup JDK 11
-        uses: actions/setup-java@v2
-        with:
-          distribution: adopt
-          java-version: 11
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      # Actually build
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: "${{ runner.os }}-spongeapi-${{ hashFiles('**/*.gradle*') }}"
-          restore-keys: |
-            ${{ runner.os }}-spongeapi-
-      - name: Setup env variables
-        run: |
-          echo "GIT_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
-          echo "GIT_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
-          echo "BUILD_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
-      - name: Build with Gradle
-        run: ./gradlew build
-      - name: Archive test results
-        if: "${{ always() }}"
-        uses: actions/upload-artifact@v2
-        with:
-          name: "test-results-${{ matrix.os }}"
-          path: |
-            build/reports/
-            */build/reports/
-
-      # Then publish if we are all set up to do so
-      - name: Determine status
-        if: "${{ runner.os == 'Linux' }}"
-        run: |
-          VERSION=$(./gradlew :properties | awk '/^version:/ { print $2; }')
-          if [ "$(echo $VERSION | grep '\-SNAPSHOT')" ]; then
-            echo "STATUS=snapshot" >> $GITHUB_ENV
-          else
-            echo "STATUS=release" >> $GITHUB_ENV
-          fi
-          echo "PROJECT_VERSION=$VERSION" >> $GITHUB_ENV
-      - name: Publish with Gradle
-        if: "${{ runner.os == 'Linux' && ((env.STATUS != 'release' && github.event_name == 'push' && startsWith(github.ref, 'refs/heads/api-')) || (env.STATUS == 'release' && github.event_name == 'release')) }}"
-        run: ./gradlew -PforceSign=true publish closeAndReleaseStagingRepository
-        env:
-          ORG_GRADLE_PROJECT_githubPackagesUsername: "${{ github.actor }}"
-          ORG_GRADLE_PROJECT_githubPackagesPassword: "${{ secrets.GITHUB_TOKEN }}"
-          ORG_GRADLE_PROJECT_spongeSnapshotRepo: "${{ secrets.SPONGE_MAVEN_SNAPSHOT_REPO_URL }}"
-          ORG_GRADLE_PROJECT_spongeReleaseRepo: "${{ secrets.SPONGE_MAVEN_RELEASE_REPO_URL }}"
-          ORG_GRADLE_PROJECT_spongeUsername: "${{ secrets.SPONGE_MAVEN_REPO_USER }}"
-          ORG_GRADLE_PROJECT_spongePassword: "${{ secrets.SPONGE_MAVEN_REPO_PASSWORD }}"
-          ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SPONGE_MAVEN_OSSRH_USER }}"
-          ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SPONGE_MAVEN_OSSRH_PASSWORD }}"
-          ORG_GRADLE_PROJECT_spongeSigningKey: "${{ secrets.SPONGE_SIGNING_KEY }}"
-          ORG_GRADLE_PROJECT_spongeSigningPassword: "${{ secrets.SPONGE_SIGNING_PASSWORD }}"
-      - name: Publish Javadoc
-        if: "${{ runner.os == 'Linux' && ((env.STATUS != 'release' && github.event_name == 'push' && startsWith(github.ref, 'refs/heads/api-')) || (env.STATUS == 'release' && github.event_name == 'release')) }}"
-        run: |
-          git clone [email protected]:SpongePowered/APIJavadocs.git publish-jd -b data -c core.sshCommand="$(git config --local --get core.sshCommand)" -c user.name=Spongie -c user.email="[email protected]"
-          cd publish-jd
-          DESTDIR="$PROJECT_NAME/$PROJECT_VERSION"
-          rm -rf $DESTDIR
-          mkdir -p $DESTDIR
-          cp -R ../build/docs/javadoc/* $DESTDIR
-          git add .
-          git commit -m "Publishing javadoc for $PROJECT_NAME $PROJECT_VERSION"
-          git push origin
-          cd ..
-          rm -rf publish-jd
+  call-build:
+    uses: SpongePowered/.github/.github/workflows/shared-ci.yaml@master
+    with:
+      publish_snapshot_javadoc: true
+    secrets: inherit

build.gradle.kts

@@ -3,8 +3,9 @@ import net.ltgt.gradle.errorprone.errorprone
 plugins {
     eclipse
     id("org.spongepowered.gradle.sponge.dev")
-    id("net.kyori.indra.publishing")
     id("net.kyori.indra.checkstyle")
+    id("net.kyori.indra.crossdoc")
+    id("net.kyori.indra.publishing")
     id("net.kyori.indra.publishing.sonatype")
     id("org.spongepowered.gradle.event-impl-gen")
     id("org.jetbrains.gradle.plugin.idea-ext")
@@ -148,8 +149,10 @@ tasks {
             attributes("Specification-Vendor" to "SpongePowered")
             attributes("Specification-Title" to "SpongeAPI")
             attributes("Specification-Version" to project.version)
-            System.getenv()["GIT_COMMIT"]?.apply { attributes("Git-Commit" to this) }
-            System.getenv()["GIT_BRANCH"]?.apply { attributes("Git-Branch" to this) }
+            if (!indraGit.isPresent) {
+              throw InvalidUserDataException("SpongeAPI must be built as a Git checkout, rather than through a zip/tar export")
+            }
+            indraGit.applyVcsInformationToManifest(this)
         }
     }
 
@@ -241,7 +244,7 @@ spongeConvention {
 
 indra {
     javaVersions {
-        testWith(8, 11, 16)
+        testWith(8, 11, 17)
     }
 
     configurePublications {
@@ -253,6 +256,10 @@ indra {
     }
 }
 
+indraCrossdoc {
+    baseUrl(providers.gradleProperty("javadocPublishRoot"))
+}
+
 val sortClasses = listOf(
         "org.spongepowered.api.advancement.AdvancementTypes",
         "org.spongepowered.api.advancement.criteria.trigger.Triggers",

gradle.properties

@@ -4,6 +4,8 @@ organization=SpongePowered
 projectUrl=https://www.spongepowered.org
 projectDescription=A plugin API for Minecraft: Java Edition
 
+javadocPublishRoot=https://jd.spongepowered.org/
+
 org.gradle.parallel=true
 
 adventureVersion=4.10.0

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -7,13 +7,14 @@ pluginManagement {
         }
     }
     plugins {
-        val indraVersion = "2.0.6"
+        val indraVersion = "2.1.1"
         id("org.spongepowered.gradle.event-impl-gen") version "7.0.0"
-        id("org.spongepowered.gradle.sponge.dev") version "1.1.1"
-        id("org.jetbrains.gradle.plugin.idea-ext") version "1.0"
-        id("net.ltgt.errorprone") version "2.0.1"
+        id("org.spongepowered.gradle.sponge.dev") version "2.0.2"
+        id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.5"
+        id("net.ltgt.errorprone") version "2.0.2"
         id("net.kyori.indra.publishing") version indraVersion
         id("net.kyori.indra.publishing.sonatype") version indraVersion
         id("net.kyori.indra.checkstyle") version indraVersion
+        id("net.kyori.indra.crossdoc") version indraVersion
     }
 }