# HG changeset patch # User Da Risk # Date 1711810451 14400 # Node ID 0b98a9a23a9445e64681886f300c50a063a517df # Parent 0fe2801ff0a23ccc36abdc7fc2aa745d497f0bf7 build: update to agp 8.3.1 diff -r 0fe2801ff0a2 -r 0b98a9a23a94 buildSrc/build.gradle.kts --- a/buildSrc/build.gradle.kts Sat Mar 30 10:38:36 2024 -0400 +++ b/buildSrc/build.gradle.kts Sat Mar 30 10:54:11 2024 -0400 @@ -56,7 +56,7 @@ } dependencies { - implementation("com.android.tools.build:gradle:8.2.2") + implementation("com.android.tools.build:gradle:8.3.1") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22") implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1") implementation("com.github.triplet.gradle:play-publisher:3.7.0") diff -r 0fe2801ff0a2 -r 0b98a9a23a94 buildSrc/src/main/kotlin/AndroidSigning.kt --- a/buildSrc/src/main/kotlin/AndroidSigning.kt Sat Mar 30 10:38:36 2024 -0400 +++ b/buildSrc/src/main/kotlin/AndroidSigning.kt Sat Mar 30 10:54:11 2024 -0400 @@ -24,9 +24,9 @@ import com.android.build.api.dsl.* import org.gradle.api.Project -private typealias AppExtensionWithSigning = CommonExtension<*, ApplicationBuildType, *, *, *> -private typealias LibExtensionWithSigning = CommonExtension<*, LibraryBuildType, *, *, *> -private typealias TestExtensionWithSigning = CommonExtension<*, TestBuildType, *, *, *> +private typealias AppExtensionWithSigning = CommonExtension<*, ApplicationBuildType, *, *, *, *> +private typealias LibExtensionWithSigning = CommonExtension<*, LibraryBuildType, *, *, *, *> +private typealias TestExtensionWithSigning = CommonExtension<*, TestBuildType, *, *, *, *> // TODO This implicitly supports only the AppPlugin // should we support other android plugins: LibraryPlugin TestPlugin ? diff -r 0fe2801ff0a2 -r 0b98a9a23a94 buildSrc/src/main/kotlin/AndroidTests.kt --- a/buildSrc/src/main/kotlin/AndroidTests.kt Sat Mar 30 10:38:36 2024 -0400 +++ b/buildSrc/src/main/kotlin/AndroidTests.kt Sat Mar 30 10:54:11 2024 -0400 @@ -38,7 +38,7 @@ const val androidxTestCoreVersion = "1.5.0" const val robolectricVersion = "4.10.2" -private typealias BaseExtension = CommonExtension<*, *, DefaultConfig, *, *> +private typealias BaseExtension = CommonExtension<*, *, DefaultConfig, *, *, *> /* * Configuration for espresso and robolectric usage in an Android project diff -r 0fe2801ff0a2 -r 0b98a9a23a94 buildSrc/src/main/kotlin/SourceLicenseChecker.kt --- a/buildSrc/src/main/kotlin/SourceLicenseChecker.kt Sat Mar 30 10:38:36 2024 -0400 +++ b/buildSrc/src/main/kotlin/SourceLicenseChecker.kt Sat Mar 30 10:54:11 2024 -0400 @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper import org.jetbrains.kotlin.gradle.plugin.KotlinJsPluginWrapper import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper -import java.util.* +import java.util.Locale internal fun Project.configureSourceLicenseChecker() { apply() @@ -79,7 +79,7 @@ kotlin.sourceSets.configureEach { val kotlinSource = this val sourceSetTaskName = - "${LicenseBasePlugin.getLICENSE_TASK_BASE_NAME()}${taskInfix}${name.capitalize(Locale.ROOT)}" + "${LicenseBasePlugin.getLICENSE_TASK_BASE_NAME()}${taskInfix}${name.capitalize()}" logger.info("Adding $sourceSetTaskName task for sourceSet ${kotlinSource.name}") if (sourceSetTaskName in tasks.names) { // tasks may have already been added by configuration for the Android plugin @@ -90,7 +90,7 @@ source(kotlinSource.kotlin) } val sourceSetFormatTaskName = - "${LicenseBasePlugin.getFORMAT_TASK_BASE_NAME()}${taskInfix}${name.capitalize(Locale.ROOT)}" + "${LicenseBasePlugin.getFORMAT_TASK_BASE_NAME()}${taskInfix}${name.capitalize()}" tasks.register(sourceSetFormatTaskName, LicenseFormat::class.java) { source(kotlinSource.kotlin) } @@ -106,12 +106,12 @@ val kotlinSource = kotlin.sourceSets[name] logger.info("Adding kotlin sources from sourceSet $name to License plugin tasks") val sourceSetTaskName = - "${LicenseBasePlugin.getLICENSE_TASK_BASE_NAME()}${taskInfix}${name.capitalize(Locale.ROOT)}" + "${LicenseBasePlugin.getLICENSE_TASK_BASE_NAME()}${taskInfix}${name.capitalize()}" tasks.named(sourceSetTaskName, LicenseCheck::class.java) { source(kotlinSource.kotlin, manifest.srcFile) } val sourceSetFormatTaskName = - "${LicenseBasePlugin.getFORMAT_TASK_BASE_NAME()}${taskInfix}${name.capitalize(Locale.ROOT)}" + "${LicenseBasePlugin.getFORMAT_TASK_BASE_NAME()}${taskInfix}${name.capitalize()}" tasks.named(sourceSetFormatTaskName, LicenseFormat::class.java) { source(kotlinSource.kotlin, manifest.srcFile) } @@ -163,3 +163,6 @@ source = sourceSetSources(sourceSet) } } + +private fun String.capitalize() = + replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }