From b581208d68002476e20fc0d7a44542a8fd01b285 Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patjackson52@gmail.com>
Date: Sat, 30 Nov 2019 07:31:00 -0500
Subject: [PATCH] update to kotlin 1.3.60 (#29)

* update to kotlin 1.3.61
* remove dependencies.gradle
---
 build.gradle                         | 10 +++-------
 buildSrc/src/main/kotlin/Plugins.kt  |  5 +++++
 buildSrc/src/main/kotlin/Versions.kt |  2 +-
 gradle/dependencies.gradle           | 14 --------------
 gradle/publish.gradle                |  2 +-
 lib/build.gradle                     | 19 +++++++++----------
 6 files changed, 19 insertions(+), 33 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/Plugins.kt
 delete mode 100644 gradle/dependencies.gradle

diff --git a/build.gradle b/build.gradle
index b3cae04..bbee1db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,4 @@
 buildscript {
-    apply from: "$rootDir/gradle/dependencies.gradle"
-
     repositories {
         google()
         maven { url 'https://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
@@ -10,9 +8,9 @@ buildscript {
     }
 
     dependencies {
-        classpath deps.plugins.kotlin
-        classpath deps.plugins.dokka
-        classpath deps.plugins.android
+        classpath Plugins.kotlin
+        classpath Plugins.dokka
+        classpath Plugins.android
     }
 }
 
@@ -20,8 +18,6 @@ plugins {
     id("de.fayard.buildSrcVersions") version "0.4.2"
 }
 
-apply from: "$rootDir/gradle/dependencies.gradle"
-
 allprojects {
     repositories {
         google()
diff --git a/buildSrc/src/main/kotlin/Plugins.kt b/buildSrc/src/main/kotlin/Plugins.kt
new file mode 100644
index 0000000..08b81d7
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Plugins.kt
@@ -0,0 +1,5 @@
+object Plugins {
+    const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.org_jetbrains_kotlin}"
+    const val dokka  = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokka_gradle_plugin}"
+    const val android = "com.android.tools.build:gradle:${Versions.com_android_tools_build_gradle}"
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 27ed765..bdce89d 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -34,7 +34,7 @@ object Versions {
 
   const val dokka_gradle_plugin: String = "0.9.17" // available: "0.9.18"
 
-  const val org_jetbrains_kotlin: String = "1.3.50"
+  const val org_jetbrains_kotlin: String = "1.3.61"
 
   const val spek: String = "2.1.0-alpha.0.11+d97ef33"
        // available: "2.1.0-alpha.0.24+0fdeb6e"
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
deleted file mode 100644
index 6295a26..0000000
--- a/gradle/dependencies.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-ext.versions = [
-        kotlin          : '1.3.50',
-        dokka           : '0.9.17',
-        spek            : '2.1.0-alpha.0.11+d97ef33',
-        atrium          : '0.8.0'
-]
-
-ext.deps = [
-        plugins: [
-                kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
-                dokka  : "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}",
-                android: "com.android.tools.build:gradle:3.5.0"
-        ]
-]
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index b35e8cf..2d2dca7 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -75,7 +75,7 @@ task javadocsJar(type: Jar, dependsOn: dokka) {
 }
 
 signing {
-    required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+    required { isReleaseBuild() /*&& gradle.taskGraph.hasTask("uploadArchives") */ }
     sign(publishing.publications)
 }
 
diff --git a/lib/build.gradle b/lib/build.gradle
index 1a7107b..175c6a8 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-multiplatform'
 archivesBaseName = 'redux-kotlin'
 
 group 'org.reduxkotlin'
-version '0.2.7'
+version '0.2.9'
 
 kotlin {
     jvm()
@@ -21,7 +21,6 @@ kotlin {
         }
     }
 
-
     iosArm64("ios")
     iosX64("iosSim")
     macosX64("macos")
@@ -44,9 +43,9 @@ kotlin {
             dependencies {
                 implementation kotlin("test-common")
                 implementation kotlin("test-annotations-common")
-                implementation "org.spekframework.spek2:spek-dsl-metadata:$project.versions.spek"
-                implementation "ch.tutteli.atrium:atrium-cc-en_GB-robstoll-common:$project.versions.atrium"
-                implementation "io.mockk:mockk-common:1.9.3"
+                implementation Libs.spek_dsl_metadata
+                implementation Libs.atrium_cc_en_gb_robstoll_common
+                implementation Libs.mockk_common
             }
         }
 
@@ -60,12 +59,12 @@ kotlin {
             dependencies {
                 implementation kotlin("test")
                 implementation kotlin("test-junit")
-                implementation "org.spekframework.spek2:spek-dsl-jvm:$project.versions.spek"
-                implementation "ch.tutteli.atrium:atrium-cc-en_GB-robstoll:$project.versions.atrium"
-                implementation "io.mockk:mockk:1.9.3"
+                implementation Libs.spek_dsl_jvm
+                implementation Libs.atrium_cc_en_gb_robstoll
+                implementation Libs.mockk
 
-                runtimeOnly "org.spekframework.spek2:spek-runner-junit5:$project.versions.spek"
-                runtimeOnly 'org.jetbrains.kotlin:kotlin-reflect'
+                runtimeOnly Libs.spek_runner_junit5
+                runtimeOnly Libs.kotlin_reflect
             }
         }
         jsMain {