Skip to content

Commit ce5d01a

Browse files
committed
Update to gradle 4.10
1 parent 8f1c728 commit ce5d01a

File tree

7 files changed

+9
-10
lines changed

7 files changed

+9
-10
lines changed

build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ buildscript {
1212
}
1313
repositories {
1414
jcenter()
15+
maven { url "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/id:1907319/artifacts/content/maven" }
1516
maven { url "https://kotlin.bintray.com/kotlinx" }
1617
maven { url "https://kotlin.bintray.com/kotlin-dev" }
1718
maven { url "https://kotlin.bintray.com/kotlin-eap" }
@@ -63,6 +64,7 @@ allprojects {
6364
google()
6465
}
6566
jcenter()
67+
maven { url "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/id:1907319/artifacts/content/maven" }
6668
maven { url "https://kotlin.bintray.com/kotlin-dev" }
6769
maven { url "https://kotlin.bintray.com/kotlin-eap" }
6870
maven { url "https://kotlin.bintray.com/kotlinx" }

gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Kotlin
22
version=1.1.0-SNAPSHOT
33
group=org.jetbrains.kotlinx
4-
kotlin_version=1.3.11
5-
kotlin_native_version=1.3.11
4+
kotlin_version=1.3.20
5+
kotlin_native_version=1.3.20
66

77
# Dependencies
88
junit_version=4.12
9-
atomicFU_version=0.12.0
9+
atomicFU_version=0.12.1
1010
html_version=0.6.8
1111
lincheck_version=2.0
1212
dokka_version=0.9.16-rdev-2-mpp-hacks

gradle/publish-bintray.gradle

+1-4
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,7 @@ bintrayUpload.doFirst {
117117
if (!isNative()) {
118118
afterEvaluate {
119119
publishing.publications.each { pub ->
120-
pub.gradleModuleMetadataFile = null
121-
tasks.matching { it.name == "generateMetadataFileFor${pub.name.capitalize()}Publication" }.all {
122-
onlyIf { false }
123-
}
120+
pub.moduleDescriptorGenerator = null
124121
}
125122
}
126123
}

gradle/wrapper/gradle-wrapper.jar

1.72 KB
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ internal actual fun <E> subscriberList(): MutableList<E> = CopyOnWriteList<E>()
1818
internal actual fun <E> identitySet(expectedSize: Int): MutableSet<E> = HashSet()
1919

2020
@Suppress("ACTUAL_WITHOUT_EXPECT")
21-
internal actual typealias SharedImmutable = kotlin.native.SharedImmutable
21+
internal actual typealias SharedImmutable = kotlin.native.concurrent.SharedImmutable

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package kotlinx.coroutines.internal
66
import kotlin.native.concurrent.*
77

88
@Suppress("ACTUAL_WITHOUT_EXPECT")
9-
internal actual typealias NativeThreadLocal = kotlin.native.ThreadLocal
9+
internal actual typealias NativeThreadLocal = kotlin.native.concurrent.ThreadLocal
1010

1111
internal actual class CommonThreadLocal<T> actual constructor() {
1212
private var value: T? = null

0 commit comments

Comments
 (0)