Merge pull request #285 from icerockdev/#284-update-kotlin-1.4.10

#284 Kotlin 1.4

Author: Alex009

build.gradle.kts

@@ -11,11 +11,10 @@ buildscript {
         maven { url = uri("https://kotlin.bintray.com/kotlinx") }
         maven { url = uri("https://plugins.gradle.org/m2/") }
         maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
-
-        maven { url = uri("https://dl.bintray.com/icerockdev/plugins-dev") }
     }
     dependencies {
-        Deps.plugins.values.forEach { classpath(it) }
+        plugin(Deps.Plugins.mokoResources)
+        plugin(Deps.Plugins.mokoWidgets)
     }
 }
 
@@ -34,20 +33,6 @@ allprojects {
         maven { url = uri("https://dl.bintray.com/icerockdev/plugins-dev") }
     }
 
-    // Workaround for https://youtrack.jetbrains.com/issue/KT-36721.
-    pluginManager.withPlugin("kotlin-multiplatform") {
-        val kotlinExtension = project.extensions.getByName("kotlin")
-                as org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-        val uniqueName = "${project.group}.${project.name}"
-
-        kotlinExtension.targets.withType(org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget::class.java) {
-            compilations["main"].kotlinOptions.freeCompilerArgs += listOf(
-                "-module-name",
-                uniqueName
-            )
-        }
-    }
-
     configurations
         .matching { it.name == "compileOnly" }
         .configureEach {
@@ -56,6 +41,25 @@ allprojects {
                 "compileOnly"("javax.annotation:jsr250-api:1.0")
             }
         }
+    
+    configurations.all {
+        resolutionStrategy.dependencySubstitution {
+            substitute(module("com.nbsp:library"))
+                .using(module("com.nbsp:materialfilepicker:1.9.1"))
+                .because("androidx support in new artifact")
+        }
+    }
+
+    plugins.withType<com.android.build.gradle.LibraryPlugin> {
+        configure<com.android.build.gradle.LibraryExtension> {
+            compileSdkVersion(Deps.Android.compileSdk)
+
+            defaultConfig {
+                minSdkVersion(Deps.Android.minSdk)
+                targetSdkVersion(Deps.Android.targetSdk)
+            }
+        }
+    }
 
     val project = this
     val bintrayPath: Pair<String, String>?
@@ -64,18 +68,7 @@ allprojects {
             bintrayPath = "moko" to "moko-widgets"
 
             this.group = "dev.icerock.moko"
-            this.version = Versions.Libs.MultiPlatform.mokoWidgets
-
-            this.plugins.withType<com.android.build.gradle.LibraryPlugin> {
-                this@allprojects.configure<com.android.build.gradle.LibraryExtension> {
-                    compileSdkVersion(Versions.Android.compileSdk)
-
-                    defaultConfig {
-                        minSdkVersion(Versions.Android.minSdk)
-                        targetSdkVersion(Versions.Android.targetSdk)
-                    }
-                }
-            }
+            this.version = Deps.mokoWidgetsVersion
         }
         else -> {
             bintrayPath = null

buildSrc/build.gradle.kts

@@ -1,11 +1,11 @@
 /*
  * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
+
 import java.io.ByteArrayOutputStream
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.3.72"
+    id("org.jetbrains.kotlin.jvm") version "1.4.30-M1"
     id("com.github.kukuhyoniatmoko.buildconfigkotlin") version "1.0.5"
 }
 
@@ -16,10 +16,22 @@ repositories {
     maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
 }
 
-val devPublishing: Boolean = properties.containsKey("devPublish")
-val mokoWidgetsVersion: String = when (devPublishing) {
+dependencies {
+    api(gradleApi())
+    api("dev.icerock:mobile-multiplatform:0.9.0")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30-M1")
+    api("com.android.tools.build:gradle:4.1.1")
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).all {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+val mokoWidgetsVersion: String = when (properties.containsKey("devPublish")) {
     true -> getGitCommit()
-    false -> "0.1.0-dev-20"
+    false -> "0.1.0-dev-21"
 }
 
 buildConfigKotlin {
@@ -28,12 +40,6 @@ buildConfigKotlin {
     }
 }
 
-dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.6.1")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
-    implementation("com.android.tools.build:gradle:3.6.4")
-}
-
 fun getGitCommit(): String {
     val stdout = ByteArrayOutputStream()
     exec {
@@ -42,12 +48,3 @@ fun getGitCommit(): String {
     }
     return stdout.toString().trim()
 }
-
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions {
-    jvmTarget = "1.8"
-}
-val compileTestKotlin: KotlinCompile by tasks
-compileTestKotlin.kotlinOptions {
-    jvmTarget = "1.8"
-}