Skip to content

Commit 52c9cdb

Browse files
committed
Bump minimum supported AGP/Gradle version to 8.2
1 parent ba8a5bf commit 52c9cdb

File tree

9 files changed

+20
-13
lines changed

9 files changed

+20
-13
lines changed

README.md.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,8 @@ before filing an issue with the latest one.
280280

281281
|Your AGP Version|Suggested JUnit5 Plugin Version|
282282
|---|---|
283-
|`>= 8.0.0`|`${pluginVersion}`|
283+
|`>= 8.2.0`|`${pluginVersion}`|
284+
|`8.0.0` - `8.1.4`|`1.12.2.0`|
284285
|`7.0.0` - `7.4.2`|`1.10.0.0`|
285286
|`4.0.0` - `4.2.2`|`1.8.2.1`|
286287
|`3.5.0` - `3.6.4`|`1.7.1.1`|

build-logic/src/main/kotlin/Environment.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ enum class SupportedAgp(
99
val gradle: String,
1010
val compileSdk: Int? = null
1111
) {
12-
AGP_8_0("8.0.2", gradle = "8.0", compileSdk = 33),
13-
AGP_8_1("8.1.4", gradle = "8.0"),
1412
AGP_8_2("8.2.2", gradle = "8.2"),
1513
AGP_8_3("8.3.2", gradle = "8.4"),
1614
AGP_8_4("8.4.2", gradle = "8.6"),

build-logic/src/main/kotlin/Tasks.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import java.io.File
1717
import java.time.ZonedDateTime
1818
import java.util.*
1919

20-
private const val minimumGradleVersion = "8.0"
20+
private const val minimumGradleVersion = "8.2"
2121

2222
@Suppress("DEPRECATION")
2323
fun Project.configureTestResources() {

instrumentation/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Change Log
44
## Unreleased
55

66
- Compile with SDK 35
7+
- Update to Kotlin 2.x
78

89
## 1.7.0 (2025-03-01)
910

plugin/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ Change Log
22
==========
33

44
## Unreleased
5+
- JUnit 5.13.0
6+
- Update to Kotlin 2.x
7+
- Raise minimum supported versions for AGP and Gradle to 8.2.x and 8.2, respectively
58

69
## 1.12.2.0 (2025-05-18)
710
- JUnit 5.12.2

plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/config/Constants.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
package de.mannodermaus.gradle.plugins.junit5.internal.config
44

5-
internal const val MIN_REQUIRED_GRADLE_VERSION = "8.0" // When updating this, check buildSrc/Tasks.kt and update it there, too
6-
internal const val MIN_REQUIRED_AGP_VERSION = "8.0.0"
5+
internal const val MIN_REQUIRED_GRADLE_VERSION = "8.2" // When updating this, check buildSrc/Tasks.kt and update it there, too
6+
internal const val MIN_REQUIRED_AGP_VERSION = "8.2.0"
77

88
internal const val EXTENSION_NAME = "junitPlatform"
99

plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/config/PluginConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private constructor(
5050
val hasJacocoPlugin get() = project.plugins.hasPlugin("jacoco")
5151
private val hasKotlinPlugin get() = project.plugins.findPlugin("kotlin-android") != null
5252

53-
fun finalizeDsl(block: (CommonExtension<*, *, *, *>) -> Unit) {
53+
fun finalizeDsl(block: (CommonExtension<*, *, *, *, *>) -> Unit) {
5454
componentsExtension.finalizeDsl(block)
5555
}
5656

plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/configureJUnit5.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ internal fun configureJUnit5(
5858

5959
/* Private */
6060

61-
private typealias AndroidExtension = CommonExtension<*, *, *, *>
61+
private typealias AndroidExtension = CommonExtension<*, *, *, *, *>
6262

6363
private fun AndroidJUnitPlatformExtension.prepareBuildTypeDsl(android: AndroidExtension) {
6464
// This will add filters for build types (e.g. "debug" or "release")

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/VersionCheckerTests.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,18 @@ class VersionCheckerTests {
2020
"7.0.0-rc01, false",
2121
"7.0.0, false",
2222
"8.0.0-beta01, false",
23-
"8.0.0, true",
24-
"8.0.1, true",
25-
"8.0.1-alpha01, true",
26-
"8.1.0, true",
27-
"8.1.0-beta01, true",
23+
"8.0.0, false",
24+
"8.0.1, false",
25+
"8.0.1-alpha01, false",
26+
"8.1.0, false",
27+
"8.1.0-beta01, false",
2828
"8.2.0, true",
2929
"8.3.0-rc01, true",
3030
"8.4.0-alpha05, true",
31+
"8.10.1-alpha01, true",
32+
"8.10.0, true",
33+
"8.11.0-beta01, true",
34+
"8.11.0, true",
3135
)
3236
@ParameterizedTest
3337
fun `check AGP compatibility`(version: String, compatible: Boolean) {

0 commit comments

Comments
 (0)