Skip to content

Commit ebd95e1

Browse files
authored
Fix BuildInfo static Java file generator (#3074)
Fix #3073 Pull request: #3074
1 parent 8b46150 commit ebd95e1

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

contrib/buildinfo/src/mill/contrib/buildinfo/BuildInfo.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ object BuildInfo {
139139
|public class $buildInfoObjectName {
140140
| $bindingsCode
141141
|
142-
| public static java.util.Map<String, String> toMap() {
143-
| Map<String, String> map = new HashMap<String, String>();
142+
| public static java.util.Map<java.lang.String, java.lang.String> toMap() {
143+
| java.util.Map<java.lang.String, java.lang.String> map = new java.util.HashMap<java.lang.String, java.lang.String>();
144144
| $mapEntries
145145
| return map;
146146
| }

contrib/buildinfo/test/src/mill/contrib/buildinfo/BuildInfoTests.scala

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,19 @@ object BuildInfoTests extends TestSuite {
207207
)
208208
}
209209

210+
"java-static" - workspaceTest(BuildInfoJavaStatic, "java") { eval =>
211+
val runResult = eval.outPath / "hello-mill"
212+
val generatedSrc = eval.outPath / "buildInfoSources.dest" / "foo" / "BuildInfo.java"
213+
val Right((result, evalCount)) =
214+
eval.apply(BuildInfoJavaStatic.run(T.task(Args(runResult.toString))))
215+
216+
assert(
217+
os.exists(runResult),
218+
os.exists(generatedSrc),
219+
os.read(runResult) == "not-provided-for-java-modules"
220+
)
221+
}
222+
210223
"generatedSources must be a folder" - workspaceTest(BuildInfoPlain, "scala") { eval =>
211224
val buildInfoGeneratedSourcesFolder = eval.outPath / "buildInfoSources.dest"
212225
val Right((result, evalCount)) = eval.apply(BuildInfoPlain.generatedSources)

0 commit comments

Comments
 (0)