From e8010ce4fe976403802a91c1bdf5355e929d29d7 Mon Sep 17 00:00:00 2001 From: jun011026 Date: Wed, 13 Aug 2025 12:52:52 +0900 Subject: [PATCH 1/3] Network Module BuildConfigFields Null Check --- core/network/build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts index 1a902d5d6..60d38749c 100644 --- a/core/network/build.gradle.kts +++ b/core/network/build.gradle.kts @@ -61,7 +61,7 @@ val backendUrl = providers.fileContents( androidComponents { onVariants { - it.buildConfigFields.put("BACKEND_URL", backendUrl.map { value -> + it.buildConfigFields?.put("BACKEND_URL", backendUrl.map { value -> BuildConfigField(type = "String", value = """"$value"""", comment = null) }) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 81f12c480..e5324c936 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ accompanist = "0.37.0" androidDesugarJdkLibs = "2.1.4" # AGP and tools should be updated together -androidGradlePlugin = "8.9.0" +androidGradlePlugin = "8.11.1" androidTools = "31.9.0" androidxActivity = "1.9.3" androidxAppCompat = "1.7.0" From f0731b6e886ddcce074f2c9bc12b2dbeb2e304d3 Mon Sep 17 00:00:00 2001 From: jun011026 Date: Wed, 13 Aug 2025 12:54:15 +0900 Subject: [PATCH 2/3] Use sdkComponents.aapt2 API for aapt2 path --- .../kotlin/AndroidApplicationConventionPlugin.kt | 4 +--- .../com/google/samples/apps/nowinandroid/Badging.kt | 13 ++----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 1ab3a2ca0..5c09aa7af 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -16,7 +16,6 @@ import com.android.build.api.dsl.ApplicationExtension import com.android.build.api.variant.ApplicationAndroidComponentsExtension -import com.android.build.gradle.BaseExtension import com.google.samples.apps.nowinandroid.configureBadgingTasks import com.google.samples.apps.nowinandroid.configureGradleManagedDevices import com.google.samples.apps.nowinandroid.configureKotlinAndroid @@ -25,7 +24,6 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.getByType class AndroidApplicationConventionPlugin : Plugin { override fun apply(target: Project) { @@ -44,7 +42,7 @@ class AndroidApplicationConventionPlugin : Plugin { } extensions.configure { configurePrintApksTask(this) - configureBadgingTasks(extensions.getByType(), this) + configureBadgingTasks(this) } } } diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt index 886c70625..6f5b5ef08 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt @@ -16,10 +16,8 @@ package com.google.samples.apps.nowinandroid -import com.android.SdkConstants import com.android.build.api.artifact.SingleArtifact import com.android.build.api.variant.ApplicationAndroidComponentsExtension -import com.android.build.gradle.BaseExtension import com.google.common.truth.Truth.assertWithMessage import org.gradle.api.DefaultTask import org.gradle.api.Project @@ -110,7 +108,6 @@ private fun String.capitalized() = replaceFirstChar { } fun Project.configureBadgingTasks( - baseExtension: BaseExtension, componentsExtension: ApplicationAndroidComponentsExtension, ) { // Registers a callback to be called, when a new variant is configured @@ -122,14 +119,8 @@ fun Project.configureBadgingTasks( tasks.register(generateBadgingTaskName) { apk = variant.artifacts.get(SingleArtifact.APK_FROM_BUNDLE) aapt2Executable.set( - // TODO: Replace with `sdkComponents.aapt2` when it's available in AGP - // https://issuetracker.google.com/issues/376815836 - componentsExtension.sdkComponents.sdkDirectory.map { directory -> - directory.file( - "${SdkConstants.FD_BUILD_TOOLS}/" + - "${baseExtension.buildToolsVersion}/" + - SdkConstants.FN_AAPT2, - ) + componentsExtension.sdkComponents.aapt2.flatMap { aapt2 -> + aapt2.executable } ) badging = project.layout.buildDirectory.file( From f80609faa3c74ef1681241fbe552406cf7b6f8a1 Mon Sep 17 00:00:00 2001 From: jun011026 Date: Tue, 19 Aug 2025 14:34:59 +0900 Subject: [PATCH 3/3] AGP androidTools Version *.10.1 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e5324c936..d933e4f99 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,8 +2,8 @@ accompanist = "0.37.0" androidDesugarJdkLibs = "2.1.4" # AGP and tools should be updated together -androidGradlePlugin = "8.11.1" -androidTools = "31.9.0" +androidGradlePlugin = "8.10.1" +androidTools = "31.10.1" androidxActivity = "1.9.3" androidxAppCompat = "1.7.0" androidxBrowser = "1.8.0"