From 1921c6544d2a50558dc30e5e076d3ed85daaa9be Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Sun, 16 Apr 2023 22:48:57 +0200
Subject: [PATCH] Replace deprecated methods

---
 app-nia-catalog/build.gradle.kts                             | 2 +-
 app/build.gradle.kts                                         | 2 +-
 .../google/samples/apps/nowinandroid/GradleManagedDevices.kt | 3 +--
 .../kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt    | 5 +++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.kts
index 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.kts
index 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.kt
index 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.CommonExtension
 import com.android.build.api.dsl.ManagedVirtualDevice
 import org.gradle.api.Project
 import 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.kt
index 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.withType
 import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
 import org.gradle.testing.jacoco.tasks.JacocoReport
+import java.util.Locale
 
 private 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<*, *, *>,
 ) {