diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d309b1c..19ea3d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - java_version: [17] + java_version: [21] steps: - name: Checkout diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index eae7dab..911e52f 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -15,11 +15,11 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Install JDK 17 + - name: Install JDK 21 uses: actions/setup-java@v5 with: distribution: 'zulu' - java-version: 17 + java-version: 21 - name: Setup gradle uses: gradle/gradle-build-action@v3 diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index c74b755..cafad57 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -15,11 +15,11 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Install JDK 17 + - name: Install JDK 21 uses: actions/setup-java@v5 with: distribution: 'zulu' - java-version: 17 + java-version: 21 - name: Setup gradle uses: gradle/gradle-build-action@v3 diff --git a/junit4-android-integration-rules/build.gradle b/junit4-android-integration-rules/build.gradle index 8890bfd..ac8796f 100644 --- a/junit4-android-integration-rules/build.gradle +++ b/junit4-android-integration-rules/build.gradle @@ -13,7 +13,7 @@ licensee { kotlin { jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -22,11 +22,6 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion as int - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } - defaultConfig { minSdkVersion rootProject.ext.minSdkVersion as int diff --git a/junit4-rules/build.gradle b/junit4-rules/build.gradle index d85fd8d..795c9a4 100644 --- a/junit4-rules/build.gradle +++ b/junit4-rules/build.gradle @@ -8,8 +8,8 @@ licensee { allow("BSD-2-Clause") } -java.targetCompatibility = JavaVersion.VERSION_11 -java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_21 +java.sourceCompatibility = JavaVersion.VERSION_21 dependencies { api deps.test.junit