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]>
VirtusLab · Nov 8, 2023 · 1a739e8 · 1a739e8
1 parent 54a7cb2
commit 1a739e8
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 23 deletions.
diff --git a/.mill-version b/.mill-version
@@ -1 +1 @@
-0.11.1
+0.11.5
diff --git a/build.sc b/build.sc
@@ -847,6 +847,10 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
       super.runClasspath() ++ Seq(localRepoJar())
     }
 
+    def compileIvyDeps = super.ivyDeps() ++ Agg(
+      Deps.jsoniterMacros
+    )
+
     // Required by the reflection usage in modules/cli/src/test/scala/cli/tests/SetupScalaCLITests.scala
     override def forkArgs: T[Seq[String]] = T {
       super.forkArgs() ++ Seq("--add-opens=java.base/java.util=ALL-UNNAMED")

diff --git a/mill.bat b/mill.bat
@@ -118,4 +118,4 @@ if defined STRIP_VERSION_PARAMS (
     )
 )
 
-"%MILL%" %MILL_PARAMS%
+"%MILL%" "--disable-callgraph-invalidation" %MILL_PARAMS%
diff --git a/millw b/millw
@@ -172,4 +172,4 @@ unset MILL_VERSION
 unset MILL_VERSION_TAG
 unset MILL_REPO_URL
 
-exec "${MILL}" "$@"
+exec "${MILL}" "--disable-callgraph-invalidation" "$@"
diff --git a/modules/cli/src/main/resources/META-INF/native-image/extras/pprint/reflect-config.json b/modules/cli/src/main/resources/META-INF/native-image/extras/pprint/reflect-config.json
@@ -4,8 +4,7 @@
     "methods": [
       {
         "name": "collectionClassName",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   }

diff --git a/...cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/jni-config.json b/...cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/jni-config.json
@@ -27,8 +27,7 @@
     "methods": [
       {
         "name": "getPlatformClassLoader",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },

diff --git a/...src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json b/...src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json
@@ -828,8 +828,7 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -838,8 +837,7 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -929,8 +927,7 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -950,8 +947,7 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -961,8 +957,7 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -971,8 +966,7 @@
     "methods": [
       {
         "name": "values",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -981,8 +975,7 @@
     "methods": [
       {
         "name": "values",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },

diff --git a/...rc/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/resource-config.json b/...rc/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/resource-config.json
@@ -27,6 +27,5 @@
       }
     ]
   },
-  "bundles": [
-  ]
+  "bundles": []
 }