Skip to content

Commit 7be704c

Browse files
authored
Revert "Update mill-main to 0.11.5 (#2446)" (#2529)
This reverts commit 1a739e8.
1 parent 709a6c8 commit 7be704c

File tree

8 files changed

+23
-17
lines changed

8 files changed

+23
-17
lines changed

.mill-version

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

build.sc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,6 @@ 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-
854850
// Required by the reflection usage in modules/cli/src/test/scala/cli/tests/SetupScalaCLITests.scala
855851
override def forkArgs: T[Seq[String]] = T {
856852
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%" "--disable-callgraph-invalidation" %MILL_PARAMS%
121+
"%MILL%" %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}" "--disable-callgraph-invalidation" "$@"
175+
exec "${MILL}" "$@"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"methods": [
55
{
66
"name": "collectionClassName",
7-
"parameterTypes": []
7+
"parameterTypes": [
8+
]
89
}
910
]
1011
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
"methods": [
2828
{
2929
"name": "getPlatformClassLoader",
30-
"parameterTypes": []
30+
"parameterTypes": [
31+
]
3132
}
3233
]
3334
},

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,8 @@
828828
"methods": [
829829
{
830830
"name": "<init>",
831-
"parameterTypes": []
831+
"parameterTypes": [
832+
]
832833
}
833834
]
834835
},
@@ -837,7 +838,8 @@
837838
"methods": [
838839
{
839840
"name": "<init>",
840-
"parameterTypes": []
841+
"parameterTypes": [
842+
]
841843
}
842844
]
843845
},
@@ -927,7 +929,8 @@
927929
"methods": [
928930
{
929931
"name": "<init>",
930-
"parameterTypes": []
932+
"parameterTypes": [
933+
]
931934
}
932935
]
933936
},
@@ -947,7 +950,8 @@
947950
"methods": [
948951
{
949952
"name": "<init>",
950-
"parameterTypes": []
953+
"parameterTypes": [
954+
]
951955
}
952956
]
953957
},
@@ -957,7 +961,8 @@
957961
"methods": [
958962
{
959963
"name": "<init>",
960-
"parameterTypes": []
964+
"parameterTypes": [
965+
]
961966
}
962967
]
963968
},
@@ -966,7 +971,8 @@
966971
"methods": [
967972
{
968973
"name": "values",
969-
"parameterTypes": []
974+
"parameterTypes": [
975+
]
970976
}
971977
]
972978
},
@@ -975,7 +981,8 @@
975981
"methods": [
976982
{
977983
"name": "values",
978-
"parameterTypes": []
984+
"parameterTypes": [
985+
]
979986
}
980987
]
981988
},

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

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

0 commit comments

Comments
 (0)