Skip to content

Commit b581208

Browse files
authored
update to kotlin 1.3.60 (#29)
* update to kotlin 1.3.61 * remove dependencies.gradle
1 parent 3548063 commit b581208

File tree

6 files changed

+19
-33
lines changed

6 files changed

+19
-33
lines changed

build.gradle

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
buildscript {
2-
apply from: "$rootDir/gradle/dependencies.gradle"
3-
42
repositories {
53
google()
64
maven { url 'https://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
@@ -10,18 +8,16 @@ buildscript {
108
}
119

1210
dependencies {
13-
classpath deps.plugins.kotlin
14-
classpath deps.plugins.dokka
15-
classpath deps.plugins.android
11+
classpath Plugins.kotlin
12+
classpath Plugins.dokka
13+
classpath Plugins.android
1614
}
1715
}
1816

1917
plugins {
2018
id("de.fayard.buildSrcVersions") version "0.4.2"
2119
}
2220

23-
apply from: "$rootDir/gradle/dependencies.gradle"
24-
2521
allprojects {
2622
repositories {
2723
google()

buildSrc/src/main/kotlin/Plugins.kt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
object Plugins {
2+
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.org_jetbrains_kotlin}"
3+
const val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokka_gradle_plugin}"
4+
const val android = "com.android.tools.build:gradle:${Versions.com_android_tools_build_gradle}"
5+
}

buildSrc/src/main/kotlin/Versions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ object Versions {
3434

3535
const val dokka_gradle_plugin: String = "0.9.17" // available: "0.9.18"
3636

37-
const val org_jetbrains_kotlin: String = "1.3.50"
37+
const val org_jetbrains_kotlin: String = "1.3.61"
3838

3939
const val spek: String = "2.1.0-alpha.0.11+d97ef33"
4040
// available: "2.1.0-alpha.0.24+0fdeb6e"

gradle/dependencies.gradle

-14
This file was deleted.

gradle/publish.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ task javadocsJar(type: Jar, dependsOn: dokka) {
7575
}
7676

7777
signing {
78-
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
78+
required { isReleaseBuild() /*&& gradle.taskGraph.hasTask("uploadArchives") */ }
7979
sign(publishing.publications)
8080
}
8181

lib/build.gradle

+9-10
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-multiplatform'
77
archivesBaseName = 'redux-kotlin'
88

99
group 'org.reduxkotlin'
10-
version '0.2.7'
10+
version '0.2.9'
1111

1212
kotlin {
1313
jvm()
@@ -21,7 +21,6 @@ kotlin {
2121
}
2222
}
2323

24-
2524
iosArm64("ios")
2625
iosX64("iosSim")
2726
macosX64("macos")
@@ -44,9 +43,9 @@ kotlin {
4443
dependencies {
4544
implementation kotlin("test-common")
4645
implementation kotlin("test-annotations-common")
47-
implementation "org.spekframework.spek2:spek-dsl-metadata:$project.versions.spek"
48-
implementation "ch.tutteli.atrium:atrium-cc-en_GB-robstoll-common:$project.versions.atrium"
49-
implementation "io.mockk:mockk-common:1.9.3"
46+
implementation Libs.spek_dsl_metadata
47+
implementation Libs.atrium_cc_en_gb_robstoll_common
48+
implementation Libs.mockk_common
5049
}
5150
}
5251

@@ -60,12 +59,12 @@ kotlin {
6059
dependencies {
6160
implementation kotlin("test")
6261
implementation kotlin("test-junit")
63-
implementation "org.spekframework.spek2:spek-dsl-jvm:$project.versions.spek"
64-
implementation "ch.tutteli.atrium:atrium-cc-en_GB-robstoll:$project.versions.atrium"
65-
implementation "io.mockk:mockk:1.9.3"
62+
implementation Libs.spek_dsl_jvm
63+
implementation Libs.atrium_cc_en_gb_robstoll
64+
implementation Libs.mockk
6665

67-
runtimeOnly "org.spekframework.spek2:spek-runner-junit5:$project.versions.spek"
68-
runtimeOnly 'org.jetbrains.kotlin:kotlin-reflect'
66+
runtimeOnly Libs.spek_runner_junit5
67+
runtimeOnly Libs.kotlin_reflect
6968
}
7069
}
7170
jsMain {

0 commit comments

Comments
 (0)