Merge pull request #364 from icerockdev/#355-spotless-conflict

#355 spotless conflict
icerockdev · Jul 10, 2022 · d734ca4 · d734ca4
2 parents 8ecb5c4 + ce1a188
commit d734ca4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -88,7 +88,7 @@ kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", ver
 # This version is used to fix compatibility issues between
 # Kotlin Gradle Plugin 1.6.10 -> 1.6.20
 # we can't update all project to 1.6.20 now because Jetpack Compose not updated yet
-kotlinGradlePluginNext = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version = "1.7.0-RC" }
+kotlinGradlePluginNext = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version = "1.7.0" }
 androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradleVersion" }
 kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlinVersion" }
 detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektVersion" }

diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/apple/AppleMRGenerator.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/apple/AppleMRGenerator.kt
@@ -21,9 +21,9 @@ import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.plugins.ExtensionAware
-import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.findByType
 import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.maybeCreate
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.cocoapods.CocoapodsExtension
@@ -247,16 +247,15 @@ $linkTask produces static framework, Xcode should have Build Phase with copyFram
 
     private fun createCopyResourcesToAppTask(project: Project) {
         project.tasks.withType<KotlinNativeLink>()
-            .matching { linkTask -> linkTask.binary is AbstractExecutable }
+            .matching { it.binary is AbstractExecutable }
             .all { linkTask ->
                 val copyTaskName = linkTask.name.replace("link", "copyResources")
 
-                if (linkTask.project.tasks.any { it.name == copyTaskName }) return@all
-
                 project.tasks
-                    .create(copyTaskName, CopyExecutableResourcesToApp::class) {
-                        it.linkTask = linkTask
-                        it.dependsOn(linkTask)
+                    .maybeCreate(copyTaskName, CopyExecutableResourcesToApp::class)
+                    .apply {
+                        this.linkTask = linkTask
+                        this.dependsOn(linkTask)
                     }
             }
     }

diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts
@@ -19,6 +19,10 @@ android {
             isIncludeAndroidResources = true
         }
     }
+
+    lint {
+        disable.add("ImpliedQuantity")
+    }
 }
 
 kotlin {