From 37c8ae56e1ab888579ebe99fcf325c975ed1254c Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Wed, 12 Apr 2023 14:16:00 +1000 Subject: [PATCH 1/2] Downgrade to Java 8 ahead of v20.x release --- .github/workflows/master.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- build.gradle | 12 ++++-------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 0215b16..bc9d5f8 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -15,9 +15,9 @@ jobs: steps: - uses: actions/checkout@v1 - uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 11 + - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: - java-version: '11.0.17' + java-version: '8.0.282' - name: build test and publish run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 572b8d8..206d52a 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -16,9 +16,9 @@ jobs: steps: - uses: actions/checkout@v1 - uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 11 + - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: - java-version: '11.0.17' + java-version: '8.0.282' - name: build and test run: ./gradlew assemble && ./gradlew check --info --stacktrace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9158bea..b61d755 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,9 +19,9 @@ jobs: steps: - uses: actions/checkout@v1 - uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 11 + - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: - java-version: '11.0.17' + java-version: '8.0.282' - name: build test and publish run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace diff --git a/build.gradle b/build.gradle index 7834972..f62d8bb 100644 --- a/build.gradle +++ b/build.gradle @@ -31,21 +31,17 @@ version = releaseVersion ? releaseVersion : getDevelopmentVersion() println "Building version = " + version group = 'com.graphql-java' -if (JavaVersion.current() != JavaVersion.VERSION_11) { - def msg = String.format("This build must be run with Java 11 - 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(8) + } } -sourceCompatibility = JavaVersion.VERSION_11.toString() -targetCompatibility = JavaVersion.VERSION_11.toString() - repositories { mavenCentral() mavenLocal() } - dependencies { compile "com.graphql-java:graphql-java:20.2" From c67260ae339c3d051c466b9d0ad4d03d3a66cfbc Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Wed, 12 Apr 2023 14:56:36 +1000 Subject: [PATCH 2/2] Use non-toolchain version --- build.gradle | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index f62d8bb..057c777 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,15 @@ plugins { 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) +} + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + def getDevelopmentVersion() { def output = new StringBuilder() def error = new StringBuilder() @@ -25,18 +34,11 @@ def getDevelopmentVersion() { "0.0.0-" + new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-" + gitHash } - def releaseVersion = System.env.RELEASE_VERSION version = releaseVersion ? releaseVersion : getDevelopmentVersion() println "Building version = " + version group = 'com.graphql-java' -java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } -} - repositories { mavenCentral() mavenLocal()