Skip to content

Commit 56dcdf0

Browse files
committed
JUnit 5.10.0
1 parent 2ab7946 commit 56dcdf0

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
object libs {
44
object versions {
55
const val kotlin = "1.8.21"
6-
const val junitJupiter = "5.9.3"
7-
const val junitVintage = "5.9.3"
8-
const val junitPlatform = "1.9.3"
6+
const val junitJupiter = "5.10.0"
7+
const val junitVintage = "5.10.0"
8+
const val junitPlatform = "1.10.0"
99
const val truth = "1.1.3"
1010
const val androidXTest = "1.4.0"
1111
const val composeCompiler = "1.4.7"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ object Artifacts {
8787
platform = Java,
8888
groupId = "de.mannodermaus.gradle.plugins",
8989
artifactId = "android-junit5",
90-
currentVersion = "1.9.3.1-SNAPSHOT",
90+
currentVersion = "1.10.0.0-SNAPSHOT",
9191
latestStableVersion = "1.9.3.0",
9292
license = license,
9393
description = "Unit Testing with JUnit 5 for Android."

plugin/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Change Log
22
==========
33

44
## Unreleased
5+
- JUnit 5.10.0
56

67
## 1.9.3.0 (2023-04-29)
78
- JUnit 5.9.3

plugin/android-junit5/src/test/resources/test-projects/build.gradle.kts.template

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151
compileSdkVersion("${compileSdk}")
5252

5353
defaultConfig {
54-
{% if atLeastAgp("8.0.0-alpha01") %}
54+
{% if atLeastAgp("8.0.0") %}
5555
namespace = "de.mannodermaus.app"
5656
{% endif %}
5757

@@ -70,6 +70,22 @@ android {
7070
{% endif %}
7171
}
7272

73+
// Enforce Java 17 for AGP 8 and above
74+
{% if atLeastAgp("8.0.0") %}
75+
val javaVersion = JavaVersion.VERSION_17
76+
77+
compileOptions {
78+
sourceCompatibility = javaVersion
79+
targetCompatibility = javaVersion
80+
}
81+
82+
{% if USE_KOTLIN %}
83+
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
84+
kotlinOptions.jvmTarget = javaVersion.toString()
85+
}
86+
{% endif %}
87+
{% endif %}
88+
7389
{% if USE_FLAVORS %}
7490
flavorDimensions("environment")
7591
productFlavors {

0 commit comments

Comments
 (0)