Skip to content

Commit

Permalink
Bump Kotlin to 1.4.0 final (#128)
Browse files Browse the repository at this point in the history
  • Loading branch information
erikc5000 committed Aug 17, 2020
1 parent 0e51988 commit 0e577cb
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 43 deletions.
21 changes: 16 additions & 5 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
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")
}

kotlinDslPluginOptions {
experimentalWarning.set(false)
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = "1.8"
}
}
8 changes: 4 additions & 4 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 {
Expand Down
26 changes: 0 additions & 26 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,38 +30,12 @@ kotlin {
implementation(Libs.googleTruth)
}
}

val darwinMain by getting {
dependencies {
implementation(Libs.AtomicFU.runtime)
}
}
}
}

tasks.withType<DokkaTask>().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")
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/serialization/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ kotlin {
val commonMain by getting {
dependencies {
implementation(project(":core"))
implementation(Libs.Serialization.runtime)
implementation(Libs.Serialization.core)
}
}

Expand Down
7 changes: 0 additions & 7 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
pluginManagement {
repositories {
maven(url = "https://dl.bintray.com/kotlin/kotlin-eap")
gradlePluginPortal()
}
}

include(
":core",
":tools:code-generator",
Expand Down

0 comments on commit 0e577cb

Please sign in to comment.