Skip to content

Commit

Permalink
Moved build to JDK 8 and test to JDK 11
Browse files Browse the repository at this point in the history
  • Loading branch information
m-raab committed May 30, 2021
1 parent 59dcef7 commit a2aa34d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions README.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
====
**Breaking Changes!**
Source and target compatibility of the library was changed to **Java 11**.
The default configuration was adapted for **Jakarta XML Binding 3.0.1**.
====

Expand Down
9 changes: 6 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ pluginBundle {
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

// set correct project status
Expand All @@ -108,6 +108,9 @@ tasks {
[email protected](org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED)
}

this.javaLauncher.set( project.javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(11))
})
systemProperty("intershop.gradle.versions","6.8, 7.0.2")

if(project.hasProperty("repoURL")
Expand Down Expand Up @@ -270,6 +273,6 @@ dependencies {
implementation(gradleApi())
implementation(gradleKotlinDsl())

testImplementation("com.intershop.gradle.test:test-gradle-plugin:4.0.0")
testImplementation("com.intershop.gradle.test:test-gradle-plugin:4.1.0")
testImplementation(gradleTestKit())
}

0 comments on commit a2aa34d

Please sign in to comment.