From c760e4c1449f94241328dfb38ae3440d960b8bef Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Fri, 7 Aug 2020 11:49:05 -0400 Subject: [PATCH 1/7] test publish with gradle 6.5.1 --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index cc7642a..cd0bbbb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ kotlin.native.ignoreDisabledTargets=true kotlin.mpp.enableGranularSourceSetsMetadata=true GROUP=org.reduxkotlin -VERSION_NAME=0.5.5 +VERSION_NAME=0.5.5-6.5.1 POM_ARTIFACT_ID=reduxkotlin POM_DESCRIPTION=Redux implementation for Kotlin. Mulitiplatform supported. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 50b57bf..f16bb2d 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-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip From 0e15de1bf7ff0568f3f9d5d08958b1b6fcd4a230 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Fri, 7 Aug 2020 12:58:45 -0400 Subject: [PATCH 2/7] enable gradle-metadata feature --- gradle.properties | 2 +- settings.gradle.kts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cd0bbbb..b1bf256 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ kotlin.native.ignoreDisabledTargets=true kotlin.mpp.enableGranularSourceSetsMetadata=true GROUP=org.reduxkotlin -VERSION_NAME=0.5.5-6.5.1 +VERSION_NAME=0.5.5-6.5.1-2 POM_ARTIFACT_ID=reduxkotlin POM_DESCRIPTION=Redux implementation for Kotlin. Mulitiplatform supported. diff --git a/settings.gradle.kts b/settings.gradle.kts index 6b34c57..44a7184 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,4 +17,5 @@ include( ":examples:todos:android" ) +enableFeaturePreview("GRADLE_METADATA") rootProject.name = "Redux-Kotlin" From c24b44959a351d4b5522d3000867a086013a002f Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Fri, 7 Aug 2020 13:31:39 -0400 Subject: [PATCH 3/7] update to gradle 6.6-rc-6 --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index b1bf256..6c8663b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ kotlin.native.ignoreDisabledTargets=true kotlin.mpp.enableGranularSourceSetsMetadata=true GROUP=org.reduxkotlin -VERSION_NAME=0.5.5-6.5.1-2 +VERSION_NAME=0.5.5-6.6 POM_ARTIFACT_ID=reduxkotlin POM_DESCRIPTION=Redux implementation for Kotlin. Mulitiplatform supported. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f16bb2d..1bd6bf7 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-6.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-rc-6-all.zip From b7aa2d6a6118c1538ada19a7ae924d62ebd21cd8 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Fri, 7 Aug 2020 15:50:29 -0400 Subject: [PATCH 4/7] revert to gradle 5.6 --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6c8663b..a65bb1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ kotlin.native.ignoreDisabledTargets=true kotlin.mpp.enableGranularSourceSetsMetadata=true GROUP=org.reduxkotlin -VERSION_NAME=0.5.5-6.6 +VERSION_NAME=0.5.5-5.6 POM_ARTIFACT_ID=reduxkotlin POM_DESCRIPTION=Redux implementation for Kotlin. Mulitiplatform supported. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1bd6bf7..66810b1 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-6.6-rc-6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip From c9d1982ce451efe4cb1b06c0187745d6b260e1ef Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Fri, 7 Aug 2020 15:52:54 -0400 Subject: [PATCH 5/7] revert to gradle 6.5 --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a65bb1b..d0e3239 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ kotlin.native.ignoreDisabledTargets=true kotlin.mpp.enableGranularSourceSetsMetadata=true GROUP=org.reduxkotlin -VERSION_NAME=0.5.5-5.6 +VERSION_NAME=0.5.5-6.5 POM_ARTIFACT_ID=reduxkotlin POM_DESCRIPTION=Redux implementation for Kotlin. Mulitiplatform supported. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 66810b1..50b57bf 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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip From a87f93d7471ed2a1c168bf41b9752eb610b7ae0b Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Fri, 7 Aug 2020 16:39:06 -0400 Subject: [PATCH 6/7] remove enableFeaturePreview() --- settings.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 44a7184..6b34c57 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,5 +17,4 @@ include( ":examples:todos:android" ) -enableFeaturePreview("GRADLE_METADATA") rootProject.name = "Redux-Kotlin" From dc4c7bce53bdeb62f637e16ce5cab6b48ea4b8b7 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Sat, 15 Aug 2020 17:36:55 -0400 Subject: [PATCH 7/7] update to kotlin 1.4.0 and gradle 6.6 --- buildSrc/src/main/kotlin/Versions.kt | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 8063399..18a7463 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -30,7 +30,7 @@ object Versions { const val dokka_gradle_plugin: String = "0.9.17" // available: "0.11.0-dev-59" - const val org_jetbrains_kotlin: String = "1.4.0-rc" + const val org_jetbrains_kotlin: String = "1.4.0" const val atomicfu_gradle_plugin: String = "0.14.3-1.4.0-rc" diff --git a/gradle.properties b/gradle.properties index d0e3239..cc7642a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ kotlin.native.ignoreDisabledTargets=true kotlin.mpp.enableGranularSourceSetsMetadata=true GROUP=org.reduxkotlin -VERSION_NAME=0.5.5-6.5 +VERSION_NAME=0.5.5 POM_ARTIFACT_ID=reduxkotlin POM_DESCRIPTION=Redux implementation for Kotlin. Mulitiplatform supported. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 50b57bf..8e9e2e9 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-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip