Skip to content

Commit 4135cab

Browse files
committed
Update Kotlin to 1.4.0-rc
1 parent abf9a15 commit 4135cab

File tree

7 files changed

+17
-11
lines changed

7 files changed

+17
-11
lines changed

build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
buildscript {
22
repositories {
33
mavenCentral()
4-
maven(url = "https://dl.bintray.com/kotlin/kotlin-eap")
54
}
65
dependencies {
7-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71")
6+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0-rc")
87
}
98
}
109

@@ -61,7 +60,6 @@ val JDK_8 by ext(jdkPath(8))
6160
allprojects {
6261
repositories {
6362
mavenCentral()
64-
maven(url = "https://dl.bintray.com/kotlin/kotlin-eap")
6563
}
6664
}
6765

core/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ kotlin {
165165
val jsMain by getting {
166166
dependencies {
167167
api("org.jetbrains.kotlin:kotlin-stdlib-js")
168-
implementation(npm("js-joda", "core", "1.12.0"))
168+
implementation(npm("@js-joda/core", "3.0.0"))
169169
}
170170
}
171171

172172
val jsTest by getting {
173173
dependencies {
174174
api("org.jetbrains.kotlin:kotlin-test-js")
175-
implementation(npm("js-joda", "timezone", "2.2.0"))
175+
implementation(npm("@js-joda/timezone", "2.3.0"))
176176
}
177177
}
178178

core/nativeMain/src/Instant.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,8 @@ public actual class Instant internal constructor(actual val epochSeconds: Long,
253253
actual fun parse(isoString: String): Instant =
254254
instantParser.parse(isoString)
255255

256-
@SharedImmutable
257256
actual val DISTANT_PAST: Instant = fromEpochSeconds(DISTANT_PAST_SECONDS, 999_999_999)
258257

259-
@SharedImmutable
260258
actual val DISTANT_FUTURE: Instant = fromEpochSeconds(DISTANT_FUTURE_SECONDS, 0)
261259
}
262260

core/nativeMain/src/TimeZone.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public actual open class TimeZone internal constructor(private val tzid: TZID, a
2626
TimeZone(tzid.value, kotlinString)
2727
}
2828

29-
@SharedImmutable
3029
actual val UTC: TimeZone = ZoneOffset.UTC
3130

3231
// org.threeten.bp.ZoneId#of(java.lang.String)
@@ -136,7 +135,6 @@ public actual class ZoneOffset internal constructor(actual val totalSeconds: Int
136135

137136
companion object {
138137
// org.threeten.bp.ZoneOffset#UTC
139-
@SharedImmutable
140138
val UTC = ZoneOffset(0, "Z")
141139

142140
// org.threeten.bp.ZoneOffset#of

darwin-integration/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ kotlin {
1515
target("tvosX64")
1616
}
1717

18+
if (System.getProperty("idea.active")?.toBoolean() == true) {
19+
// workaround: add jvm target for non-Mac hosts during IDEA import to avoid 'no targets' error
20+
jvm()
21+
}
22+
1823
sourceSets.all {
1924
kotlin.setSrcDirs(listOf("$name/src"))
2025
}

gradle.properties

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
group=org.jetbrains.kotlinx
22
version=0.0.1
3-
versionSuffix=SNAPSHOT
3+
versionSuffix=SNAPSHOT
4+
5+
#kotlin.mpp.enableGranularSourceSetsMetadata=true
6+
#kotlin.mpp.enableCompatibilityMetadataVariant=true
7+
8+
# Workaround for Bintray treating .sha512 files as artifacts
9+
# https://github.com/gradle/gradle/issues/11412
10+
systemProp.org.gradle.internal.publish.checksums.insecure=true
Lines changed: 1 addition & 1 deletion
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-5.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)