diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 73479bc6e..6a92b081b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,14 +1,19 @@ -repositories { - jcenter() - google() -} +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { + kotlin("jvm") version "1.4.0" `kotlin-dsl` } +repositories { + jcenter() + google() +} + dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0-rc") + implementation(kotlin("gradle-plugin")) + implementation(kotlin("stdlib-jdk8")) + implementation(kotlin("reflect")) implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.10.1") implementation("com.android.tools.build:gradle:4.0.1") } @@ -16,3 +21,9 @@ dependencies { kotlinDslPluginOptions { experimentalWarning.set(false) } + +tasks.withType().configureEach { + kotlinOptions { + jvmTarget = "1.8" + } +} diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index cac7b84b3..0d69da622 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,7 +1,7 @@ object Versions { - const val kotlin = "1.4.0-rc" - const val serialization = "1.0-M1-1.4.0-rc" - const val atomicfu = "0.14.3-1.4.0-rc" + const val kotlin = "1.4.0" + const val serialization = "1.0.0-RC" + const val atomicfu = "0.14.4" const val androidxTest = "1.2.0" const val googleTruth = "1.0.1" const val kotlinpoet = "1.6.0" @@ -10,7 +10,7 @@ object Versions { object Libs { object Serialization { - const val runtime = "org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Versions.serialization}" + const val core = "org.jetbrains.kotlinx:kotlinx-serialization-core:${Versions.serialization}" } object AtomicFU { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 075cde9d6..4b0407a89 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -30,38 +30,12 @@ kotlin { implementation(Libs.googleTruth) } } - - val darwinMain by getting { - dependencies { - implementation(Libs.AtomicFU.runtime) - } - } } } tasks.withType().configureEach { multiplatform { create("global") { - perPackageOption { - prefix = "io.islandtime.internal" - suppress = true - } - - perPackageOption { - prefix = "io.islandtime.measures.internal" - suppress = true - } - - perPackageOption { - prefix = "io.islandtime.parser.internal" - suppress = true - } - - perPackageOption { - prefix = "io.islandtime.ranges.internal" - suppress = true - } - perPackageOption { includes = listOf("packages.md") } diff --git a/extensions/serialization/build.gradle.kts b/extensions/serialization/build.gradle.kts index a11b97829..c41cf26bd 100644 --- a/extensions/serialization/build.gradle.kts +++ b/extensions/serialization/build.gradle.kts @@ -8,7 +8,7 @@ kotlin { val commonMain by getting { dependencies { implementation(project(":core")) - implementation(Libs.Serialization.runtime) + implementation(Libs.Serialization.core) } } diff --git a/settings.gradle.kts b/settings.gradle.kts index ec7ea0281..3b288b38f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,10 +1,3 @@ -pluginManagement { - repositories { - maven(url = "https://dl.bintray.com/kotlin/kotlin-eap") - gradlePluginPortal() - } -} - include( ":core", ":tools:code-generator",