Merge pull request #113 from graphql-java/v21-update

Update to Java 11, Gradle 8.3, GraphQL Java v21.0

Author: dondonz

.github/workflows/master.yml

@@ -13,11 +13,12 @@ jobs:
       MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }}
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: '8.0.282'
+          java-version: '11'
+          distribution: 'corretto'
       - name: build test and publish
         run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

.github/workflows/pull_request.yml

@@ -14,11 +14,12 @@ jobs:
   buildAndTest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: '8.0.282'
+          java-version: '11'
+          distribution: 'corretto'
       - name: build and test
         run: ./gradlew assemble && ./gradlew check --info --stacktrace

.github/workflows/release.yml

@@ -17,11 +17,12 @@ jobs:
       RELEASE_VERSION: ${{ github.event.inputs.version }}
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: '8.0.282'
+          java-version: '11'
+          distribution: 'corretto'
       - name: build test and publish
         run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

build.gradle

@@ -5,22 +5,18 @@ plugins {
     id 'java'
     id 'groovy'
     id 'java-library'
-    id 'maven'
     id 'maven-publish'
     id 'signing'
     id "io.github.gradle-nexus.publish-plugin" version "1.0.0"
     id "biz.aQute.bnd.builder" version "6.4.0"
 }
 
-if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
-    def msg = String.format("This build must be run with java 1.8 - you are running %s - gradle finds the JDK via JAVA_HOME=%s",
-            JavaVersion.current(), System.getenv("JAVA_HOME"))
-    throw new GradleException(msg)
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
 def getDevelopmentVersion() {
     def output = new StringBuilder()
     def error = new StringBuilder()
@@ -45,11 +41,10 @@ repositories {
 }
 
 dependencies {
-    compile "com.graphql-java:graphql-java:20.3"
+    implementation "com.graphql-java:graphql-java:21.0"
 
     testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5'
     testImplementation('org.codehaus.groovy:groovy:2.5.13')
-
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
@@ -88,7 +83,7 @@ publishing {
                 asNode().children().last() + {
                     resolveStrategy = Closure.DELEGATE_FIRST
                     name 'graphql-java-extended-scalars'
-                    description 'A library fo extended scalars for graphql-java'
+                    description 'A library of extended scalars for graphql-java'
                     url 'https://github.com/graphql-java/graphql-java-extended-scalars'
                     inceptionYear '2018'
 
@@ -134,7 +129,6 @@ signing {
     sign publishing.publications
 }
 
-
 // all publish tasks depend on the build task
 tasks.withType(PublishToMavenRepository) {
     dependsOn build

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists