fix review

Alex009 · Alex009 · commit 2e4a0e3c0e56 · 2020-05-05T19:52:18.000+07:00
diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml
@@ -3,22 +3,22 @@ name: KMP library compilation check
 on:
   pull_request:
     branches:
-    - master
-    - develop
+      - master
+      - develop
 
 jobs:
   build:
     runs-on: macOS-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Check plugin build
-      run: ./gradlew -PlibraryPublish :gradle-plugin:detekt :gradle-plugin:publishPluginPublicationToMavenLocal
-    - name: Check library build
-      run: ./gradlew -PlibraryPublish :resources:publishToMavenLocal
-    - name: Check demo library
-      run: ./gradlew :sample:mpp-conditional:build :sample:mpp-hierarhical:build :sample:mpp-library:build :sample:mpp-mixed:build
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Check plugin build
+        run: ./gradlew -PlibraryPublish detekt :gradle-plugin:publishPluginPublicationToMavenLocal
+      - name: Check library build
+        run: ./gradlew -PlibraryPublish detekt :resources:publishToMavenLocal
+      - name: Check demo library
+        run: ./gradlew detekt :sample:mpp-conditional:build :sample:mpp-hierarhical:build :sample:mpp-library:build :sample:mpp-mixed:build
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,10 @@
  * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
+plugins {
+    plugin(Deps.Plugins.detekt) apply false
+}
+
 buildscript {
     repositories {
         mavenLocal()
@@ -24,7 +28,7 @@ buildscript {
                 kotlinMultiplatform,
                 kotlinKapt,
                 kotlinAndroid,
-                if(!libraryPublish) mokoResources else null
+                if (!libraryPublish) mokoResources else null
             )
         }.let { plugins(it) }
     }
@@ -41,6 +45,17 @@ allprojects {
         maven { url = uri("https://kotlin.bintray.com/kotlinx") }
         maven { url = uri("https://dl.bintray.com/icerockdev/moko") }
     }
+
+    apply(plugin = Deps.Plugins.detekt.id)
+
+    configure<io.gitlab.arturbosch.detekt.extensions.DetektExtension> {
+        toolVersion = Versions.detekt
+        input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin")
+    }
+
+    dependencies {
+        "detektPlugins"(Deps.Libs.Jvm.detektFormatting)
+    }
 }
 
 tasks.register("clean", Delete::class).configure {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.gradle.kotlin.kotlin-dsl") version "1.3.6"
+    `kotlin-dsl`
 }
 
 repositories {
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -4,45 +4,28 @@
 
 object Deps {
     object Plugins {
-        private const val androidPluginModule =
-            "com.android.tools.build:gradle:${Versions.Plugins.android}"
-        val androidApplication = PluginDesc(
-            id = "com.android.application",
-            module = androidPluginModule
-        )
+        val androidApplication = PluginDesc(id = "com.android.application")
         val androidLibrary = PluginDesc(
             id = "com.android.library",
-            module = androidPluginModule
+            module = "com.android.tools.build:gradle:${Versions.Plugins.android}"
         )
 
-        private const val kotlinPluginModule =
-            "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.Plugins.kotlin}"
         val kotlinMultiplatform = PluginDesc(
             id = "org.jetbrains.kotlin.multiplatform",
-            module = kotlinPluginModule
-        )
-        val kotlinKapt = PluginDesc(
-            id = "kotlin-kapt",
-            module = kotlinPluginModule
-        )
-        val kotlinAndroid = PluginDesc(
-            id = "kotlin-android",
-            module = kotlinPluginModule
-        )
-        val kotlinAndroidExtensions = PluginDesc(
-            id = "kotlin-android-extensions",
-            module = kotlinPluginModule
+            module = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.Plugins.kotlin}"
         )
+        val kotlinKapt = PluginDesc(id = "kotlin-kapt")
+        val kotlinAndroid = PluginDesc(id = "kotlin-android")
+        val kotlinAndroidExtensions = PluginDesc(id = "kotlin-android-extensions")
 
-        val mobileMultiplatform = PluginDesc(
-            id = "dev.icerock.mobile.multiplatform",
-            module = "dev.icerock:mobile-multiplatform:0.6.1"
-        )
+        val mobileMultiplatform = PluginDesc(id = "dev.icerock.mobile.multiplatform")
 
         val mokoResources = PluginDesc(
             id = "dev.icerock.mobile.multiplatform-resources",
             module = "dev.icerock.moko:resources-generator:${Versions.Plugins.mokoResources}"
         )
+
+        val detekt = PluginDesc(id = "io.gitlab.arturbosch.detekt", version = Versions.detekt)
     }
 
     object Libs {
@@ -90,7 +73,7 @@ object Deps {
         object Jvm {
             const val kotlinPoet = "com.squareup:kotlinpoet:${Versions.Libs.Jvm.kotlinPoet}"
             const val apacheCommonsText = "org.apache.commons:commons-text:${Versions.Libs.Jvm.apacheCommonsText}"
-            const val detektFormatting = "io.gitlab.arturbosch.detekt:detekt-formatting:${Versions.Plugins.detekt}"
+            const val detektFormatting = "io.gitlab.arturbosch.detekt:detekt-formatting:${Versions.detekt}"
         }
     }
 }
diff --git a/buildSrc/src/main/kotlin/PluginDesc.kt b/buildSrc/src/main/kotlin/PluginDesc.kt
@@ -2,16 +2,20 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
+import org.gradle.api.artifacts.Dependency
 import org.gradle.kotlin.dsl.DependencyHandlerScope
 import org.gradle.plugin.use.PluginDependenciesSpec
+import org.gradle.plugin.use.PluginDependencySpec
 
+// TODO move to https://github.com/icerockdev/mobile-multiplatform-gradle-plugin
 data class PluginDesc(
     val id: String,
-    val module: String
+    val module: String? = null,
+    val version: String? = null
 )
 
-fun DependencyHandlerScope.plugin(pluginDesc: PluginDesc) {
-    "classpath"(pluginDesc.module)
+fun DependencyHandlerScope.plugin(pluginDesc: PluginDesc): Dependency? {
+    return pluginDesc.module?.let { "classpath"(it) }
 }
 
 fun DependencyHandlerScope.plugins(pluginDescList: List<PluginDesc>) {
@@ -20,6 +24,8 @@ fun DependencyHandlerScope.plugins(pluginDescList: List<PluginDesc>) {
         .forEach { plugin(it) }
 }
 
-fun PluginDependenciesSpec.plugin(pluginDesc: PluginDesc) {
-    id(pluginDesc.id)
+fun PluginDependenciesSpec.plugin(pluginDesc: PluginDesc): PluginDependencySpec {
+    val spec = id(pluginDesc.id)
+    pluginDesc.version?.also { spec.version(it) }
+    return spec
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -10,6 +10,7 @@ object Versions {
     }
 
     const val kotlin = "1.3.72"
+    const val detekt = "1.7.4"
 
     private const val mokoResources = "0.10.0"
 
@@ -18,7 +19,6 @@ object Versions {
 
         const val kotlin = Versions.kotlin
         const val mokoResources = Versions.mokoResources
-        const val detekt = "1.7.4"
     }
 
     object Libs {
diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
@@ -5,7 +5,6 @@
 plugins {
     `kotlin-dsl`
     id("org.gradle.maven-publish")
-    id("io.gitlab.arturbosch.detekt") version(Versions.Plugins.detekt)
 }
 
 repositories {
@@ -17,8 +16,8 @@ repositories {
 
 dependencies {
     implementation(Deps.Libs.Jvm.kotlinPoet)
-    compileOnly(Deps.Plugins.kotlinMultiplatform.module)
-    compileOnly(Deps.Plugins.androidLibrary.module)
+    compileOnly(Deps.Plugins.kotlinMultiplatform.module!!)
+    compileOnly(Deps.Plugins.androidLibrary.module!!)
     implementation(Deps.Libs.Jvm.apacheCommonsText)
     detektPlugins(Deps.Libs.Jvm.detektFormatting)
 }
diff --git a/resources/src/commonMain/kotlin/dev/icerock/moko/resources/FontResource.kt b/resources/src/commonMain/kotlin/dev/icerock/moko/resources/FontResource.kt
@@ -4,4 +4,4 @@
 
 package dev.icerock.moko.resources
 
-expect class FontResource
+expect class FontResource
diff --git a/resources/src/commonMain/kotlin/dev/icerock/moko/resources/ImageResource.kt b/resources/src/commonMain/kotlin/dev/icerock/moko/resources/ImageResource.kt
@@ -4,4 +4,4 @@
 
 package dev.icerock.moko.resources
 
-expect class ImageResource
+expect class ImageResource
diff --git a/resources/src/commonMain/kotlin/dev/icerock/moko/resources/PluralsResource.kt b/resources/src/commonMain/kotlin/dev/icerock/moko/resources/PluralsResource.kt
@@ -4,4 +4,4 @@
 
 package dev.icerock.moko.resources
 
-expect class PluralsResource
+expect class PluralsResource
diff --git a/resources/src/iosMain/kotlin/dev/icerock/moko/resources/FontResource.kt b/resources/src/iosMain/kotlin/dev/icerock/moko/resources/FontResource.kt
@@ -17,7 +17,6 @@ import platform.Foundation.NSData
 import platform.Foundation.create
 import platform.UIKit.UIFont
 import platform.darwin.UInt8Var
-import platform.objc.object_getClass
 
 actual class FontResource(
     fontName: String,
diff --git a/resources/src/iosMain/kotlin/dev/icerock/moko/resources/desc/Utils.kt b/resources/src/iosMain/kotlin/dev/icerock/moko/resources/desc/Utils.kt
@@ -26,6 +26,7 @@ object Utils {
         val objcFormat = format.replace(Regex("%((?:\\.|\\d|\\$)*)[abcdefs]"), "%$1@")
         // bad but objc interop limited :(
         // When calling variadic C functions spread operator is supported only for *arrayOf(...)
+        @Suppress("MagicNumber")
         return when (args.size) {
             0 -> NSString.stringWithFormat(objcFormat)
             1 -> NSString.stringWithFormat(objcFormat, args[0])
diff --git a/sample/mpp-conditional/src/commonMain/kotlin/com/icerockdev/library/Testing.kt b/sample/mpp-conditional/src/commonMain/kotlin/com/icerockdev/library/Testing.kt
@@ -4,6 +4,6 @@
 
 package com.icerockdev.library
 
+@Suppress("EmptyFunctionBlock")
 fun test() {
-
 }
diff --git a/sample/mpp-hierarhical/src/commonMain/kotlin/com/icerockdev/library/Testing.kt b/sample/mpp-hierarhical/src/commonMain/kotlin/com/icerockdev/library/Testing.kt
@@ -4,6 +4,6 @@
 
 package com.icerockdev.library
 
+@Suppress("EmptyFunctionBlock")
 fun test() {
-
 }
diff --git a/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/Testing.kt b/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/Testing.kt
@@ -18,6 +18,7 @@ import dev.icerock.moko.resources.desc.StringDesc
 import dev.icerock.moko.resources.desc.desc
 import dev.icerock.moko.resources.desc.plus
 
+@Suppress("MagicNumber")
 object Testing {
     fun getStrings(): List<StringDesc> {
         return listOf(
diff --git a/sample/mpp-mixed/src/commonMain/kotlin/com/icerockdev/library/Testing.kt b/sample/mpp-mixed/src/commonMain/kotlin/com/icerockdev/library/Testing.kt
@@ -4,6 +4,6 @@
 
 package com.icerockdev.library
 
+@Suppress("EmptyFunctionBlock")
 fun test() {
-
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("org.gradle.kotlin.kotlin-dsl") version "1.3.6"`
	`2`	+ `kotlin-dsl`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ object Versions {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`const val kotlin = "1.3.72"`
	`13`	`+ const val detekt = "1.7.4"`
`13`	`14`
`14`	`15`	`private const val mokoResources = "0.10.0"`
`15`	`16`
`@@ -18,7 +19,6 @@ object Versions {`
`18`	`19`
`19`	`20`	`const val kotlin = Versions.kotlin`
`20`	`21`	`const val mokoResources = Versions.mokoResources`
`21`		`- const val detekt = "1.7.4"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`object Libs {`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`package dev.icerock.moko.resources`
`6`	`6`
`7`		`-expect class FontResource`
	`7`	`+expect class FontResource`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`package dev.icerock.moko.resources`
`6`	`6`
`7`		`-expect class ImageResource`
	`7`	`+expect class ImageResource`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`package dev.icerock.moko.resources`
`6`	`6`
`7`		`-expect class PluralsResource`
	`7`	`+expect class PluralsResource`