Skip to content

Commit d90c7bf

Browse files
ilya-gilya-g
committed
Upgrade Kotlin to 1.7.0-Beta
(cherry picked from commit a18ec4c)
1 parent b979c2e commit d90c7bf

File tree

5 files changed

+40
-40
lines changed

5 files changed

+40
-40
lines changed

‎core/build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ tasks {
210210
val moduleName = "kotlinx.datetime" // this module's name
211211
val compileKotlinJvm by getting(KotlinCompile::class)
212212
val sourceDir = file("jvm/java9/")
213-
val targetDir = compileKotlinJvm.destinationDir.resolve("../java9/")
213+
val targetDir = compileKotlinJvm.destinationDirectory.map { it.dir("../java9/") }
214214

215215
// Use a Java 11 compiler for the module info.
216216
javaCompiler.set(project.javaToolchains.compilerFor { languageVersion.set(JavaLanguageVersion.of(modularJavaToolchainVersion)) })
@@ -236,7 +236,7 @@ tasks {
236236

237237
// Set the task outputs and destination dir
238238
outputs.dir(targetDir)
239-
destinationDir = targetDir
239+
destinationDirectory.set(targetDir)
240240

241241
// Configure JVM compatibility
242242
sourceCompatibility = JavaVersion.VERSION_1_9.toString()
@@ -250,11 +250,11 @@ tasks {
250250
options.compilerArgs.add("-Xlint:-requires-transitive-automatic")
251251

252252
// Patch the compileKotlinJvm output classes into the compilation so exporting packages works correctly.
253-
options.compilerArgs.addAll(listOf("--patch-module", "$moduleName=${compileKotlinJvm.destinationDir}"))
253+
options.compilerArgs.addAll(listOf("--patch-module", "$moduleName=${compileKotlinJvm.destinationDirectory.get()}"))
254254

255255
// Use the classpath of the compileKotlinJvm task.
256256
// Also ensure that the module path is used instead of classpath.
257-
classpath = compileKotlinJvm.classpath
257+
classpath = compileKotlinJvm.libraries
258258
modularity.inferModulePath.set(true)
259259
}
260260

‎core/common/src/Clock.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public fun Clock.asTimeSource(): TimeSource = object : TimeSource {
2828
}
2929

3030
@ExperimentalTime
31-
private class InstantTimeMark(private val instant: Instant, private val clock: Clock) : TimeMark() {
31+
private class InstantTimeMark(private val instant: Instant, private val clock: Clock) : TimeMark {
3232
override fun elapsedNow(): Duration = clock.now() - instant
3333

3434
override fun plus(duration: Duration): TimeMark = InstantTimeMark(instant + duration, clock)

‎core/common/test/LocalDateTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,12 @@ class LocalDateTest {
156156
val end = LocalDate.parse(v2)
157157
assertEquals(length, start.until(end, unit), "$v2 - $v1 = $length($unit)")
158158
assertEquals(-length, end.until(start, unit), "$v1 - $v2 = -$length($unit)")
159-
@Suppress("NON_EXHAUSTIVE_WHEN_ON_SEALED_CLASS")
160159
when (unit) {
161160
DateTimeUnit.YEAR -> assertEquals(length, start.yearsUntil(end))
162161
DateTimeUnit.MONTH -> assertEquals(length, start.monthsUntil(end))
163162
DateTimeUnit.WEEK -> assertEquals(length, start.daysUntil(end) / 7)
164163
DateTimeUnit.DAY -> assertEquals(length, start.daysUntil(end))
164+
else -> error(unit)
165165
}
166166
}
167167

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ group=org.jetbrains.kotlinx
55
version=0.3.2
66
versionSuffix=SNAPSHOT
77

8-
kotlinVersion=1.6.20
8+
kotlinVersion=1.7.0-Beta
99
serializationVersion=1.3.2
1010

1111
java.mainToolchainVersion=8

‎kotlin-js-store/yarn.lock

+33-33
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ chalk@^4.1.0:
9595
ansi-styles "^4.1.0"
9696
supports-color "^7.1.0"
9797

98-
[email protected].2:
99-
version "3.5.2"
100-
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
101-
integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
98+
[email protected].3:
99+
version "3.5.3"
100+
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
101+
integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
102102
dependencies:
103103
anymatch "~3.1.2"
104104
braces "~3.0.2"
@@ -136,10 +136,10 @@ [email protected]:
136136
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
137137
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
138138

139-
[email protected].2:
140-
version "4.3.2"
141-
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
142-
integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
139+
[email protected].3:
140+
version "4.3.3"
141+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
142+
integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
143143
dependencies:
144144
ms "2.1.2"
145145

@@ -223,10 +223,10 @@ glob-parent@~5.1.2:
223223
dependencies:
224224
is-glob "^4.0.1"
225225

226-
glob@7.1.7:
227-
version "7.1.7"
228-
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
229-
integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
226+
glob@7.2.0:
227+
version "7.2.0"
228+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
229+
integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
230230
dependencies:
231231
fs.realpath "^1.0.0"
232232
inflight "^1.0.4"
@@ -348,32 +348,32 @@ minimatch@^3.0.4:
348348
dependencies:
349349
brace-expansion "^1.1.7"
350350

351-
mocha@9.1.2:
352-
version "9.1.2"
353-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.2.tgz#93f53175b0f0dc4014bd2d612218fccfcf3534d3"
354-
integrity sha512-ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w==
351+
mocha@9.2.1:
352+
version "9.2.1"
353+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.1.tgz#a1abb675aa9a8490798503af57e8782a78f1338e"
354+
integrity sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==
355355
dependencies:
356356
"@ungap/promise-all-settled" "1.1.2"
357357
ansi-colors "4.1.1"
358358
browser-stdout "1.3.1"
359-
chokidar "3.5.2"
360-
debug "4.3.2"
359+
chokidar "3.5.3"
360+
debug "4.3.3"
361361
diff "5.0.0"
362362
escape-string-regexp "4.0.0"
363363
find-up "5.0.0"
364-
glob "7.1.7"
364+
glob "7.2.0"
365365
growl "1.10.5"
366366
he "1.2.0"
367367
js-yaml "4.1.0"
368368
log-symbols "4.1.0"
369369
minimatch "3.0.4"
370370
ms "2.1.3"
371-
nanoid "3.1.25"
371+
nanoid "3.2.0"
372372
serialize-javascript "6.0.0"
373373
strip-json-comments "3.1.1"
374374
supports-color "8.1.1"
375375
which "2.0.2"
376-
workerpool "6.1.5"
376+
workerpool "6.2.0"
377377
yargs "16.2.0"
378378
yargs-parser "20.2.4"
379379
yargs-unparser "2.0.0"
@@ -388,10 +388,10 @@ [email protected]:
388388
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
389389
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
390390

391-
nanoid@3.1.25:
392-
version "3.1.25"
393-
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
394-
integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
391+
nanoid@3.2.0:
392+
version "3.2.0"
393+
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
394+
integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
395395

396396
normalize-path@^3.0.0, normalize-path@~3.0.0:
397397
version "3.0.0"
@@ -465,10 +465,10 @@ [email protected]:
465465
dependencies:
466466
randombytes "^2.1.0"
467467

468-
[email protected].20:
469-
version "0.5.20"
470-
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
471-
integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
468+
[email protected].21:
469+
version "0.5.21"
470+
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
471+
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
472472
dependencies:
473473
buffer-from "^1.0.0"
474474
source-map "^0.6.0"
@@ -532,10 +532,10 @@ [email protected]:
532532
dependencies:
533533
isexe "^2.0.0"
534534

535-
workerpool@6.1.5:
536-
version "6.1.5"
537-
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
538-
integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
535+
workerpool@6.2.0:
536+
version "6.2.0"
537+
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
538+
integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
539539

540540
wrap-ansi@^7.0.0:
541541
version "7.0.0"

0 commit comments

Comments
 (0)