Update Kotlin to 1.3.60

RUANHAOANDROID · Nov 22, 2019 · 7e895fc · 7e895fc
1 parent 1fd56f2
commit 7e895fc
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg?version=1.3.2) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/1.3.2)
 
 Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
-This is a companion version for Kotlin `1.3.50` release.
+This is a companion version for Kotlin `1.3.60` release.
 
 ```kotlin
 suspend fun main() = coroutineScope {
@@ -90,7 +90,7 @@ And make sure that you use the latest Kotlin version:
 
 ```xml
 <properties>
- <kotlin.version>1.3.50</kotlin.version>
+ <kotlin.version>1.3.60</kotlin.version>
 </properties>
 ```
 
@@ -108,7 +108,7 @@ And make sure that you use the latest Kotlin version:
 
 ```groovy
 buildscript {
- ext.kotlin_version = '1.3.50'
+ ext.kotlin_version = '1.3.60'
 }
 ```
 
@@ -134,7 +134,7 @@ And make sure that you use the latest Kotlin version:
 
 ```groovy
 plugins {
- kotlin("jvm") version "1.3.50"
+ kotlin("jvm") version "1.3.60"
 }
 ```
 

diff --git a/gradle.properties b/gradle.properties
@@ -5,11 +5,11 @@
 # Kotlin
 version=1.3.2-SNAPSHOT
 group=org.jetbrains.kotlinx
-kotlin_version=1.3.50
+kotlin_version=1.3.60
 
 # Dependencies
 junit_version=4.12
-atomicfu_version=0.13.2
+atomicfu_version=0.14.1
 html_version=0.6.8
 lincheck_version=2.0
 dokka_version=0.9.16-rdev-2-mpp-hacks

diff --git a/gradle/compile-native-multiplatform.gradle b/gradle/compile-native-multiplatform.gradle
@@ -1,28 +1,42 @@
+project.ext.nativeMainSets = []
+project.ext.nativeTestSets = []
+
 kotlin {
+ targets.metaClass.addTarget = { preset ->
+ def target = delegate.fromPreset(preset, preset.name)
+ project.ext.nativeMainSets.add(target.compilations['main'].kotlinSourceSets.first())
+ project.ext.nativeTestSets.add(target.compilations['test'].kotlinSourceSets.first())
+ }
+
  targets {
  if (project.ext.ideaActive) {
  fromPreset(project.ext.ideaPreset, 'native')
  } else {
- fromPreset(presets.linuxX64, 'linuxX64')
- fromPreset(presets.iosArm64, 'iosArm64')
- fromPreset(presets.iosArm32, 'iosArm32')
- fromPreset(presets.iosX64, 'iosX64')
- fromPreset(presets.macosX64, 'macosX64')
- fromPreset(presets.mingwX64, 'windowsX64')
+ addTarget(presets.linuxX64)
+ addTarget(presets.iosArm64)
+ addTarget(presets.iosArm32)
+ addTarget(presets.iosX64)
+ addTarget(presets.macosX64)
+ addTarget(presets.mingwX64)
+ addTarget(presets.tvosArm64)
+ addTarget(presets.tvosX64)
+ addTarget(presets.watchosArm32)
+ addTarget(presets.watchosArm64)
+ addTarget(presets.watchosX86)
  }
  }
 
  sourceSets {
  nativeMain { dependsOn commonMain }
- // Empty source set is required in order to have native tests task 
+ // Empty source set is required in order to have native tests task
  nativeTest {}
 
  if (!project.ext.ideaActive) {
- configure([linuxX64Main, macosX64Main, windowsX64Main, iosArm32Main, iosArm64Main, iosX64Main]) {
+ configure(nativeMainSets) {
  dependsOn nativeMain
  }
 
- configure([linuxX64Test, macosX64Test, windowsX64Test, iosArm32Test, iosArm64Test, iosX64Test]) {
+ configure(nativeTestSets) {
  dependsOn nativeTest
  }
  }

diff --git a/ui/kotlinx-coroutines-android/animation-app/gradle.properties b/ui/kotlinx-coroutines-android/animation-app/gradle.properties
@@ -20,7 +20,7 @@ org.gradle.jvmargs=-Xmx1536m
 # http:https://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-kotlin_version=1.3.50
+kotlin_version=1.3.60
 coroutines_version=1.3.2
 
 android.useAndroidX=true

diff --git a/ui/kotlinx-coroutines-android/example-app/gradle.properties b/ui/kotlinx-coroutines-android/example-app/gradle.properties
@@ -20,7 +20,7 @@ org.gradle.jvmargs=-Xmx1536m
 # http:https://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-kotlin_version=1.3.50
+kotlin_version=1.3.60
 coroutines_version=1.3.2
 
 android.useAndroidX=true