Update to AGP 8.8.0 and fix launcher icon label with multiple flavor …

…dimensions
UbiqueInnovation · Feb 4, 2025 · a8ce784 · a8ce784
1 parent c4c0710
commit a8ce784
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/alpaka/plugin/src/main/java/ch/ubique/gradle/alpaka/AlpakaPlugin.kt b/alpaka/plugin/src/main/java/ch/ubique/gradle/alpaka/AlpakaPlugin.kt
@@ -238,8 +238,8 @@ abstract class AlpakaPlugin : Plugin<Project> {
 	}
 
 	private fun getLauncherIconLabel(applicationVariant: ApplicationVariant, androidExtension: AppExtension): String? {
-		val productFlavor = applicationVariant.productFlavors.firstOrNull()
-		return productFlavor?.flavorLauncherIconLabel ?: androidExtension.defaultConfig.launcherIconLabel
+		return applicationVariant.productFlavors.firstNotNullOfOrNull { it.flavorLauncherIconLabel }
+			?: androidExtension.defaultConfig.launcherIconLabel
 	}
 
 }
diff --git a/examplekts/build.gradle.kts b/examplekts/build.gradle.kts
@@ -18,9 +18,28 @@ android {
 		alpakaUploadKey = "defaultConfig upload key"
 	}
 
+	flavorDimensions += "app"
 	flavorDimensions += "default"
 
 	productFlavors {
+		create("mainApp") {
+			dimension = "app"
+			launcherIconLabel = null
+
+			if (launcherIconLabel != null) {
+				error("Expected launcherIconLabel null but was $launcherIconLabel")
+			}
+		}
+
+		create("previewApp") {
+			dimension = "app"
+			launcherIconLabel = null
+
+			if (launcherIconLabel != null) {
+				error("Expected launcherIconLabel null but was $launcherIconLabel")
+			}
+		}
+
 		create("dev") {
 			dimension = "default"
 			applicationIdSuffix = ".dev"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-agp = "8.7.0"
-kotlin = "2.0.20"
+agp = "8.8.0"
+kotlin = "2.1.10"
 pluginPublish = "1.2.2"
 vanniktech = "0.29.0"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME