From c6ac2b514e3d993ecba041aed2e96308d099981a Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 10 Sep 2022 05:29:37 +0800 Subject: [PATCH] Adopt new AGP dsl (#5288) --- .../io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt | 8 ++++---- .../gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt | 2 +- .../io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt index 9bc52b99ba5..ad705e88a94 100644 --- a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt +++ b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt @@ -596,13 +596,13 @@ private val KOTLIN_ONLY_LIB_PLUGIN_BLOCK = """ private val ANDROID_BLOCK = """ android { - compileSdkVersion(30) + compileSdk = 30 } """.trimIndent() private val ANDROID_BLOCK_WITH_FLAVOR = """ android { - compileSdkVersion(30) + compileSdk = 30 flavorDimensions("age", "name") productFlavors { create("harry") { @@ -620,10 +620,10 @@ private val ANDROID_BLOCK_WITH_FLAVOR = """ private val ANDROID_BLOCK_WITH_VIEW_BINDING = """ android { - compileSdkVersion(30) + compileSdk = 30 defaultConfig { applicationId = "io.gitlab.arturbosch.detekt.app" - minSdkVersion(24) + minSdk = 24 } buildFeatures { viewBinding = true diff --git a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt index 9f1289d15aa..cabd2dd3758 100644 --- a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt +++ b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt @@ -153,7 +153,7 @@ class DetektMultiplatformSpec { id("io.gitlab.arturbosch.detekt") } android { - compileSdkVersion(30) + compileSdk = 30 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") buildTypes { release { diff --git a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt index 00b1d586272..68e70ab4ae4 100644 --- a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt +++ b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt @@ -104,7 +104,7 @@ class ReportMergeSpec { id("io.gitlab.arturbosch.detekt") } android { - compileSdkVersion(30) + compileSdk = 30 } dependencies { implementation(project(":lib")) @@ -121,7 +121,7 @@ class ReportMergeSpec { kotlin("android") } android { - compileSdkVersion(30) + compileSdk = 30 } """.trimIndent(), srcDirs = listOf("src/main/java", "src/debug/java", "src/test/java", "src/androidTest/java")