From c43f4b302a957bf9318348216f32fd9aa446e73b Mon Sep 17 00:00:00 2001 From: Erik Christensen <40830816+erikc5000@users.noreply.github.com> Date: Thu, 10 Sep 2020 13:43:04 -0400 Subject: [PATCH] Bump Kotlin to 1.4.10 (#137) --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- docs/getting-started.md | 2 +- extensions/parcelize/build.gradle.kts | 10 ---------- extensions/serialization/build.gradle.kts | 2 -- tools/code-generator/build.gradle.kts | 2 +- tools/mkdocs-dokka-plugin/build.gradle.kts | 2 +- 7 files changed, 5 insertions(+), 17 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index fe100df8d..6a6b8023c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.4.0" + kotlin("jvm") version "1.4.10" `kotlin-dsl` } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 498b082e0..108b1cef0 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,5 +1,5 @@ object Versions { - const val kotlin = "1.4.0" + const val kotlin = "1.4.10" const val serialization = "1.0.0-RC" const val atomicfu = "0.14.4" const val androidxTest = "1.2.0" diff --git a/docs/getting-started.md b/docs/getting-started.md index ca176413a..9b9579b2f 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -22,7 +22,7 @@ Due to the experimental status of [inline classes](https://kotlinlang.org/docs/r | --- | --- | | 0.1.x | 1.3.6x | | 0.2.x | 1.3.7x | -| 0.3.x | 1.4.0x | +| 0.3.x | 1.4.0/1.4.10 | ### JVM diff --git a/extensions/parcelize/build.gradle.kts b/extensions/parcelize/build.gradle.kts index 3bb440ce8..2f84442d2 100644 --- a/extensions/parcelize/build.gradle.kts +++ b/extensions/parcelize/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.dokka.gradle.DokkaTask - plugins { `android-library` id("kotlin-android-extensions") @@ -34,11 +32,3 @@ dependencies { androidTestImplementation(Libs.googleTruth) androidTestUtil(Libs.AndroidxTest.orchestrator) } - -tasks.withType().configureEach { - dokkaSourceSets { - configureEach { - includes.from(file("MODULE.md")) - } - } -} diff --git a/extensions/serialization/build.gradle.kts b/extensions/serialization/build.gradle.kts index 33d58220d..c41cf26bd 100644 --- a/extensions/serialization/build.gradle.kts +++ b/extensions/serialization/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.dokka.gradle.DokkaTask - plugins { `multiplatform-library` kotlin("plugin.serialization") version Versions.kotlin diff --git a/tools/code-generator/build.gradle.kts b/tools/code-generator/build.gradle.kts index 16645e773..7e1bfbe45 100644 --- a/tools/code-generator/build.gradle.kts +++ b/tools/code-generator/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.4.0" + kotlin("jvm") version "1.4.10" application } diff --git a/tools/mkdocs-dokka-plugin/build.gradle.kts b/tools/mkdocs-dokka-plugin/build.gradle.kts index dd3f0a293..bc469d6cc 100644 --- a/tools/mkdocs-dokka-plugin/build.gradle.kts +++ b/tools/mkdocs-dokka-plugin/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.4.0" + kotlin("jvm") version "1.4.10" } repositories {