Skip to content

Commit 545cf7f

Browse files
authored
Merge pull request #181 from graphql-java/copilot/upgrade-gradle-version
Upgrade Gradle to 9.0.0 and resolve compatibility issues
2 parents b94d691 + 3faa46b commit 545cf7f

File tree

8 files changed

+196
-126
lines changed

8 files changed

+196
-126
lines changed

.github/workflows/master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v6
1919
- uses: gradle/actions/wrapper-validation@v5
20-
- name: Set up JDK 11
20+
- name: Set up JDK 17
2121
uses: actions/setup-java@v5
2222
with:
23-
java-version: '11'
23+
java-version: '17'
2424
distribution: 'corretto'
2525
- name: build test and publish
2626
run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v6
1818
- uses: gradle/actions/wrapper-validation@v5
19-
- name: Set up JDK 11
19+
- name: Set up JDK 17
2020
uses: actions/setup-java@v5
2121
with:
22-
java-version: '11'
22+
java-version: '17'
2323
distribution: 'corretto'
2424
- name: build and test
2525
run: ./gradlew assemble && ./gradlew check --info --stacktrace

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v6
2323
- uses: gradle/actions/wrapper-validation@v5
24-
- name: Set up JDK 11
24+
- name: Set up JDK 17
2525
uses: actions/setup-java@v5
2626
with:
27-
java-version: '11'
27+
java-version: '17'
2828
distribution: 'corretto'
2929
- name: build test and publish
3030
run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
id 'maven-publish'
99
id 'signing'
1010
id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
11-
id "biz.aQute.bnd.builder" version "6.4.0"
11+
id "biz.aQute.bnd.builder" version "7.1.0"
1212
}
1313

1414
java {
@@ -45,6 +45,7 @@ dependencies {
4545

4646
testImplementation "org.spockframework:spock-core:2.3-groovy-3.0"
4747
testImplementation "org.codehaus.groovy:groovy:3.0.25"
48+
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
4849
}
4950

5051
task sourcesJar(type: Jar, dependsOn: classes) {
@@ -73,9 +74,9 @@ publishing {
7374
publications {
7475
maven(MavenPublication) {
7576
from components.java
76-
groupId group
77-
artifactId 'graphql-java-extended-scalars'
78-
version version
77+
groupId = group
78+
artifactId = 'graphql-java-extended-scalars'
79+
version = version
7980

8081
artifact sourcesJar
8182
artifact javadocJar

gradle/wrapper/gradle-wrapper.jar

4.41 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)