Skip to content

Commit 880e422

Browse files
Update coursier jvm-index to 0.0.4-111-eb6e08 (#5122)
Seems Scala Steward hasn't opened PRs in the Mill repo for a while, so let's manually bump this
1 parent 5323816 commit 880e422

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
lines changed

integration/bootstrap/no-java-bootstrap/src/NoJavaBootstrapTests.scala

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package mill.integration
22

3+
import coursier.Resolve
4+
import coursier.cache.FileCache
5+
import coursier.jvm.{JvmCache, JvmChannel, JvmIndex}
36
import mill.testkit.UtestIntegrationTestSuite
47

58
import utest._
@@ -8,6 +11,30 @@ object NoJavaBootstrapTests extends UtestIntegrationTestSuite {
811
// Don't propagate `JAVA_HOME` to this test suite, because we want to exercise
912
// the code path where `JAVA_HOME` is not present during bootstrapping
1013
override def propagateJavaHome = false
14+
15+
// Compute the expected JVM version from the coursier index
16+
// In PRs bumping the index version, the JVM version might differ from the
17+
// one of the Mill process running the tests
18+
private lazy val expectedJavaVersion = {
19+
val cache = FileCache()
20+
val index = JvmIndex.load(
21+
cache = cache,
22+
repositories = Resolve().repositories,
23+
indexChannel = JvmChannel.module(
24+
JvmChannel.centralModule(),
25+
version = mill.api.BuildInfo.coursierJvmIndexVersion
26+
)
27+
)
28+
val jvmCache = JvmCache().withIndex(index)
29+
30+
val entry = jvmCache.entries(mill.client.BuildInfo.defaultJvmId).unsafeRun()(using cache.ec)
31+
.left.map(err => sys.error(err))
32+
.merge
33+
.last
34+
35+
entry.version
36+
}
37+
1138
val tests: Tests = Tests {
1239
test - integrationTest { tester =>
1340
import tester._
@@ -23,7 +50,7 @@ object NoJavaBootstrapTests extends UtestIntegrationTestSuite {
2350
stderr = os.Inherit
2451
)
2552

26-
assert(res1.out == System.getProperty("java.version"))
53+
assert(res1.out == expectedJavaVersion)
2754

2855
// Any `JavaModule`s run from the Mill server should also inherit
2956
// the default Mill Java version from it
@@ -33,7 +60,7 @@ object NoJavaBootstrapTests extends UtestIntegrationTestSuite {
3360
stderr = os.Inherit
3461
)
3562

36-
assert(res2.out == s"Hello World! ${System.getProperty("java.version")}")
63+
assert(res2.out == s"Hello World! $expectedJavaVersion")
3764
}
3865
}
3966
}

mill-build/src/millbuild/Deps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ object Deps {
179179
mvn"org.apache.maven.resolver:maven-resolver-transport-http:$mavenResolverVersion"
180180
val mavenResolverTransportWagon =
181181
mvn"org.apache.maven.resolver:maven-resolver-transport-wagon:$mavenResolverVersion"
182-
val coursierJvmIndexVersion = "0.0.4-84-f852c6"
182+
val coursierJvmIndexVersion = "0.0.4-111-eb6e08"
183183
val gradleApi = mvn"dev.gradleplugins:gradle-api:8.11.1"
184184

185185
val androidTools = mvn"com.android.tools.build:gradle:8.9.1"

0 commit comments

Comments
 (0)