migrate to kotlin 1.4.0

MyersDiffKt/build.gradle.kts

@@ -29,14 +29,12 @@ android {
 }
 
 kotlin {
-
     android {
         publishLibraryVariants("release", "debug")
     }
     jvm()
     macosX64()
-    iosArm64()
-    iosX64()
+    ios()
 
     sourceSets {
         // for unit-tests purposes
@@ -46,40 +44,17 @@ kotlin {
 
         commonMain {
             dependencies {
-                implementation(kotlin("stdlib-common"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${Versions.coroutines}")
-            }
-        }
-        val androidMain by getting {
-            dependencies {
-                implementation(kotlin("stdlib"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}")
-            }
-        }
-        val jvmMain by getting {
-            dependencies {
-                implementation(kotlin("stdlib"))
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}")
             }
         }
-        val macosX64Main by getting {
-            dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:${Versions.coroutines}")
-            }
-        }
-        val iosArm64Main by getting {
-            dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:${Versions.coroutines}")
-            }
-        }
-        val iosX64Main by getting {
-            dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:${Versions.coroutines}")
-            }
-        }
+        val androidMain by getting
+        val jvmMain by getting
+        val macosX64Main by getting
+        val iosArm64Main by getting
+        val iosX64Main by getting
+
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("stdlib"))
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}")

MyersDiffKt/src/jvmTest/kotlin/ru/tetraquark/kmplibs/myersdiffkt/DiffUtilTest.kt

@@ -9,7 +9,6 @@ import org.junit.Before
 import org.junit.Test
 import kotlin.test.assertTrue
 
-@UseExperimental(kotlinx.coroutines.ExperimentalCoroutinesApi::class)
 class DiffUtilTest {
 
     private var oldList = mutableListOf<String>()
@@ -73,7 +72,5 @@ class DiffUtilTest {
                 }
             }
         }
-
     }
-
 }

README.md

@@ -12,29 +12,43 @@ The main part of the algorithm implementation is rewritten to Kotlin from the An
 
 Library version | Kotlin version
 ------------ | -------------
-1.0.0 | 1.3.61
+1.2.0 | 1.4.0
 1.1.0 | 1.3.72
+1.0.0 | 1.3.61
 
 ## Setup
 
-1. In **settings.gradle**:
-```
-enableFeaturePreview("GRADLE_METADATA")
-```
+In root **build.gradle.kts** add the maven repository url:
 
-2. In root **build.gradle** add the maven repository url:
+```kotlin
+allprojects {
+    repositories {
+        maven { url = uri("https://dl.bintray.com/tetraquark/kmplibs") }
+    }
+}
 ```
+
+or in root **build.gradle**
+```groovy
 allprojects {
     repositories {
         maven { url "https://dl.bintray.com/tetraquark/kmplibs" }
     }
 }
 ```
 
-3. In a project **build.gradle**:
+Then in a project **build.gradle.kts**:
+```kotlin
+dependencies {
+    implementation("ru.tetraquark.kmplibs:MyersDiffKt:1.2.0")
+}
 ```
+
+or in a project **build.gradle**:
+
+```groovy
 dependencies {
-    implementation "ru.tetraquark.kmplibs:MyersDiffKt:1.0.0"
+    implementation "ru.tetraquark.kmplibs:MyersDiffKt:1.2.0"
 }
 ```
 

build.gradle.kts

@@ -1,11 +1,19 @@
-allprojects {
+buildscript {
     repositories {
-        google()
         jcenter()
-
-        maven { url = uri("https://kotlin.bintray.com/kotlin") }
-        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
+        classpath("com.android.tools.build:gradle:3.5.4")
     }
+}
 
-    configurations.create("compileClasspath")
+allprojects {
+    repositories {
+        jcenter()
+        google()
+        mavenCentral()
+    }
 }

buildSrc/build.gradle.kts

@@ -1,17 +1,8 @@
 plugins {
-    `kotlin-dsl`
+    id("org.jetbrains.kotlin.jvm") version("1.4.0")
 }
 
 repositories {
     jcenter()
     google()
 }
-
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
-    implementation("com.android.tools.build:gradle:3.5.2")
-}
-
-kotlinDslPluginOptions {
-    experimentalWarning.set(false)
-}

buildSrc/src/main/kotlin/Versions.kt

@@ -1,7 +1,7 @@
 object Versions {
-    const val kotlin = "1.3.72"
-    const val MyersDiffKt = "1.1.0"
-    const val coroutines = "1.3.3"
+    const val kotlin = "1.4.0"
+    const val MyersDiffKt = "1.2.0"
+    const val coroutines = "1.3.9"
 
     const val buildToolsVersion = "29.0.2"
     const val minSdkVersion = 21

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip

sample-android/build.gradle.kts

@@ -29,7 +29,7 @@ android {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.kotlin}")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}")
     implementation("androidx.appcompat:appcompat:${Versions.appcompat}")
     implementation("androidx.recyclerview:recyclerview:${Versions.recyclerview}")

settings.gradle.kts

@@ -1,5 +1,3 @@
-enableFeaturePreview("GRADLE_METADATA")
-
 include(":MyersDiffKt")
 include(":sample-android")