A fully functional Android app built entirely with Kotlin and Jetpack Compose
Replace deprecated methods
Simon Marquis1921c6544d2a
diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.ktsindex 42ffd7039..7a8d61339 100644--- a/app-nia-catalog/build.gradle.kts+++ b/app-nia-catalog/build.gradle.kts@@ -47,7 +47,7 @@ android {missingDimensionStrategy(FlavorDimension.contentType.name, NiaFlavor.demo.name)}- packagingOptions {+ packaging {resources {excludes.add("/META-INF/{AL2.0,LGPL2.1}")}diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 42dee2602..70160f3e1 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -65,7 +65,7 @@ android {}}- packagingOptions {+ packaging {resources {excludes.add("/META-INF/{AL2.0,LGPL2.1}")}diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.ktindex 624afeea9..8129defeb 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt@@ -20,7 +20,6 @@ import com.android.build.api.dsl.CommonExtensionimport com.android.build.api.dsl.ManagedVirtualDeviceimport org.gradle.api.Projectimport org.gradle.kotlin.dsl.invoke-import java.util.Locale/*** Configure project for Gradle managed devices@@ -55,7 +54,7 @@ private data class DeviceConfig(val systemImageSource: String,) {val taskName = buildString {- append(device.toLowerCase(Locale.ROOT).replace(" ", ""))+ append(device.lowercase().replace(" ", ""))append("api")append(apiLevel.toString())append(systemImageSource.replace("-", ""))diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.ktindex a34cd7c1c..d801d7b69 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt@@ -27,6 +27,7 @@ import org.gradle.kotlin.dsl.withTypeimport org.gradle.testing.jacoco.plugins.JacocoPluginExtensionimport org.gradle.testing.jacoco.plugins.JacocoTaskExtensionimport org.gradle.testing.jacoco.tasks.JacocoReport+import java.util.Localeprivate val coverageExclusions = listOf(// Android@@ -36,6 +37,10 @@ private val coverageExclusions = listOf("**/Manifest*.*")+private fun String.capitalize() = replaceFirstChar {+ if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()+}+internal fun Project.configureJacoco(androidComponentsExtension: AndroidComponentsExtension<*, *, *>,) {