Skip to content

Commit b3ffd12

Browse files
committed
Test with AGP 9.0.0-alpha14. Update test fixtures.
1 parent 5ec187a commit b3ffd12

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
AGP_VERSION: ${{ matrix.agp-version }}
6262
strategy:
6363
matrix:
64-
agp-version: [ 8.2.2, 8.3.2, 8.4.2, 8.5.2, 8.6.1, 8.7.3, 8.8.2, 8.9.2, 8.10.1, 8.11.1, 8.12.2, 8.13.0, 9.0.0-alpha02 ]
64+
agp-version: [ 8.2.2, 8.3.2, 8.4.2, 8.5.2, 8.6.1, 8.7.3, 8.8.2, 8.9.2, 8.10.1, 8.11.1, 8.12.2, 8.13.0, 9.0.0-alpha14 ]
6565

6666
steps:
6767
- uses: actions/checkout@v5

src/functionalTest/kotlin/io/github/reactivecircus/appversioning/AppVersioningPluginIntegrationTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ import kotlin.test.assertNull
2121
import kotlin.test.assertTrue
2222

2323
@Burst
24-
class AppVersioningPluginIntegrationTest(private val buildScriptLanguage: BuildScriptLanguage) {
24+
class AppVersioningPluginIntegrationTest(
25+
private val buildScriptLanguage: BuildScriptLanguage = BuildScriptLanguage.Kts,
26+
) {
2527
@get:Rule
2628
val fixtureDir = TemporaryFolder()
2729

src/functionalTest/kotlin/io/github/reactivecircus/appversioning/fixtures/ProjectTemplates.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ sealed class AndroidProjectTemplate {
6666
get() {
6767
val flavorConfigs = if (flavors.isNotEmpty()) {
6868
"""
69-
flavorDimensions("environment")
69+
flavorDimensions.add("environment")
7070
productFlavors {
7171
${flavors.joinToString("\n") { "register(\"$it\") {}" }}
7272
}
@@ -102,14 +102,14 @@ sealed class AndroidProjectTemplate {
102102
103103
android {
104104
namespace = "$DEFAULT_PACKAGE_NAME.${projectName.replace("-", ".")}"
105-
compileSdkVersion(34)
106-
buildToolsVersion = "34.0.0"
105+
compileSdk = 36
106+
buildToolsVersion = "36.0.0"
107107
defaultConfig {
108-
minSdkVersion(21)
109-
targetSdkVersion(34)
108+
minSdk = 21
109+
${if (isAppProject) "targetSdk = 36" else ""}
110110
}
111111
112-
lintOptions.isCheckReleaseBuilds = false
112+
lint.checkReleaseBuilds = false
113113
114114
$flavorConfigs
115115
@@ -158,14 +158,14 @@ sealed class AndroidProjectTemplate {
158158
159159
android {
160160
namespace '$DEFAULT_PACKAGE_NAME.${projectName.replace("-", ".")}'
161-
compileSdkVersion 34
162-
buildToolsVersion "34.0.0"
161+
compileSdk 36
162+
buildToolsVersion "36.0.0"
163163
defaultConfig {
164-
minSdkVersion 21
165-
targetSdkVersion 34
164+
minSdk 21
165+
${if (isAppProject) "targetSdk 36" else ""}
166166
}
167167
168-
lintOptions {
168+
lint {
169169
checkReleaseBuilds false
170170
}
171171

0 commit comments

Comments
 (0)