Revert locally breaking changes for now (#5861)

Reverts:

- 4d37738
- fc16b4e
- c93e196

This will let us release 1.0.5 without any breakage, and we can delay
re-merging those PRs until releasing 1.1.0 later

Author: lihaoyi

.github/workflows/run-tests.yml

@@ -148,7 +148,7 @@ jobs:
           - java-version: 11
             millargs: "example.scalalib.__.local.daemon"
 
-          - java-version: 21
+          - java-version: 17
             millargs: "example.javalib.__.local.daemon"
 
           - java-version: 17
@@ -166,10 +166,10 @@ jobs:
           - java-version: 24
             millargs: "'example.{pythonlib,javascriptlib}.__.local.daemon'"
 
-          - java-version: 21
+          - java-version: 17
             millargs: "'example.{cli,fundamentals,depth,extending,large}.__.local.daemon'"
 
-          - java-version: 21
+          - java-version: 17.0.14
             millargs: "'integration.{feature,ide}.__.packaged.daemon'"
 
             # run this specifically in `native` mode to make sure our non-JVM native image

.mill-jvm-version

@@ -1 +1 @@
-zulu:21
+zulu:17.0.14

build.mill

@@ -74,10 +74,7 @@ def millBinPlatform: T[String] = Task {
   }
 }
 
-def defaultMillJvmVersion0 = Task.Source(BuildCtx.workspaceRoot / "default-mill-jvm-version")
-def defaultMillJvmVersion = Task {
-  os.read(defaultMillJvmVersion0().path).trim()
-}
+def millJvmVersion = Task.Source(BuildCtx.workspaceRoot / "default-mill-jvm-version")
 
 val essentialBridgeScalaVersions =
   Seq(Deps.scalaVersion, Deps.scala2Version, Deps.workerScalaVersion212)

ci/test-dist-run.sh

@@ -6,12 +6,12 @@ EXAMPLE=example/scalalib/basic/6-realistic
 
 rm -rf $EXAMPLE/out
 
-test ! -d $EXAMPLE/out/foo/3.3.6/compile.dest
+test ! -d $EXAMPLE/out/foo/3.3.3/compile.dest
 test ! -f $EXAMPLE/out/bar/2.13.16/assembly.dest/out.jar
 
-./mill -i dist.run $EXAMPLE -i "foo[3.3.6].run"
+./mill -i dist.run $EXAMPLE -i "foo[3.3.3].run"
 
-test -d $EXAMPLE/out/foo/3.3.6/compile.dest
+test -d $EXAMPLE/out/foo/3.3.3/compile.dest
 
 ./mill -i dist.run $EXAMPLE show "bar[2.13.16].assembly"
 

core/constants/src/mill/constants/CodeGenConstants.java

@@ -22,17 +22,19 @@ public class CodeGenConstants {
   /**
    * The name of the root build file
    */
-  public static final List<String> rootBuildFileNames = List.of("build.mill");
+  public static final List<String> rootBuildFileNames =
+      List.of("build.mill", "build.mill.scala", "build.sc");
 
   /**
    * The name of any sub-folder build files
    */
-  public static final List<String> nestedBuildFileNames = List.of("package.mill");
+  public static final List<String> nestedBuildFileNames =
+      List.of("package.mill", "package.mill.scala", "package.sc");
 
   /**
    * The extensions used by build files
    */
-  public static final List<String> buildFileExtensions = List.of("mill");
+  public static final List<String> buildFileExtensions = List.of("mill", "mill.scala", "sc");
 
   /**
    * The user-facing name for the root of the module tree.

default-mill-jvm-version

@@ -1 +1 @@
-zulu:21
+zulu:17.0.14

dist/package.mill

@@ -221,6 +221,7 @@ object `package` extends MillJavaModule with DistModule {
         val ignoreErrorsOnCI = Task.dest / exampleStr / "ignoreErrorsOnCI"
         if (os.exists(ignoreErrorsOnCI)) os.remove(ignoreErrorsOnCI)
         val buildMill = Task.dest / exampleStr / "build.mill"
+        os.write.over(buildMill, s"//| mill-version: ${build.millVersion()}\n" + os.read(buildMill))
         os.copy(bootstrapLauncher().path, Task.dest / exampleStr / "mill")
         os.copy(bootstrapLauncherBat().path, Task.dest / exampleStr / "mill.bat")
         val zip = Task.dest / s"$exampleStr.zip"

dist/scripts/src/mill.sh

@@ -57,6 +57,10 @@ MILL_BUILD_SCRIPT=""
 
 if [ -f "build.mill" ] ; then
   MILL_BUILD_SCRIPT="build.mill"
+elif [ -f "build.mill.scala" ] ; then
+  MILL_BUILD_SCRIPT="build.mill.scala"
+elif [ -f "build.sc" ] ; then
+  MILL_BUILD_SCRIPT="build.sc"
 fi
 
 # Please note, that if a MILL_VERSION is already set in the environment,

example/depth/javahome/1-custom-jvms/build.mill

@@ -54,7 +54,7 @@ Test foo.FooTest.testSimple finished...
 import scalalib.*
 
 object bar extends ScalaModule {
-  def scalaVersion = "2.13.16"
+  def scalaVersion = "2.13.12"
   def jvmId = "temurin:23.0.1"
   def jvmIndexVersion = "latest.release"
 }

example/extending/imports/3-contrib-dep/build.mill

@@ -5,7 +5,7 @@ import mill.*, scalalib.*
 import mill.contrib.buildinfo.BuildInfo
 
 object foo extends ScalaModule, BuildInfo {
-  def scalaVersion = "2.13.16"
+  def scalaVersion = "2.13.10"
   def buildInfoPackageName = "foo"
   def buildInfoMembers = Seq(
     BuildInfo.Value("scalaVersion", scalaVersion())
@@ -20,7 +20,7 @@ object foo extends ScalaModule, BuildInfo {
 
 > ./mill foo.run
 ...
-foo.BuildInfo.scalaVersion: 2.13.16
+foo.BuildInfo.scalaVersion: 2.13.10
 
 */