Fix warnings on changed files

- Redundant suppression
- UnstableApiUsage
- There is more than one label with such a name in this scope.
pull/1959/head
Simon Marquis 9 months ago
parent 12c265cf55
commit 7af1c8bef9

@ -37,7 +37,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
extensions.configure<ApplicationExtension> { extensions.configure<ApplicationExtension> {
configureKotlinAndroid(this) configureKotlinAndroid(this)
defaultConfig.targetSdk = 36 defaultConfig.targetSdk = 36
@Suppress("UnstableApiUsage")
testOptions.animationsDisabled = true testOptions.animationsDisabled = true
configureGradleManagedDevices(this) configureGradleManagedDevices(this)
} }

@ -46,6 +46,7 @@ internal fun Project.configureAndroidCompose(
extensions.configure<ComposeCompilerGradlePluginExtension> { extensions.configure<ComposeCompilerGradlePluginExtension> {
fun Provider<String>.onlyIfTrue() = flatMap { provider { it.takeIf(String::toBoolean) } } fun Provider<String>.onlyIfTrue() = flatMap { provider { it.takeIf(String::toBoolean) } }
fun Provider<*>.relativeToRootProject(dir: String) = map { fun Provider<*>.relativeToRootProject(dir: String) = map {
@Suppress("UnstableApiUsage")
isolated.rootProject.projectDirectory isolated.rootProject.projectDirectory
.dir("build") .dir("build")
.dir(projectDir.toRelativeString(rootDir)) .dir(projectDir.toRelativeString(rootDir))
@ -59,6 +60,7 @@ internal fun Project.configureAndroidCompose(
.relativeToRootProject("compose-reports") .relativeToRootProject("compose-reports")
.let(reportsDestination::set) .let(reportsDestination::set)
@Suppress("UnstableApiUsage")
stabilityConfigurationFiles stabilityConfigurationFiles
.add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf")) .add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf"))
} }

@ -36,6 +36,7 @@ internal fun configureGradleManagedDevices(
commonExtension.testOptions.apply { commonExtension.testOptions.apply {
@Suppress("UnstableApiUsage")
managedDevices { managedDevices {
allDevices { allDevices {
allDevices.forEach { deviceConfig -> allDevices.forEach { deviceConfig ->

@ -28,12 +28,12 @@ fun configureFlavors(
flavorDimensions += flavorDimension.name flavorDimensions += flavorDimension.name
} }
productFlavors.apply { productFlavors.apply flavors@{
NiaFlavor.values().forEach { niaFlavor -> NiaFlavor.values().forEach { niaFlavor ->
register(niaFlavor.name) { register(niaFlavor.name) {
dimension = niaFlavor.dimension.name dimension = niaFlavor.dimension.name
flavorConfigurationBlock(this, niaFlavor) flavorConfigurationBlock(this, niaFlavor)
if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) { if (this@flavors is ApplicationExtension && this is ApplicationProductFlavor) {
if (niaFlavor.applicationIdSuffix != null) { if (niaFlavor.applicationIdSuffix != null) {
applicationIdSuffix = niaFlavor.applicationIdSuffix applicationIdSuffix = niaFlavor.applicationIdSuffix
} }

Loading…
Cancel
Save