From 71d2f73aa1dfe5abbcc421ecee2836db2f58185c Mon Sep 17 00:00:00 2001 From: Colton Nohelty Date: Sat, 13 Apr 2019 22:58:08 -0400 Subject: [PATCH] Upgrading Kotlin (#34) --- README.md | 4 +++- build.gradle | 10 ++++++++-- common/build.gradle | 2 +- js/build.gradle | 2 +- jvm/build.gradle | 2 +- native/build.gradle | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 06c8484..89c5805 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,9 @@ we will be keeping up with this support map going forward. **RxCommon to Kotlin Stdlib Version Support Map**: ``` 0.4.2 -> 1.3.20 -0.5.x -> 1.3.21 +0.5.0 -> 1.3.21 +0.5.1 -> 1.3.21 +0.5.2 -> 1.3.30 ``` ## Temporary Limitations diff --git a/build.gradle b/build.gradle index c590757..157109e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ buildscript { ext { project_group_id = 'com.noheltcj' - project_version = '0.5.1' - kotlin_version = '1.3.21' + project_version = '0.5.2' + kotlin_version = '1.3.30' upload_artifacts = System.getenv("uploadArtifacts") == "true" } @@ -11,6 +11,12 @@ buildscript { } } +plugins { + id 'kotlin-platform-common' version '1.3.30' apply false + id 'kotlin-platform-js' version '1.3.30' apply false + id 'kotlin-platform-jvm' version '1.3.30' apply false +} + subprojects { repositories { jcenter() diff --git a/common/build.gradle b/common/build.gradle index c660521..d213a6b 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'kotlin-platform-common' version '1.3.21' + id 'kotlin-platform-common' } group = project_group_id diff --git a/js/build.gradle b/js/build.gradle index d39aaf4..e06654e 100644 --- a/js/build.gradle +++ b/js/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'kotlin-platform-js' version '1.3.21' + id 'kotlin-platform-js' } dependencies { diff --git a/jvm/build.gradle b/jvm/build.gradle index 9ccb0ba..5b198d5 100644 --- a/jvm/build.gradle +++ b/jvm/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'kotlin-platform-jvm' version '1.3.21' + id 'kotlin-platform-jvm' } dependencies { diff --git a/native/build.gradle b/native/build.gradle index 38727aa..10960a5 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:1.3.21" + classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$kotlin_version" } }