Skip to content

Commit 045a583

Browse files
committed
Upgrade to Kotlin 1.5.10 giving us:
- A terser build script - stdlib implementations of `Char.isLetterOrDigit` and `Char.isDigit` - `sealed interface`, which makes more sense for us here than `sealed class`
1 parent ddeaca8 commit 045a583

File tree

16 files changed

+583
-516
lines changed

16 files changed

+583
-516
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build
1010
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
1111

1212
# User-specific stuff
13+
local.properties
1314
.idea/**/workspace.xml
1415
.idea/**/tasks.xml
1516
.idea/**/usage.statistics.xml

build.gradle.kts

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
// Apply the Kotlin JVM plugin to add support for Kotlin
3-
kotlin("multiplatform") version "1.4.10"
3+
kotlin("multiplatform") version "1.5.10"
44
}
55

66
repositories {
@@ -15,27 +15,16 @@ kotlin {
1515
}
1616

1717
sourceSets {
18-
val commonMain by sourceSets.getting { }
19-
val commonTest by sourceSets.getting {
20-
dependencies {
21-
implementation(kotlin("test-common"))
22-
implementation(kotlin("test-annotations-common"))
23-
}
24-
}
25-
val jvmMain by sourceSets.getting {
26-
dependencies {
27-
implementation(kotlin("reflect"))
28-
}
29-
}
30-
val jvmTest by sourceSets.getting {
18+
val commonTest by getting {
3119
dependencies {
20+
// This brings the dependency
21+
// on JUnit 4 transitively
3222
implementation(kotlin("test"))
33-
implementation(kotlin("test-junit"))
3423
}
3524
}
36-
val jsTest by sourceSets.getting {
25+
val jvmMain by getting {
3726
dependencies {
38-
implementation(kotlin("test-js"))
27+
implementation(kotlin("reflect"))
3928
}
4029
}
4130
}

0 commit comments

Comments
 (0)