Skip to content

Commit 1921c65

Browse files
committed
Replace deprecated methods
1 parent c8b7766 commit 1921c65

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

app-nia-catalog/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ android {
4747
missingDimensionStrategy(FlavorDimension.contentType.name, NiaFlavor.demo.name)
4848
}
4949

50-
packagingOptions {
50+
packaging {
5151
resources {
5252
excludes.add("/META-INF/{AL2.0,LGPL2.1}")
5353
}

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ android {
6565
}
6666
}
6767

68-
packagingOptions {
68+
packaging {
6969
resources {
7070
excludes.add("/META-INF/{AL2.0,LGPL2.1}")
7171
}

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import com.android.build.api.dsl.CommonExtension
2020
import com.android.build.api.dsl.ManagedVirtualDevice
2121
import org.gradle.api.Project
2222
import org.gradle.kotlin.dsl.invoke
23-
import java.util.Locale
2423

2524
/**
2625
* Configure project for Gradle managed devices
@@ -55,7 +54,7 @@ private data class DeviceConfig(
5554
val systemImageSource: String,
5655
) {
5756
val taskName = buildString {
58-
append(device.toLowerCase(Locale.ROOT).replace(" ", ""))
57+
append(device.lowercase().replace(" ", ""))
5958
append("api")
6059
append(apiLevel.toString())
6160
append(systemImageSource.replace("-", ""))

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import org.gradle.kotlin.dsl.withType
2727
import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
2828
import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
2929
import org.gradle.testing.jacoco.tasks.JacocoReport
30+
import java.util.Locale
3031

3132
private val coverageExclusions = listOf(
3233
// Android
@@ -36,6 +37,10 @@ private val coverageExclusions = listOf(
3637
"**/Manifest*.*"
3738
)
3839

40+
private fun String.capitalize() = replaceFirstChar {
41+
if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
42+
}
43+
3944
internal fun Project.configureJacoco(
4045
androidComponentsExtension: AndroidComponentsExtension<*, *, *>,
4146
) {

0 commit comments

Comments
 (0)