Update to 1.3.20 to mitigate some plugin issues, cleanup gradle files

Author: qwwdfsad

build.gradle

@@ -98,13 +98,8 @@ allprojects {
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile).all {
-        kotlinOptions.freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental",
-                                           "-Xuse-experimental=kotlin.experimental.ExperimentalTypeInference",
-                                           "-Xuse-experimental=kotlin.ExperimentalMultiplatform",
-                                           "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                                           "-Xuse-experimental=kotlinx.coroutines.ObsoleteCoroutinesApi",
-                                           "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
-                                           "-progressive"]
+        kotlinOptions.freeCompilerArgs += experimentalAnnotations.collect { "-Xuse-experimental=" + it }
+        kotlinOptions.freeCompilerArgs += "-progressive"
         // Binary compatibility support
         kotlinOptions.freeCompilerArgs += ["-Xdump-declarations-to=${buildDir}/visibilities.json"]
     }
@@ -122,7 +117,6 @@ configure(subprojects.findAll { !sourceless.contains(it.name) && it.name != "ben
 }
 
 def core_docs_url = "https://kotlin.github.io/kotlinx.coroutines/$coreModule/"
-//def core_docs_url = "http://127.0.0.1:4000/kotlinx.coroutines/$coreModule/"
 def core_docs_file = "$projectDir/kotlinx-coroutines-core/build/dokka/kotlinx-coroutines-core/package-list"
 
 configure(subprojects.findAll { !unpublished.contains(it.name) }) {

gradle.properties

@@ -1,12 +1,11 @@
 # Kotlin
 version=1.1.0-SNAPSHOT
 group=org.jetbrains.kotlinx
-kotlin_version=1.3.11
-kotlin_native_version=1.3.11
+kotlin_version=1.3.20-eap-113
 
 # Dependencies
 junit_version=4.12
-atomicFU_version=0.12.0
+atomicFU_version=0.12.0-native-1.3.20-eap-52
 html_version=0.6.8
 lincheck_version=2.0
 dokka_version=0.9.16-rdev-2-mpp-hacks
@@ -23,4 +22,4 @@ mocha_headless_chrome_version=1.8.2
 mocha_teamcity_reporter_version=2.2.2
 source_map_support_version=0.5.3
 
-kotlin.incremental.multiplatform=true
+kotlin.incremental.multiplatform=true

gradle/compile-common.gradle

@@ -4,7 +4,7 @@
 
 kotlin.sourceSets {
     commonMain.dependencies {
-        api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-common', version: kotlin_version
+        api "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlin_version"
         api "org.jetbrains.kotlinx:atomicfu-common:$atomicFU_version"
     }
 

gradle/compile-native-multiplatform.gradle

@@ -9,7 +9,6 @@ kotlin {
             fromPreset(presets.iosX64, 'iosX64')
             fromPreset(presets.macosX64, 'macosX64')
             fromPreset(presets.mingwX64, 'windowsX64')
-            // TODO mingw :
         }
     }
 

gradle/maven-central.gradle

@@ -34,12 +34,4 @@ project.ext.configureMavenCentralMetadata = {
     root.appendNode('description', 'Coroutines support libraries for Kotlin')
     root.appendNode('url', 'https://github.com/Kotlin/kotlinx.coroutines')
     root.children().last() + pomConfig
-
-    def dependenciesNode = asNode().getAt("dependencies")[0]
-    if (dependenciesNode != null) {
-        def dependencyNode = dependenciesNode.appendNode('dependency')
-        dependencyNode.appendNode('groupId', "$group")
-        dependencyNode.appendNode('artifactId', "$project.name")
-        dependencyNode.appendNode('version', "$project.version")
-    }
 }

gradle/publish-bintray.gradle

@@ -82,6 +82,7 @@ publishing {
             }
         }
 
+        disableMetadataPublicationKotlinJvm()
         return
     }
 
@@ -116,6 +117,15 @@ publishing {
     disableMetadataPublication()
 }
 
+private void disableMetadataPublicationKotlinJvm() {
+    publishing.publications.each { pub ->
+        pub.gradleModuleMetadataFile = null
+        tasks.matching { it.name == "generateMetadataFileFor${pub.name.capitalize()}Publication" }.all {
+            onlyIf { false }
+        }
+    }
+}
+
 private void disableMetadataPublication() {
     kotlin.targets.all { target ->
         def publication = publishing.publications.findByName(target.name)

kotlinx-coroutines-core/native/src/internal/Concurrent.kt

@@ -18,4 +18,4 @@ internal actual fun <E> subscriberList(): MutableList<E> = CopyOnWriteList<E>()
 internal actual fun <E> identitySet(expectedSize: Int): MutableSet<E> = HashSet()
 
 @Suppress("ACTUAL_WITHOUT_EXPECT")
-internal actual typealias SharedImmutable = kotlin.native.SharedImmutable
+internal actual typealias SharedImmutable = kotlin.native.concurrent.SharedImmutable

kotlinx-coroutines-core/native/src/internal/ThreadLocal.kt

@@ -3,10 +3,9 @@
  */
 
 package kotlinx.coroutines.internal
-import kotlin.native.concurrent.*
 
 @Suppress("ACTUAL_WITHOUT_EXPECT")
-internal actual typealias NativeThreadLocal = kotlin.native.ThreadLocal
+internal actual typealias NativeThreadLocal = kotlin.native.concurrent.ThreadLocal
 
 internal actual class CommonThreadLocal<T> actual constructor() {
     private var value: T? = null