Skip to content

Commit 1a739e8

Browse files
Update mill-main to 0.11.5 (#2446)
* Update mill-main to 0.11.5 * Add --disable-callgraph-invalidation flag to mill invocations * Add missing dependency * Format Native Image Configuration files --------- Co-authored-by: Maciej Gajek <[email protected]>
1 parent 54a7cb2 commit 1a739e8

File tree

8 files changed

+17
-23
lines changed

8 files changed

+17
-23
lines changed

.mill-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.11.1
1+
0.11.5

build.sc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,10 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
847847
super.runClasspath() ++ Seq(localRepoJar())
848848
}
849849

850+
def compileIvyDeps = super.ivyDeps() ++ Agg(
851+
Deps.jsoniterMacros
852+
)
853+
850854
// Required by the reflection usage in modules/cli/src/test/scala/cli/tests/SetupScalaCLITests.scala
851855
override def forkArgs: T[Seq[String]] = T {
852856
super.forkArgs() ++ Seq("--add-opens=java.base/java.util=ALL-UNNAMED")

mill.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ if defined STRIP_VERSION_PARAMS (
118118
)
119119
)
120120

121-
"%MILL%" %MILL_PARAMS%
121+
"%MILL%" "--disable-callgraph-invalidation" %MILL_PARAMS%

millw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,4 @@ unset MILL_VERSION
172172
unset MILL_VERSION_TAG
173173
unset MILL_REPO_URL
174174

175-
exec "${MILL}" "$@"
175+
exec "${MILL}" "--disable-callgraph-invalidation" "$@"

modules/cli/src/main/resources/META-INF/native-image/extras/pprint/reflect-config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"methods": [
55
{
66
"name": "collectionClassName",
7-
"parameterTypes": [
8-
]
7+
"parameterTypes": []
98
}
109
]
1110
}

modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/jni-config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
"methods": [
2828
{
2929
"name": "getPlatformClassLoader",
30-
"parameterTypes": [
31-
]
30+
"parameterTypes": []
3231
}
3332
]
3433
},

modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -828,8 +828,7 @@
828828
"methods": [
829829
{
830830
"name": "<init>",
831-
"parameterTypes": [
832-
]
831+
"parameterTypes": []
833832
}
834833
]
835834
},
@@ -838,8 +837,7 @@
838837
"methods": [
839838
{
840839
"name": "<init>",
841-
"parameterTypes": [
842-
]
840+
"parameterTypes": []
843841
}
844842
]
845843
},
@@ -929,8 +927,7 @@
929927
"methods": [
930928
{
931929
"name": "<init>",
932-
"parameterTypes": [
933-
]
930+
"parameterTypes": []
934931
}
935932
]
936933
},
@@ -950,8 +947,7 @@
950947
"methods": [
951948
{
952949
"name": "<init>",
953-
"parameterTypes": [
954-
]
950+
"parameterTypes": []
955951
}
956952
]
957953
},
@@ -961,8 +957,7 @@
961957
"methods": [
962958
{
963959
"name": "<init>",
964-
"parameterTypes": [
965-
]
960+
"parameterTypes": []
966961
}
967962
]
968963
},
@@ -971,8 +966,7 @@
971966
"methods": [
972967
{
973968
"name": "values",
974-
"parameterTypes": [
975-
]
969+
"parameterTypes": []
976970
}
977971
]
978972
},
@@ -981,8 +975,7 @@
981975
"methods": [
982976
{
983977
"name": "values",
984-
"parameterTypes": [
985-
]
978+
"parameterTypes": []
986979
}
987980
]
988981
},

modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/resource-config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,5 @@
2727
}
2828
]
2929
},
30-
"bundles": [
31-
]
30+
"bundles": []
3231
}

0 commit comments

Comments
 (0)