Skip to content

Commit

Permalink
Gradle 8.10-rc-1
Browse files Browse the repository at this point in the history
  • Loading branch information
rpalcolea committed Aug 8, 2024
1 parent 455b834 commit a4304a2
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 20 deletions.
37 changes: 20 additions & 17 deletions .github/workflows/nebula.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,21 @@ 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
- name: Setup git user
run: |
git config --global user.name "Nebula Plugin Maintainers"
git config --global user.email "[email protected]"
- 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
Expand Down Expand Up @@ -74,10 +70,14 @@ jobs:
run: |
git config --global user.name "Nebula Plugin Maintainers"
git config --global user.email "[email protected]"
- 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:
Expand Down Expand Up @@ -115,10 +115,14 @@ jobs:
run: |
git config --global user.name "Nebula Plugin Maintainers"
git config --global user.email "[email protected]"
- 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:
Expand All @@ -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

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java-gradle-plugin'
id 'groovy'
id "com.netflix.nebula.plugin-plugin" version "20.11.0"
id "com.netflix.nebula.plugin-plugin" version "21.0.0"
}

description = "Template for NetflixOSS projects"
Expand Down
1 change: 1 addition & 0 deletions gradle/gradle-daemon-jvm.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
toolchainVersion=21
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##########################################################################
Expand Down

0 comments on commit a4304a2

Please sign in to comment.