Skip to content

Commit df03646

Browse files
authored
Merge pull request #110 from graphql-java-kickstart/feature/update-java-target-17
chore: update source and target java to v17
2 parents 04e4641 + 363940e commit df03646

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

.github/workflows/pull-request.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ubuntu-latest, macos-latest, windows-latest]
19-
java: [11, 15]
19+
java: [17, 19]
2020
needs: validation
2121
runs-on: ${{ matrix.os }}
2222
steps:
@@ -59,12 +59,12 @@ jobs:
5959
if: env.SONAR_TOKEN != null
6060
with:
6161
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
62-
- name: Set up JDK 11
62+
- name: Set up JDK 17
6363
if: env.SONAR_TOKEN != null
6464
uses: actions/setup-java@v3
6565
with:
6666
distribution: 'zulu'
67-
java-version: 11
67+
java-version: 17
6868
- name: Cache SonarCloud packages
6969
if: env.SONAR_TOKEN != null
7070
uses: actions/cache@v3
@@ -84,4 +84,4 @@ jobs:
8484
env:
8585
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
8686
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
87-
run: ./gradlew build jacocoTestReport sonarqube --info
87+
run: ./gradlew build jacocoTestReport sonar --info

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
uses: actions/setup-java@v3
2020
with:
2121
distribution: 'zulu'
22-
java-version: 11
22+
java-version: 17
2323
- name: Cache Gradle
2424
uses: actions/cache@v3
2525
env:
26-
java-version: 11
26+
java-version: 17
2727
with:
2828
path: |
2929
~/.gradle/caches
@@ -46,11 +46,11 @@ jobs:
4646
uses: actions/setup-java@v3
4747
with:
4848
distribution: 'zulu'
49-
java-version: 11
49+
java-version: 17
5050
- name: Cache Gradle
5151
uses: actions/cache@v3
5252
env:
53-
java-version: 11
53+
java-version: 17
5454
with:
5555
path: |
5656
~/.gradle/caches

.github/workflows/snapshot.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
uses: actions/setup-java@v3
2323
with:
2424
distribution: 'zulu'
25-
java-version: 11
25+
java-version: 17
2626
- name: Cache Gradle
2727
uses: actions/cache@v3
2828
env:
29-
java-version: 11
29+
java-version: 17
3030
with:
3131
path: |
3232
~/.gradle/caches
@@ -49,11 +49,11 @@ jobs:
4949
uses: actions/setup-java@v3
5050
with:
5151
distribution: 'zulu'
52-
java-version: 11
52+
java-version: 17
5353
- name: Cache Gradle
5454
uses: actions/cache@v3
5555
env:
56-
java-version: 11
56+
java-version: 17
5757
with:
5858
path: |
5959
~/.gradle/caches
@@ -77,11 +77,11 @@ jobs:
7777
- uses: actions/checkout@v3
7878
with:
7979
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
80-
- name: Set up JDK 11
80+
- name: Set up JDK 17
8181
uses: actions/setup-java@v3
8282
with:
8383
distribution: 'zulu'
84-
java-version: 11
84+
java-version: 17
8585
- name: Cache SonarCloud packages
8686
uses: actions/cache@v3
8787
with:
@@ -98,4 +98,4 @@ jobs:
9898
env:
9999
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
100100
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
101-
run: ./gradlew build jacocoTestReport sonarqube --info
101+
run: ./gradlew build jacocoTestReport sonar --info

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id 'io.codearte.nexus-staging' version '0.30.0'
66
}
77

8-
sonarqube {
8+
sonar {
99
properties {
1010
property "sonar.projectKey", "graphql-java-kickstart_graphql-spring-webclient"
1111
property "sonar.organization", "graphql-java-kickstart"
@@ -58,8 +58,8 @@ subprojects {
5858
}
5959

6060
compileJava {
61-
sourceCompatibility = JavaVersion.VERSION_1_8
62-
targetCompatibility = JavaVersion.VERSION_1_8
61+
sourceCompatibility = JavaVersion.VERSION_17
62+
targetCompatibility = JavaVersion.VERSION_17
6363
}
6464

6565
compileJava.dependsOn(processResources)

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=1.1.0-SNAPSHOT
1+
version=2.0.0-SNAPSHOT
22

33
PROJECT_GROUP = com.graphql-java-kickstart
44
PROJECT_NAME = graphql-spring-webclient

0 commit comments

Comments
 (0)