Merge pull request #1355 from android/wfp-gradle-updates

Fixes WFP sample Gradle issues

Author: garanj

WatchFacePush/app/build.gradle.kts

@@ -15,9 +15,8 @@
  */
 
 plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.jetbrainsKotlinAndroid)
-    alias(libs.plugins.compose.compiler)
+    id(libs.plugins.androidApplication.get().pluginId)
+    id(libs.plugins.compose.compiler.get().pluginId)
 }
 
 // Watch Face Push requires API level 36 and above.
@@ -46,9 +45,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     buildFeatures {
         compose = true
     }
@@ -57,19 +53,11 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
-
-    sourceSets {
-        getByName("release") {
-            assets.srcDirs(layout.buildDirectory.dir("intermediates/watchfaceAssets/release"))
-            res.srcDirs(layout.buildDirectory.file("generated/wfTokenRes/release/res/"))
-        }
-        getByName("debug") {
-            assets.srcDirs(layout.buildDirectory.dir("intermediates/watchfaceAssets/debug"))
-            res.srcDirs(layout.buildDirectory.file("generated/wfTokenRes/debug/res/"))
-        }
-    }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
 
 val mainAppNamespace = Attribute.of("wfp.app.namespace", String::class.java)
 // Define configurations that allows this app to include the sample watch faces in their assets
@@ -141,25 +129,35 @@ dependencies {
 // of the default watch face. This token is read from the marketplace manifest
 // upon installation, so that the default watch face can be installed.
 
-afterEvaluate {
-    android.applicationVariants.all {
-        val capsVariantName = name.replaceFirstChar(Char::titlecase)
-        val variantName = name
-        val copyTask = tasks.register("copyWatchFaceAssets$capsVariantName", Copy::class.java) {
-            from(configurations.getByName("${variantName}WatchfaceOutput").incoming.artifactView {}.files)
-            into(layout.buildDirectory.dir("intermediates/watchfaceAssets/$variantName"))
-            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+androidComponents.onVariants { variant ->
+    val capsVariantName = variant.name.replaceFirstChar(Char::titlecase)
+    val variantName = variant.name
+
+    val assetsDir = layout.buildDirectory.dir("intermediates/watchfaceAssets/${variantName}")
+        .get().asFile
+    val resDir = layout.buildDirectory.dir("generated/wfTokenRes/${variantName}/res/")
+        .get().asFile
+    val tokenFilePath = project.layout.buildDirectory.file("intermediates/watchfaceAssets/${variantName}/default_watchface_token.txt")
+        .get()
+
+    variant.sources.assets?.addStaticSourceDirectory(assetsDir.absolutePath)
+    variant.sources.res?.addStaticSourceDirectory(resDir.absolutePath)
+
+    val copyTask = tasks.register("copyWatchFaceAssets$capsVariantName", Copy::class.java) {
+        from(configurations.getByName("${variantName}WatchfaceOutput").incoming.artifactView {}.files)
+        into(assetsDir)
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+
+    val tokenResTask =
+        tasks.register<TokenResourceTask_gradle.TokenResourceTask>("tokenResTask$capsVariantName") {
+            dependsOn(copyTask)
+            tokenFile.set(tokenFilePath)
+            outputDirectory.set(resDir)
         }
 
-        val tokenResTask =
-            tasks.register<TokenResourceTask_gradle.TokenResourceTask>("tokenResTask$capsVariantName") {
-                dependsOn(copyTask)
-                buildVariant.set(variantName)
-                outputDirectory.set(layout.buildDirectory.dir("generated/wfTokenRes/$variantName").get().asFile)
-            }
-        // make sure to run the two defined tasks before doing anything else.
-        // tokenResTask will cause copyWatchFaceAssets to
-        // run as well
+    afterEvaluate {
         tasks.named("pre${capsVariantName}Build").configure {
             dependsOn(tokenResTask)
         }

WatchFacePush/app/src/main/java/com/google/samples/marketplace/data/WatchFaceApkCache.kt

@@ -0,0 +1,4 @@
+package com.google.samples.marketplace.data
+
+class WatchFaceApkCache {
+}

WatchFacePush/build.gradle.kts

@@ -20,9 +20,6 @@ import com.android.build.gradle.AppPlugin
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    alias(libs.plugins.androidApplication) apply false
-    alias(libs.plugins.jetbrainsKotlinAndroid) apply false
-    alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.compose.compiler) apply false
 }
 
@@ -61,7 +58,7 @@ subprojects {
                 }
                 val tokenTask =
                     tasks.register<TokenGenerationTask_gradle.TokenGenerationTask>("assembleToken$variantName") {
-                        dependsOn(assembleTask)
+                        dependsOn(assembleTask!!)
 
                         val validatorConfiguration = rootProject.project("app").configurations.getByName("validatorConfiguration")
                         val mainAppPackageName = validatorConfiguration.attributes.getAttribute(mainAppNamespace)

WatchFacePush/buildSrc/build.gradle.kts

@@ -38,6 +38,6 @@ repositories {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle-api:8.13.1")
+    implementation("com.android.tools.build:gradle-api:9.0.0")
     implementation("com.google.android.wearable.watchface.validator:validator-push:1.0.0-alpha08")
 }

WatchFacePush/buildSrc/src/main/kotlin/TokenResourceTask.gradle.kts

@@ -25,21 +25,20 @@ import kotlin.text.trimMargin
  * Task to create a resource file containing the validation token of the default watch face.
  */
 abstract class TokenResourceTask : DefaultTask() {
-    @get:Input
-    abstract val buildVariant: Property<String>
+    @get:InputFile
+    abstract val tokenFile: RegularFileProperty
 
     @get:OutputDirectory
     abstract val outputDirectory: RegularFileProperty
 
     @TaskAction
     fun performAction() {
-        val tokenFile =
-            project.layout.buildDirectory.file("intermediates/watchfaceAssets/${buildVariant.get()}/default_watchface_token.txt")
-                .get()
-        val outputFile = outputDirectory.get().asFile.resolve("res/values/wf_token.xml")
+
+
+        val outputFile = outputDirectory.get().asFile.resolve("values/wf_token.xml")
         project.mkdir(outputFile.parent)
         val tokenResText = """<resources>
-                         |    <string name="default_wf_token">${tokenFile.asFile.readText()}</string>
+                         |    <string name="default_wf_token">${tokenFile.get().asFile.readText()}</string>
                          |</resources>
                        """.trimMargin()
         outputFile.writeText(tokenResText)

WatchFacePush/gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-agp = "8.13.1"
-wear-compose-material3 = "1.5.5"
-wear-compose = "1.5.5"
-compose-tooling = "1.5.5"
-kotlin = "2.1.21"
-lifecycleViewmodelKtx = "2.9.4"
-composeBom = "2025.11.00"
-activityCompose = "1.11.0"
+agp = "9.0.0"
+wear-compose-material3 = "1.5.6"
+wear-compose = "1.5.6"
+compose-tooling = "1.5.6"
+kotlin = "2.3.0"
+lifecycleViewmodelKtx = "2.10.0"
+composeBom = "2026.01.00"
+activityCompose = "1.12.2"
 coreSplashscreen = "1.2.0"
-watchfacePush = "1.0.0-alpha01"
-horologist = "0.7.14-beta"
+watchfacePush = "1.0.0-beta01"
+horologist = "0.7.15"
 
 [libraries]
 compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "wear-compose" }

WatchFacePush/samples/defaultwf/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 
 android {
     namespace = "com.google.samples.marketplace.watchfacepush.defaultwf"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.google.samples.marketplace.watchfacepush.defaultwf"
@@ -57,5 +57,11 @@ android {
             }
         }
     }
+    packaging {
+        resources {
+            // Exclude all .kotlin_builtins files
+            excludes += "/**/*.kotlin_builtins"
+        }
+    }
 }
 

WatchFacePush/samples/firefly/build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 
 android {
     namespace = "com.google.samples.marketplace.watchfacepush.firefly"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.google.samples.marketplace.watchfacepush.firefly"
@@ -46,5 +46,12 @@ android {
             isMinifyEnabled = true
         }
     }
+
+    packaging {
+        resources {
+            // Exclude all .kotlin_builtins files
+            excludes += "/**/*.kotlin_builtins"
+        }
+    }
 }
 

WatchFacePush/samples/river/build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 
 android {
     namespace = "com.google.samples.marketplace.watchfacepush.river"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.google.samples.marketplace.watchfacepush.river"
@@ -46,5 +46,12 @@ android {
             isMinifyEnabled = true
         }
     }
+
+    packaging {
+        resources {
+            // Exclude all .kotlin_builtins files
+            excludes += "/**/*.kotlin_builtins"
+        }
+    }
 }