Skip to content

Commit 84c9c7e

Browse files
autofix-ci[bot]lefou
authored andcommitted
[autofix.ci] apply automated fixes
1 parent 7fbd722 commit 84c9c7e

File tree

16 files changed

+97
-45
lines changed

16 files changed

+97
-45
lines changed

core/api/daemon/src/mill/api/daemon/internal/OptsApi.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ trait OptsApi {
55
def value: Seq[OptGroupApi]
66
}
77

8-
trait OptGroupApi {
9-
}
8+
trait OptGroupApi {}
109

1110
trait OptApi {
1211
def toString(): String

core/api/src/mill/api/opt/Opt.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ object Opt {
8383
// implicit def IterableToOpt[T](s: Iterable[T])(using f: T => Opt): Opt =
8484
// Opt(s.toSeq.flatMap(f(_).value))
8585

86-
8786
implicit def StringToOpt(s: String): Opt = Opt(s)
8887

8988
implicit def OsPathToOpt(p: os.Path): Opt = Opt(p)

core/api/src/mill/api/opt/OptGroup.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,4 @@ object OptGroup {
5050
// implicit def ArrayToOptGroup[T](s: Array[T])(using f: T => OptGroup): OptGroup =
5151
// OptGroup(s.flatMap(f(_).value))
5252

53-
5453
}

core/api/test/src/mill/api/ApplicativeTests.scala

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ object ApplicativeTests extends TestSuite {
2424
test("selfContained") {
2525

2626
test("simple") - assert(TestOpt("lol " + 1) == TestOpt.some("lol 1"))
27-
test("singleSome") - assert(TestOpt("lol " + TestOpt.some("hello")()) == TestOpt.some("lol hello"))
27+
test("singleSome") - assert(
28+
TestOpt("lol " + TestOpt.some("hello")()) == TestOpt.some("lol hello")
29+
)
2830
test("twoSomes") - assert(
2931
TestOpt(TestOpt.some("lol ")() + TestOpt.some("hello")()) == TestOpt.some("lol hello")
3032
)
@@ -35,27 +37,55 @@ object ApplicativeTests extends TestSuite {
3537
TestOpt(
3638
"lol " +
3739
TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.none() +
38-
TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.some(" world")() +
40+
TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.some(
41+
" world"
42+
)() +
3943
TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.none() +
4044
TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.none() +
41-
TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.some(" moo")()
45+
TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.none() + TestOpt.some(
46+
" moo"
47+
)()
4248
) == TestOpt.none
4349
)
4450
assert(
4551
TestOpt(
4652
"lol " +
47-
TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some("c")() + TestOpt.some("d")() +
48-
TestOpt.some("e")() + TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some("c")() +
49-
TestOpt.some("d")() + TestOpt.some("e")() + TestOpt.some("a")() + TestOpt.some("b")() +
50-
TestOpt.some("c")() + TestOpt.some("d")() + TestOpt.some("e")() + TestOpt.some("a")() +
51-
TestOpt.some("b")() + TestOpt.some("c")() + TestOpt.some("d")() + TestOpt.some("e")() +
52-
TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some("c")() + TestOpt.some("d")() +
53-
TestOpt.some("e")() + TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some("c")() +
54-
TestOpt.some("d")() + TestOpt.some("e")() + TestOpt.some("a")() + TestOpt.some("b")() +
55-
TestOpt.some("c")() + TestOpt.some("d")() + TestOpt.some("e")() + TestOpt.some("a")() +
56-
TestOpt.some("b")() + TestOpt.some("c")() + TestOpt.some("d")() + TestOpt.some("e")() +
57-
TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some("c")() + TestOpt.some("d")() +
58-
TestOpt.some("e")() + TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some("c")() +
53+
TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some("c")() + TestOpt.some(
54+
"d"
55+
)() +
56+
TestOpt.some("e")() + TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some(
57+
"c"
58+
)() +
59+
TestOpt.some("d")() + TestOpt.some("e")() + TestOpt.some("a")() + TestOpt.some(
60+
"b"
61+
)() +
62+
TestOpt.some("c")() + TestOpt.some("d")() + TestOpt.some("e")() + TestOpt.some(
63+
"a"
64+
)() +
65+
TestOpt.some("b")() + TestOpt.some("c")() + TestOpt.some("d")() + TestOpt.some(
66+
"e"
67+
)() +
68+
TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some("c")() + TestOpt.some(
69+
"d"
70+
)() +
71+
TestOpt.some("e")() + TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some(
72+
"c"
73+
)() +
74+
TestOpt.some("d")() + TestOpt.some("e")() + TestOpt.some("a")() + TestOpt.some(
75+
"b"
76+
)() +
77+
TestOpt.some("c")() + TestOpt.some("d")() + TestOpt.some("e")() + TestOpt.some(
78+
"a"
79+
)() +
80+
TestOpt.some("b")() + TestOpt.some("c")() + TestOpt.some("d")() + TestOpt.some(
81+
"e"
82+
)() +
83+
TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some("c")() + TestOpt.some(
84+
"d"
85+
)() +
86+
TestOpt.some("e")() + TestOpt.some("a")() + TestOpt.some("b")() + TestOpt.some(
87+
"c"
88+
)() +
5989
TestOpt.some("d")() + TestOpt.some("e")()
6090
) == TestOpt.some("lol abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde")
6191
)
@@ -68,7 +98,9 @@ object ApplicativeTests extends TestSuite {
6898
val lol = "lol "
6999
def hell(o: String) = "hell" + o
70100
test("simple") - assert(TestOpt(lol + 1) == TestOpt.some("lol 1"))
71-
test("singleSome") - assert(TestOpt(lol + TestOpt.some(hell("o"))()) == TestOpt.some("lol hello"))
101+
test("singleSome") - assert(
102+
TestOpt(lol + TestOpt.some(hell("o"))()) == TestOpt.some("lol hello")
103+
)
72104
test("twoSomes") - assert(
73105
TestOpt(TestOpt.some(lol)() + TestOpt.some(hell("o"))()) == TestOpt.some("lol hello")
74106
)

libs/androidlib/src/mill/androidlib/AndroidKotlinModule.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ import mill.api.opt.*
66
import mill.javalib.{CoursierModule, Dep}
77
import mill.kotlinlib.{Dep, DepSyntax, KotlinModule, KotlincOptions}
88
import mill.{T, Task}
9-
import mill.androidlib.databinding.{AndroidDataBindingWorker, AndroidDataBindingWorkerModule, GenerateBindingSourcesArgs, ProcessResourcesArgs}
9+
import mill.androidlib.databinding.{
10+
AndroidDataBindingWorker,
11+
AndroidDataBindingWorkerModule,
12+
GenerateBindingSourcesArgs,
13+
ProcessResourcesArgs
14+
}
1015
import mill.util.Jvm
1116

1217
// TODO expose Compose configuration options

libs/androidlib/src/mill/androidlib/AndroidModule.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,8 @@ trait AndroidModule extends JavaModule { outer =>
516516
* The Java compiled classes of [[androidResources]]
517517
*/
518518
def androidCompiledRClasses: T[CompilationResult] = Task(persistent = true) {
519-
val jOpts = JavaCompilerOptions.split(javacOptions().toStringSeq ++ mandatoryJavacOptions().toStringSeq)
519+
val jOpts =
520+
JavaCompilerOptions.split(javacOptions().toStringSeq ++ mandatoryJavacOptions().toStringSeq)
520521
val worker = jvmWorker().internalWorker()
521522
worker.apply(
522523
ZincCompileJava(
@@ -728,7 +729,8 @@ trait AndroidModule extends JavaModule { outer =>
728729

729730
val rJar = Task.dest / "R.jar"
730731

731-
val jOpts = JavaCompilerOptions.split(javacOptions().toStringSeq ++ mandatoryJavacOptions().toStringSeq)
732+
val jOpts =
733+
JavaCompilerOptions.split(javacOptions().toStringSeq ++ mandatoryJavacOptions().toStringSeq)
732734
val worker = jvmWorker().internalWorker()
733735
val classesDest = worker
734736
.apply(

libs/javalib/src/mill/javalib/JavaModule.scala

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,25 @@ import coursier.params.ResolutionParams
77
import coursier.parse.{JavaOrScalaModule, ModuleParser}
88
import coursier.util.{EitherT, ModuleMatcher, Monad}
99
import mainargs.Flag
10-
import mill.api.{DefaultTaskModule, MillException, ModuleRef, PathRef, Result, Segment, Task, TaskCtx}
10+
import mill.api.{
11+
DefaultTaskModule,
12+
MillException,
13+
ModuleRef,
14+
PathRef,
15+
Result,
16+
Segment,
17+
Task,
18+
TaskCtx
19+
}
1120
import mill.api.opt.*
1221
import mill.api.daemon.internal.{EvaluatorApi, JavaModuleApi, internal}
13-
import mill.api.daemon.internal.bsp.{BspBuildTarget, BspJavaModuleApi, BspModuleApi, BspUri, JvmBuildTarget}
22+
import mill.api.daemon.internal.bsp.{
23+
BspBuildTarget,
24+
BspJavaModuleApi,
25+
BspModuleApi,
26+
BspUri,
27+
JvmBuildTarget
28+
}
1429
import mill.api.daemon.internal.eclipse.GenEclipseInternalApi
1530
import mill.javalib.*
1631
import mill.api.daemon.internal.idea.GenIdeaInternalApi

libs/javalib/src/mill/javalib/JavacOptions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ object JavacOptions {
55
val `-target` = "-target"
66
val `-source` = "-source"
77
val `-deprecation` = "-deprecation"
8-
8+
99
}

libs/javalib/src/mill/javalib/SemanticDbJavaModule.scala

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
package mill.javalib
22

3-
import mill.api.{
4-
BuildCtx,
5-
Discover,
6-
ExternalModule,
7-
ModuleRef,
8-
PathRef,
9-
Result,
10-
experimental
11-
}
3+
import mill.api.{BuildCtx, Discover, ExternalModule, ModuleRef, PathRef, Result, experimental}
124
import mill.api.daemon.internal.SemanticDbJavaModuleApi
135
import mill.api.opt.*
146
import mill.constants.CodeGenConstants

libs/javalib/src/mill/javalib/errorprone/ErrorProneModule.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import mill.api.opt.*
55
import mill.javalib.{Dep, DepSyntax, JavaModule}
66
import mill.{T, Task}
77

8-
import java.io.File
98

109
/**
1110
* Integrated Error Prone into a [[JavaModule]].

0 commit comments

Comments
 (0)