Skip to content

Commit 1cee26e

Browse files
committed
fix mima
Signed-off-by: unlsycn <[email protected]>
1 parent 51c6387 commit 1cee26e

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

integration/feature/inspect/src/InspectTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ object InspectTests extends UtestIntegrationTestSuite {
146146
| mill.javalib.bsp.BspModule
147147
| mill.javalib.RunModule
148148
| mill.javalib.GenIdeaModule
149-
| mill.javalib.OfflineSupportModule
150149
| mill.javalib.SemanticDbJavaModule
150+
| mill.javalib.AssemblyModuleOfflineSupport
151151
| mill.javalib.AssemblyModule
152152
| mill.javalib.JavaModule
153153
|
@@ -171,8 +171,8 @@ object InspectTests extends UtestIntegrationTestSuite {
171171
| mill.javalib.bsp.BspModule
172172
| mill.javalib.RunModule
173173
| mill.javalib.GenIdeaModule
174-
| mill.javalib.OfflineSupportModule
175174
| mill.javalib.SemanticDbJavaModule
175+
| mill.javalib.AssemblyModuleOfflineSupport
176176
| mill.javalib.AssemblyModule
177177
| mill.javalib.JavaModule
178178
|

libs/javalib/src/mill/javalib/AssemblyModule.scala

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,16 @@ import mill.api.Task.Simple as T
88
import mill.javalib.Assembly.UnopenedInputStream
99
import mill.util.Jvm
1010

11+
trait AssemblyModuleOfflineSupport extends OfflineSupportModule {
12+
override def prepareOffline(all: mainargs.Flag): Task.Command[Seq[PathRef]] = Task.Command {
13+
AssemblyModule.prepareOffline(all)()
14+
}
15+
}
16+
1117
/**
1218
* Module that provides functionality around creating and configuring JVM assembly jars
1319
*/
14-
trait AssemblyModule extends mill.api.Module with OfflineSupportModule {
20+
trait AssemblyModule extends mill.api.Module with AssemblyModuleOfflineSupport {
1521
outer =>
1622

1723
def finalMainClassOpt: T[Either[String, String]]
@@ -148,22 +154,22 @@ trait AssemblyModule extends mill.api.Module with OfflineSupportModule {
148154
created.pathRef
149155
}
150156
}
151-
152-
override def prepareOffline(all: mainargs.Flag): Task.Command[Seq[PathRef]] = Task.Command {
153-
(
154-
super.prepareOffline(all)() ++
155-
AssemblyModule.jarjarabramsWorkerClasspath()
156-
).distinct
157-
}
158157
}
159-
object AssemblyModule extends ExternalModule with CoursierModule {
158+
object AssemblyModule extends ExternalModule with CoursierModule with OfflineSupportModule {
160159

161160
def jarjarabramsWorkerClasspath: T[Seq[PathRef]] = Task {
162161
defaultResolver().classpath(Seq(
163162
Dep.millProjectModule("mill-libs-javalib-jarjarabrams-worker")
164163
))
165164
}
166165

166+
override def prepareOffline(all: mainargs.Flag): Task.Command[Seq[PathRef]] = Task.Command {
167+
(
168+
super.prepareOffline(all)() ++
169+
jarjarabramsWorkerClasspath()
170+
).distinct
171+
}
172+
167173
private[mill] def jarjarabramsWorkerClassloader: Task.Worker[ClassLoader] = Task.Worker {
168174
Jvm.createClassLoader(
169175
classPath = jarjarabramsWorkerClasspath().map(_.path),

0 commit comments

Comments
 (0)