AGP 8.7.1, 8.8 Alpha 8 & don't rely on ANDROID_HOME for virtual test projects

mannodermaus · mannodermaus · commit 583d9f0f8d97 · 2024-10-27T11:27:58.000+09:00
diff --git a/build-logic/src/main/kotlin/Environment.kt b/build-logic/src/main/kotlin/Environment.kt
@@ -15,8 +15,8 @@ enum class SupportedAgp(
     AGP_8_4("8.4.2", gradle = "8.6"),
     AGP_8_5("8.5.2", gradle = "8.7"),
     AGP_8_6("8.6.1", gradle = "8.7"),
-    AGP_8_7("8.7.0", gradle = "8.9"),
-    AGP_8_8("8.8.0-alpha05", gradle = "8.10.2"),
+    AGP_8_7("8.7.1", gradle = "8.9"),
+    AGP_8_8("8.8.0-alpha08", gradle = "8.10.2"),
     ;
 
     companion object {
diff --git a/plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/util/projects/FunctionalTestProjectCreator.kt b/plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/util/projects/FunctionalTestProjectCreator.kt
@@ -61,6 +61,9 @@ class FunctionalTestProjectCreator(
     projectFolder.mkdirs()
 
     // Set up static files
+    File(projectFolder, "local.properties").bufferedWriter().use { file ->
+      file.write("sdk.dir = ${environment.androidSdkFolder.absolutePath}")
+    }
     File(projectFolder, "gradle.properties").bufferedWriter().use { file ->
       file.write("android.useAndroidX = true")
     }

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ class FunctionalTestProjectCreator(`
`61`	`61`	`projectFolder.mkdirs()`
`62`	`62`
`63`	`63`	`// Set up static files`
	`64`	`+ File(projectFolder, "local.properties").bufferedWriter().use { file ->`
	`65`	`+ file.write("sdk.dir = ${environment.androidSdkFolder.absolutePath}")`
	`66`	`+ }`
`64`	`67`	`File(projectFolder, "gradle.properties").bufferedWriter().use { file ->`
`65`	`68`	`file.write("android.useAndroidX = true")`
`66`	`69`	`}`