From eaa5ac6b6689d11b0433fbd4ce6f92c365b9bb64 Mon Sep 17 00:00:00 2001 From: Matthias Raab Date: Sun, 30 May 2021 10:51:43 +0200 Subject: [PATCH] Switch back to JDK 8 for compile time. test are executed with JDK 11. --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- README.asciidoc | 3 +-- build.gradle.kts | 10 +++++++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e36f176..0ba207c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,10 +16,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up JDK 11 + - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 1.8 - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e348c6..3e83692 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up JDK 11 + - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 1.8 - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/README.asciidoc b/README.asciidoc index acbd32e..a08ff13 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -1,12 +1,11 @@ = Gradle Test Plugin -:latestRevision: 4.0.0 +:latestRevision: 4.1.0 [CAUTION] ==== **Breaking Changes!** This library requires **Gradle >= 7** to work properly. -Source and target compatibility of the library was changed to **Java 11** ==== == Summary diff --git a/build.gradle.kts b/build.gradle.kts index d1f089e..833086e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ plugins { group = "com.intershop.gradle.test" description = "Gradle test library - test extension for Gradle plugin builds" -version = "4.0.0" +version = "4.1.0" val sonatypeUsername: String? by project val sonatypePassword: String? by project @@ -33,8 +33,8 @@ java { } configure { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } // set correct project status @@ -47,6 +47,10 @@ tasks { withType().configureEach { testLogging.showStandardStreams = true + this.javaLauncher.set( project.javaToolchains.launcherFor { + languageVersion.set(JavaLanguageVersion.of(11)) + }) + // Gradle versions for test systemProperty("intershop.gradle.versions", "7.0.2") systemProperty("intershop.test.base.dir", (File(project.buildDir, "test-working")).absolutePath)