From cb046d5398fafea812fdd247cb67e4b91a412acd Mon Sep 17 00:00:00 2001 From: tetraquark Date: Sun, 23 Aug 2020 21:46:15 +0700 Subject: [PATCH] migrate to kotlin 1.4.0 --- MyersDiffKt/build.gradle.kts | 39 ++++--------------- .../kmplibs/myersdiffkt/DiffUtilTest.kt | 3 -- README.md | 30 ++++++++++---- build.gradle.kts | 20 +++++++--- buildSrc/build.gradle.kts | 11 +----- buildSrc/src/main/kotlin/Versions.kt | 6 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- sample-android/build.gradle.kts | 2 +- settings.gradle.kts | 2 - 9 files changed, 49 insertions(+), 66 deletions(-) diff --git a/MyersDiffKt/build.gradle.kts b/MyersDiffKt/build.gradle.kts index 6ac7eb0..676a868 100644 --- a/MyersDiffKt/build.gradle.kts +++ b/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}") diff --git a/MyersDiffKt/src/jvmTest/kotlin/ru/tetraquark/kmplibs/myersdiffkt/DiffUtilTest.kt b/MyersDiffKt/src/jvmTest/kotlin/ru/tetraquark/kmplibs/myersdiffkt/DiffUtilTest.kt index 976c6ae..2a38600 100644 --- a/MyersDiffKt/src/jvmTest/kotlin/ru/tetraquark/kmplibs/myersdiffkt/DiffUtilTest.kt +++ b/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() @@ -73,7 +72,5 @@ class DiffUtilTest { } } } - } - } diff --git a/README.md b/README.md index 1d9208f..a8cfca4 100644 --- a/README.md +++ b/README.md @@ -12,18 +12,24 @@ 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" } @@ -31,10 +37,18 @@ allprojects { } ``` -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" } ``` diff --git a/build.gradle.kts b/build.gradle.kts index 00b02d4..9212f92 100644 --- a/build.gradle.kts +++ b/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() + } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index bc0b3d3..2988a91 100644 --- a/buildSrc/build.gradle.kts +++ b/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) -} diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 9bab06a..0267889 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6f818c1..209e1bb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/sample-android/build.gradle.kts b/sample-android/build.gradle.kts index 9eee976..057ad3c 100644 --- a/sample-android/build.gradle.kts +++ b/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}") diff --git a/settings.gradle.kts b/settings.gradle.kts index bd6ed6b..1134717 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,3 @@ -enableFeaturePreview("GRADLE_METADATA") - include(":MyersDiffKt") include(":sample-android")