Skip to content

Commit

Permalink
Upgrading Kotlin (#34)
Browse files Browse the repository at this point in the history
  • Loading branch information
noheltcj committed Apr 14, 2019
1 parent 05e0a0d commit 71d2f73
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}

Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'kotlin-platform-common' version '1.3.21'
id 'kotlin-platform-common'
}

group = project_group_id
Expand Down
2 changes: 1 addition & 1 deletion js/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'kotlin-platform-js' version '1.3.21'
id 'kotlin-platform-js'
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion jvm/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'kotlin-platform-jvm' version '1.3.21'
id 'kotlin-platform-jvm'
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down

0 comments on commit 71d2f73

Please sign in to comment.