diff --git a/.github/workflows/nebula.yml b/.github/workflows/nebula.yml index cd77955..aebe314 100644 --- a/.github/workflows/nebula.yml +++ b/.github/workflows/nebula.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: # test against latest update of some major Java version(s), as well as specific LTS version(s) - java: [ 8, 17, 21] + java: [8, 17, 21] name: Gradle Build without Publish steps: - uses: actions/checkout@v1 @@ -30,17 +30,13 @@ jobs: run: | git config --global user.name "Nebula Plugin Maintainers" git config --global user.email "nebula-plugins-oss@netflix.com" - - name: Set up JDK 8 - uses: actions/setup-java@v2 + - name: Set up JDKs + uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '8' - java-package: jdk - - name: Setup jdk - uses: actions/setup-java@v2 - with: - distribution: 'zulu' - java-version: ${{ matrix.java }} + java-version: | + 8 + ${{ matrix.java }} java-package: jdk - uses: actions/cache@v1 id: gradle-cache @@ -74,10 +70,14 @@ jobs: run: | git config --global user.name "Nebula Plugin Maintainers" git config --global user.email "nebula-plugins-oss@netflix.com" - - name: Setup jdk 8 - uses: actions/setup-java@v1 + - name: Set up JDKs + uses: actions/setup-java@v4 with: - java-version: 1.8 + distribution: 'zulu' + java-version: | + 8 + 21 + java-package: jdk - uses: actions/cache@v1 id: gradle-cache with: @@ -115,10 +115,14 @@ jobs: run: | git config --global user.name "Nebula Plugin Maintainers" git config --global user.email "nebula-plugins-oss@netflix.com" - - name: Setup jdk 8 - uses: actions/setup-java@v1 + - name: Set up JDKs + uses: actions/setup-java@v4 with: - java-version: 1.8 + distribution: 'zulu' + java-version: | + 8 + 21 + java-package: jdk - uses: actions/cache@v1 id: gradle-cache with: @@ -143,4 +147,3 @@ jobs: startsWith(github.ref, 'refs/tags/v') && (!contains(github.ref, '-rc.')) run: ./gradlew --info --stacktrace -Dgradle.publish.key=${{ secrets.gradlePublishKey }} -Dgradle.publish.secret=${{ secrets.gradlePublishSecret }} -Prelease.useLastTag=true final - diff --git a/build.gradle b/build.gradle index 919d729..721ff84 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ */ plugins { - id 'com.netflix.nebula.plugin-plugin' version '20.11.0' + id 'com.netflix.nebula.plugin-plugin' version '21.0.0' id 'org.jetbrains.kotlin.jvm' version '1.9.20' id 'java-gradle-plugin' } diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..c18ca59 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1 @@ +toolchainVersion=21 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..2c35211 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..c1a1fa5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-rc-1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ##########################################################################