Skip to content

Commit

Permalink
chore(J21 compat): require java 17 for all modules
Browse files Browse the repository at this point in the history
Signed-off-by: l-1squared <30831153+l-1squared@users.noreply.github.com>
  • Loading branch information
l-1squared committed Oct 25, 2024
1 parent 40aeb43 commit b33ba0d
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/jgiven_branch_and_pr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
ANDROID: true
strategy:
matrix:
java: [ '11', '17', '21']
java: [ '17', '21', '22']
junit: ['4.13.2']
steps:
- name: Ensure chrome is installed
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mock_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
GPG_KEY_ID: 'notARealKeyId@example.com'
VERSION: '0.0.1-TEST'
steps:
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v4.5.0
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
- name: Set up a server certificate
run: |
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Release v2.0.0
## Backward incompatible changes
* Gradle-Plugin: The jgiven report task now forces execution of test tasks. That is, when the task jgivenTestReport is explicitly requested, for instance via the command line, the test tasks it depends on are also executed. For implementations where the jgiven task is set to finalize a test task (i.e `test.finalizedBy(jgiven)`, the behavior is unchanged.
* JGiven now requires Java 17
## Fixed issues:
* The Gradle-Plugin is now configuration-cache compliant [#1527](https://github.com/TNG/JGiven/issues/1527) (big thanks to @jjohannes for basically doing all the work)
* Various dependency updates.
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ configure(subprojects.findAll { !it.name.contains("android") }) {
}

java {
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
withJavadocJar()
withSourcesJar()
}
Expand Down
4 changes: 2 additions & 2 deletions example-projects/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}

Expand Down
4 changes: 2 additions & 2 deletions example-projects/junit5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ plugins {
apply plugin: 'com.tngtech.jgiven.gradle-plugin'

compileJava {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
options.compilerArgs += '-parameters'
options.encoding = 'UTF-8'
}
Expand Down
4 changes: 2 additions & 2 deletions example-projects/kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ apply plugin: 'eclipse'
apply plugin: 'com.tngtech.jgiven.gradle-plugin'

compileJava {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
options.compilerArgs += '-parameters'
options.encoding = 'UTF-8'
}
Expand Down
4 changes: 2 additions & 2 deletions example-projects/selenium/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ repositories {
}

compileJava {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
options.compilerArgs += '-parameters'
options.encoding = 'UTF-8'
}
Expand Down
4 changes: 2 additions & 2 deletions example-projects/testng/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ plugins {
apply plugin: 'com.tngtech.jgiven.gradle-plugin'

compileJava {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
options.compilerArgs += '-parameters'
options.encoding = 'UTF-8'
}
Expand Down
4 changes: 2 additions & 2 deletions jgiven-android-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildTypes {
Expand Down
4 changes: 2 additions & 2 deletions jgiven-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ android {
namespace 'jgiven.tngtech.com.jgiven_android'

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

defaultConfig {
Expand Down

0 comments on commit b33ba0d

Please sign in to comment.