Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Update Mill to 0.12.0 #3113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 25, 2024
Merged

Update Mill to 0.12.0 #3113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d318dd
Update Mill to 0.12
alexarchambault Oct 24, 2024
fbb3010
Address Mill 0.12.0 deprecations in build sources
alexarchambault Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mill-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.12
0.12.0
3 changes: 2 additions & 1 deletion build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ object `bootstrap-launcher` extends BootstrapLauncher { self =>
Agg(Deps.windowsAnsiPs.exclude("*" -> "*"))
.map(bindDependency())
},
sources = true
sources = true,
artifactTypes = None
)()
jars.foreach { jar =>
mill.api.IO.unpackZip(jar.path, os.rel)
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-tests/src/main/scala/coursier/clitests/BootstrapTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ abstract class BootstrapTests extends TestSuite with LauncherOptions {
Thread.sleep(100L)
if (proc.isAlive()) {
Thread.sleep(1000L)
proc.destroyForcibly()
proc.destroy(shutdownGracePeriod = 0)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions project/shading.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ trait Shading extends JavaModule with PublishModule {
def shadedJars = T {
val depToDependency = (d: Dep) => bindDependency().apply(d).dep
val depSeq = transitiveIvyDeps().map(_.toDep)
val (_, resolution) = mill.util.Jvm.resolveDependenciesMetadata(
val resolution = mill.util.Jvm.resolveDependenciesMetadataSafe(
repositoriesTask(),
deps = depSeq.map(depToDependency),
force = depSeq.filter(_.force).map(depToDependency),
mapDependencies = Some(mapDependencies()),
customizer = resolutionCustomizer(),
ctx = Some(implicitly[mill.api.Ctx.Log]),
coursierCacheCustomizer = None
)
).getOrThrow
val types = Set(
coursier.Type.jar,
coursier.Type.testJar,
Expand Down
4 changes: 2 additions & 2 deletions project/workers.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ final class RedirectingServer(
}

override def close(): Unit =
proc.destroyForcibly()
proc.destroy(shutdownGracePeriod = 0)
}

trait UsesRedirectingServer extends Module {
Expand Down Expand Up @@ -101,7 +101,7 @@ final class TestRepoServer(
}

override def close(): Unit =
proc.destroyForcibly()
proc.destroy(shutdownGracePeriod = 0)
}

private def randomPort(): Int = {
Expand Down
Loading