Skip to content

Commit 274483a

Browse files
authored
Remove leftover Kotlin multiplatform suffixes (#5328)
Now that Coursier can understand KMP artifact metadata and resolution natively, we no longer need to manually specify the platform-specific version of each artifact
1 parent 661e095 commit 274483a

File tree

32 files changed

+87
-92
lines changed

32 files changed

+87
-92
lines changed

example/kotlinlib/basic/1-simple/build.mill

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ object foo extends KotlinModule {
77
def kotlinVersion = "1.9.24"
88

99
def mvnDeps = Seq(
10-
mvn"com.github.ajalt.clikt:clikt-jvm:4.4.0",
11-
mvn"org.jetbrains.kotlinx:kotlinx-html-jvm:0.11.0"
10+
mvn"com.github.ajalt.clikt:clikt:4.4.0",
11+
mvn"org.jetbrains.kotlinx:kotlinx-html:0.11.0"
1212
)
1313

1414
object test extends KotlinTests with TestModule.Junit5 {
1515
def mvnDeps = Seq(
16-
mvn"io.kotest:kotest-runner-junit5-jvm:5.9.1"
16+
mvn"io.kotest:kotest-runner-junit5:5.9.1"
1717
)
1818
}
1919
}

example/kotlinlib/basic/2-custom-build-logic/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object foo extends KotlinModule {
2121

2222
object test extends KotlinTests with TestModule.Junit5 {
2323
def mvnDeps = super.mvnDeps() ++ Seq(
24-
mvn"io.kotest:kotest-runner-junit5-jvm:5.9.1"
24+
mvn"io.kotest:kotest-runner-junit5:5.9.1"
2525
)
2626
}
2727
}

example/kotlinlib/basic/3-multi-module/build.mill

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ trait MyModule extends KotlinModule {
77

88
object test extends KotlinTests with TestModule.Junit5 {
99
def mvnDeps = super.mvnDeps() ++ Seq(
10-
mvn"io.kotest:kotest-runner-junit5-jvm:5.9.1"
10+
mvn"io.kotest:kotest-runner-junit5:5.9.1"
1111
)
1212
}
1313
}
1414

1515
object foo extends MyModule {
1616
def moduleDeps = Seq(bar)
1717
def mvnDeps = Seq(
18-
mvn"com.github.ajalt.clikt:clikt-jvm:4.4.0"
18+
mvn"com.github.ajalt.clikt:clikt:4.4.0"
1919
)
2020
}
2121

2222
object bar extends MyModule {
2323
def mainClass = Some("bar.BarKt")
2424
def mvnDeps = Seq(
25-
mvn"org.jetbrains.kotlinx:kotlinx-html-jvm:0.11.0"
25+
mvn"org.jetbrains.kotlinx:kotlinx-html:0.11.0"
2626
)
2727
}
2828

example/kotlinlib/basic/4-compat-modules/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object foo extends KotlinModule with KotlinMavenModule {
1414

1515
object test extends KotlinMavenTests with TestModule.Junit5 {
1616
def mvnDeps = super.mvnDeps() ++ Seq(
17-
mvn"io.kotest:kotest-runner-junit5-jvm:5.9.1"
17+
mvn"io.kotest:kotest-runner-junit5:5.9.1"
1818
)
1919
}
2020
}

example/kotlinlib/basic/6-realistic/build.mill

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ trait MyModule extends KotlinModule with PublishModule {
1616

1717
def kotlinVersion = "1.9.24"
1818

19-
def mvnDeps = Seq(mvn"org.jetbrains.kotlinx:kotlinx-html-jvm:0.11.0")
19+
def mvnDeps = Seq(mvn"org.jetbrains.kotlinx:kotlinx-html:0.11.0")
2020

2121
object test extends KotlinTests with TestModule.Junit5 {
2222
def mvnDeps = super.mvnDeps() ++ Seq(
23-
mvn"io.kotest:kotest-runner-junit5-jvm:5.9.1"
23+
mvn"io.kotest:kotest-runner-junit5:5.9.1"
2424
)
2525
}
2626
}

example/kotlinlib/basic/7-dependency-injection/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object dagger extends KspModule {
3030

3131
def mvnDeps = super.mvnDeps() ++ Seq(
3232
mvn"com.google.dagger:dagger-compiler:2.55",
33-
mvn"io.kotest:kotest-runner-junit5-jvm:5.9.1"
33+
mvn"io.kotest:kotest-runner-junit5:5.9.1"
3434
)
3535

3636
def kotlinSymbolProcessors = Seq(

example/kotlinlib/dependencies/5-repository-config/build.mill

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ object foo extends KotlinModule {
99
def kotlinVersion = "1.9.24"
1010

1111
def mvnDeps = Seq(
12-
mvn"com.github.ajalt.clikt:clikt-jvm:4.4.0",
13-
mvn"org.jetbrains.kotlinx:kotlinx-html-jvm:0.11.0"
12+
mvn"com.github.ajalt.clikt:clikt:4.4.0",
13+
mvn"org.jetbrains.kotlinx:kotlinx-html:0.11.0"
1414
)
1515

1616
def repositories = Seq("https://oss.sonatype.org/content/repositories/releases")

example/kotlinlib/linting/4-kover/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object `package` extends KotlinModule with KoverModule {
1111

1212
}
1313
override def mvnDeps = super.mvnDeps() ++ Seq(
14-
mvn"io.kotest:kotest-runner-junit5-jvm:5.9.1"
14+
mvn"io.kotest:kotest-runner-junit5:5.9.1"
1515
)
1616
}
1717

example/kotlinlib/module/1-common-config/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import mill._, kotlinlib._
55
object `package` extends KotlinModule {
66
// You can have arbitrary numbers of third-party dependencies
77
def mvnDeps = Seq(
8-
mvn"org.jetbrains.kotlinx:kotlinx-html-jvm:0.11.0"
8+
mvn"org.jetbrains.kotlinx:kotlinx-html:0.11.0"
99
)
1010

1111
def kotlinVersion = "1.9.24"

example/kotlinlib/module/15-jni/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ object `package` extends KotlinModule {
3434

3535
object test extends KotlinTests with TestModule.Junit5 {
3636
def mvnDeps = super.mvnDeps() ++ Seq(
37-
mvn"io.kotest:kotest-runner-junit5-jvm:5.9.1"
37+
mvn"io.kotest:kotest-runner-junit5:5.9.1"
3838
)
3939
def forkEnv = Map("HELLO_WORLD_BINARY" -> nativeCompiled().path.toString)
4040
}

0 commit comments

Comments
 (0)