Skip to content

Commit

Permalink
Switch to Java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
siy committed Sep 28, 2021
1 parent 4563df1 commit 76eac1d
Show file tree
Hide file tree
Showing 13 changed files with 191 additions and 139 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/add-artifacts-to-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ jobs:
with:
ref: ${{ steps.set_environment.outputs.git_ref }}
fetch-depth: 0
- name: Set up JDK 1.11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: 1.11
distribution: 'zulu'
java-version: '17'
- name: Cache Gradle packages
uses: actions/cache@v2
with:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/build-publish-jars-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ jobs:
with:
ref: ${{ steps.set_environment.outputs.git_ref }}
fetch-depth: 0
- name: Set up JDK 1.11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: 1.11
distribution: 'zulu'
java-version: '17'
- name: Cache Gradle packages
uses: actions/cache@v2
with:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/build-publish-keygen-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ jobs:
with:
ref: ${{ steps.set_environment.outputs.git_ref }}
fetch-depth: 0
- name: Set up JDK 1.11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: 1.11
distribution: 'zulu'
java-version: '17'
- name: Cache Gradle packages
uses: actions/cache@v2
with:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ jobs:
with:
# Shallow clones should be disabled for a better relevancy of analysis
fetch-depth: 0
- name: Set up JDK 1.11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: 1.11
distribution: 'zulu'
java-version: '17'
- name: Unit tests and Sonar analisys
run: ./gradlew clean check jacocoTestReport sonarqube --stacktrace --refresh-dependencies -Dsonar.login=$SONAR_TOKEN
env:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/pr-publish-keygen-radixdlt-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ jobs:
with:
ref: ${{ steps.set_environment.outputs.git_ref }}
fetch-depth: 0
- name: Set up JDK 1.11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: 1.11
distribution: 'zulu'
java-version: '17'
- name: Cache Gradle packages
uses: actions/cache@v2
with:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/radixdlt-publish-radixdlt-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,11 @@ jobs:
uses: actions/download-artifact@v2
with:
name: build-deb
- name: Set up JDK 1.11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: 1.11
distribution: 'zulu'
java-version: '17'
- name: Cache Gradle packages
uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ subprojects {

gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
options.release = 11
options.release = 17
options.compilerArgs << "-Xlint:all"

//TODO: uncomment once warnings will be cleared
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
systemProp.sonar.host.url=https://sonarcloud.io
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,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 76eac1d

Please sign in to comment.