From a21e5e04e359892eb3a293c8a8b01cd1603c7bd7 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Thu, 5 Mar 2020 21:48:35 -0500 Subject: [PATCH 1/2] upgrate to kotlin 1.3.70 & gradle 6.2.2 --- buildSrc/src/main/kotlin/Versions.kt | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 8454e96..b0c3ef3 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -18,11 +18,11 @@ object Versions { const val androidx_test_runner: String = "1.2.0" - const val atrium: String = "0.8.0" + const val atrium: String = "0.9.2" const val aapt2: String = "3.5.0-5435860" - const val com_android_tools_build_gradle: String = "3.5.0" + const val com_android_tools_build_gradle: String = "3.6.0" const val lint_gradle: String = "26.5.0" @@ -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.61" + const val org_jetbrains_kotlin: String = "1.3.70" const val spek: String = "2.1.0-alpha.0.11+d97ef33" // available: "2.1.0-alpha.0.24+0fdeb6e" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 707fae0..3865aaa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip diff --git a/settings.gradle b/settings.gradle index 29e4ca5..5ee2375 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,4 +19,3 @@ include( rootProject.name = 'Redux-Kotlin' enableFeaturePreview('GRADLE_METADATA') -enableFeaturePreview('STABLE_PUBLISHING') From 9abecb64a4504c6957ab0c727c247e05f1cfd4c4 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Thu, 5 Mar 2020 21:54:06 -0500 Subject: [PATCH 2/2] bump version to 0.4.0 --- CHANGELOG.md | 1 + README.md | 4 ++-- gradle.properties | 2 +- lib/build.gradle | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6173b24..3f2642d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## Unreleased + - kotlin 1.3.70 ## [0.3.2] - 2020-02-22 - issue #34 - incorrect same thread enforcement behavior fixed diff --git a/README.md b/README.md index 9b76211..75e2ee8 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ kotlin { sourceSets { commonMain { // <--- name may vary on your project dependencies { - implementation "org.reduxkotlin:redux-kotlin:0.3.2" + implementation "org.reduxkotlin:redux-kotlin:0.4.0" } } } @@ -52,7 +52,7 @@ kotlin { For JVM only: ``` - implementation "org.reduxkotlin:redux-kotlin-jvm:0.3.2" + implementation "org.reduxkotlin:redux-kotlin-jvm:0.4.0" ``` Usage is very similar to JS Redux and those docs will be useful https://redux.js.org/. These docs are not an intro to Redux, and just documentation on Kotlin specific bits. For more info on Redux in general, check out https://redux.js.org/. diff --git a/gradle.properties b/gradle.properties index 9c5baa3..d64e7a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ android.enableJetifier=true kotlin.code.style=official GROUP=org.reduxkotlin.redux-kotlin -VERSION_NAME=0.3.2 +VERSION_NAME=0.4.0 POM_ARTIFACT_ID=reduxkotlin POM_DESCRIPTION=Redux implementation for Kotlin. Mulitiplatform supported. diff --git a/lib/build.gradle b/lib/build.gradle index 548b800..7d415e6 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.3.2' +version '0.4.0' kotlin { jvm()