Skip to content

Commit 7afb04c

Browse files
mannodermausmannodermaus
committed
AGP 9.3.3, 9.4.0, 9.5.0 Alpha 6
1 parent ea424b2 commit 7afb04c

2 files changed

Lines changed: 14 additions & 23 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ enum class SupportedAgp(
3838
AGP_9_0("9.0.1", gradle = "9.1.0"),
3939
AGP_9_1("9.1.1", gradle = "9.3.1"),
4040
AGP_9_2("9.2.1", gradle = "9.4.1"),
41-
AGP_9_3("9.3.0-rc01", gradle = "9.5.0"),
42-
AGP_9_4("9.4.0-alpha01", gradle = "9.5.0"),
41+
AGP_9_3("9.3.3", gradle = "9.5.0"),
42+
AGP_9_4("9.4.0", gradle = "9.6.0"),
43+
AGP_9_5("9.5.0-alpha06", gradle = "9.6.0"),
4344
;
4445

4546
companion object {

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

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,16 @@ package de.mannodermaus.gradle.plugins.junit5
33
import com.google.common.truth.Truth.assertWithMessage
44
import de.mannodermaus.gradle.plugins.junit5.annotations.DisabledOnCI
55
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.capitalized
6-
import de.mannodermaus.gradle.plugins.junit5.util.BuildResultSubject
7-
import de.mannodermaus.gradle.plugins.junit5.util.TestEnvironment
8-
import de.mannodermaus.gradle.plugins.junit5.util.TestedAgp
9-
import de.mannodermaus.gradle.plugins.junit5.util.TestedJUnit
10-
import de.mannodermaus.gradle.plugins.junit5.util.prettyPrint
6+
import de.mannodermaus.gradle.plugins.junit5.util.*
117
import de.mannodermaus.gradle.plugins.junit5.util.projects.FunctionalTestProjectCreator
12-
import de.mannodermaus.gradle.plugins.junit5.util.withPrunedPluginClasspath
13-
import java.io.File
148
import org.gradle.testkit.runner.BuildResult
159
import org.gradle.testkit.runner.GradleRunner
1610
import org.gradle.testkit.runner.TaskOutcome
17-
import org.junit.jupiter.api.AfterAll
18-
import org.junit.jupiter.api.BeforeAll
11+
import org.junit.jupiter.api.*
1912
import org.junit.jupiter.api.DynamicContainer.dynamicContainer
20-
import org.junit.jupiter.api.DynamicNode
2113
import org.junit.jupiter.api.DynamicTest.dynamicTest
22-
import org.junit.jupiter.api.TestFactory
23-
import org.junit.jupiter.api.TestInstance
2414
import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
25-
import org.junit.jupiter.api.fail
15+
import java.io.File
2616

2717
@TestInstance(PER_CLASS)
2818
@DisabledOnCI
@@ -78,17 +68,17 @@ class FunctionalTests {
7868
"AGP ${agp.shortVersion}",
7969
// Exercise each test project within the given environment
8070
projectCreator.allSpecs.filterSpecs().map { spec ->
81-
dynamicTest("${spec.name} ($junit)") {
71+
dynamicTest("${spec.name} (${junit.fullVersion})") {
8272
// Required for visibility inside the IntelliJ logging console
8373
// (display names are still bugged in the IDE)
8474
println(
8575
buildList {
86-
add("JUnit ${junit.majorVersion}")
87-
add("AGP: ${agp.version}")
88-
add("Project: ${spec.name}")
89-
add("Gradle: ${agp.requiresGradle}")
90-
agp.requiresCompileSdk?.let { add("SDK: $it") }
91-
}
76+
add("JUnit ${junit.majorVersion}")
77+
add("AGP: ${agp.version}")
78+
add("Project: ${spec.name}")
79+
add("Gradle: ${agp.requiresGradle}")
80+
agp.requiresCompileSdk?.let { add("SDK: $it") }
81+
}
9282
.joinToString()
9383
)
9484

@@ -169,7 +159,7 @@ class FunctionalTests {
169159
}
170160

171161
private fun List<FunctionalTestProjectCreator.Spec>.filterSpecs():
172-
List<FunctionalTestProjectCreator.Spec> =
162+
List<FunctionalTestProjectCreator.Spec> =
173163
if (testedProjects.isEmpty()) {
174164
// Nothing to do, exercise all different projects
175165
this

0 commit comments

Comments
 (0)