Cleanup

ajaychandran · ajaychandran · commit e95f93fe8899 · 2025-08-21T11:36:47.000+05:30
diff --git a/integration/manual/migrating-gradle/src/MillInitEhcache3Tests.scala b/integration/manual/migrating-gradle/src/MillInitEhcache3Tests.scala
@@ -13,7 +13,7 @@ object MillInitEhcache3Tests extends GitRepoIntegrationTestSuite {
   // bom dependencies
   // modules with pom packaging
   // Junit4
-  def gitRepoUrl = "git@github.com:ehcache/ehcache3.git"
+  def gitRepoUrl = "https://github.com/ehcache/ehcache3.git"
   def gitRepoBranch = "v3.10.8"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-gradle/src/MillInitFastCsvTests.scala b/integration/manual/migrating-gradle/src/MillInitFastCsvTests.scala
@@ -8,7 +8,7 @@ object MillInitFastCsvTests extends GitRepoIntegrationTestSuite {
   // gradle 9.0.0-rc-1
   // Junit5
   // uses ErrorProne
-  def gitRepoUrl = "git@github.com:osiegmar/FastCSV.git"
+  def gitRepoUrl = "https://github.com/osiegmar/FastCSV.git"
   def gitRepoBranch = "v4.0.0"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-gradle/src/MillInitJCommanderTests.scala b/integration/manual/migrating-gradle/src/MillInitJCommanderTests.scala
@@ -8,7 +8,7 @@ object MillInitJCommanderTests extends GitRepoIntegrationTestSuite {
   // gradle 8.9
   // single module
   // testng 7.0.0
-  def gitRepoUrl = "git@github.com:cbeust/jcommander.git"
+  def gitRepoUrl = "https://github.com/cbeust/jcommander.git"
   def gitRepoBranch = "2.0"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-gradle/src/MillInitMicroconfigTests.scala b/integration/manual/migrating-gradle/src/MillInitMicroconfigTests.scala
@@ -8,7 +8,7 @@ object MillInitMicroconfigTests extends GitRepoIntegrationTestSuite {
   // gradle 8.10.1
   // uses spring-boot-dependencies BOM
   // Junit5
-  def gitRepoUrl = "git@github.com:microconfig/microconfig.git"
+  def gitRepoUrl = "https://github.com/microconfig/microconfig.git"
   def gitRepoBranch = "v4.9.5"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-gradle/src/MillInitMockitoTests.scala b/integration/manual/migrating-gradle/src/MillInitMockitoTests.scala
@@ -7,7 +7,7 @@ object MillInitMockitoTests extends GitRepoIntegrationTestSuite {
 
   // gradle 8.14.2
   // contains BOM module
-  def gitRepoUrl = "git@github.com:mockito/mockito.git"
+  def gitRepoUrl = "https://github.com/mockito/mockito.git"
   def gitRepoBranch = "v5.19.0"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-gradle/src/MillInitPCollectionsTests.scala b/integration/manual/migrating-gradle/src/MillInitPCollectionsTests.scala
@@ -8,7 +8,7 @@ object MillInitPCollectionsTests extends GitRepoIntegrationTestSuite {
   // gradle 8.14.3
   // single module
   // Junit5
-  def gitRepoUrl = "git@github.com:hrldcpr/pcollections.git"
+  def gitRepoUrl = "https://github.com/hrldcpr/pcollections.git"
   def gitRepoBranch = "v5.0.0"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-gradle/src/MillInitSpotbugsTests.scala b/integration/manual/migrating-gradle/src/MillInitSpotbugsTests.scala
@@ -10,7 +10,7 @@ object MillInitSpotbugsTests extends GitRepoIntegrationTestSuite {
   // dependencies with version constraints
   // custom layout
   // Junit5
-  def gitRepoUrl = "git@github.com:spotbugs/spotbugs.git"
+  def gitRepoUrl = "https://github.com/spotbugs/spotbugs.git"
   def gitRepoBranch = "4.9.4"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitAirstreamTests.scala b/integration/manual/migrating-sbt/src/MillInitAirstreamTests.scala
@@ -9,7 +9,7 @@ object MillInitAirstreamTests extends GitRepoIntegrationTestSuite {
   // cross Scala versions 3.3.3 2.13.16
   // single ScalaJS root module
   // scalajs-dom dependency
-  def gitRepoUrl = "git@github.com:raquo/Airstream.git"
+  def gitRepoUrl = "https://github.com/raquo/Airstream.git"
   def gitRepoBranch = "v17.2.1"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitCatsTests.scala b/integration/manual/migrating-sbt/src/MillInitCatsTests.scala
@@ -10,7 +10,7 @@ object MillInitCatsTests extends GitRepoIntegrationTestSuite {
   // sources for cross Scala version ranges
   // sbt-crossproject 1.3.2
   // different CrossType modules
-  def gitRepoUrl = "git@github.com:typelevel/cats.git"
+  def gitRepoUrl = "https://github.com/typelevel/cats.git"
   def gitRepoBranch = "v2.13.0"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitEnumeratumTests.scala b/integration/manual/migrating-sbt/src/MillInitEnumeratumTests.scala
@@ -8,7 +8,7 @@ object MillInitEnumeratumTests extends GitRepoIntegrationTestSuite {
   // sbt 1.10.7
   // cross Scala versions 2.12.20 2.13.16 3.3.5
   // sbt-crossproject 1.3.2
-  def gitRepoUrl = "git@github.com:lloydmeta/enumeratum.git"
+  def gitRepoUrl = "https://github.com/lloydmeta/enumeratum.git"
   def gitRepoBranch = "enumeratum-1.9.0"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitFs2Tests.scala b/integration/manual/migrating-sbt/src/MillInitFs2Tests.scala
@@ -10,7 +10,7 @@ object MillInitFs2Tests extends GitRepoIntegrationTestSuite {
   // sbt-crossproject 1.3.2
   // cross partial source roots in core, io
   // .sbtopts with JVM args
-  def gitRepoUrl = "git@github.com:typelevel/fs2.git"
+  def gitRepoUrl = "https://github.com/typelevel/fs2.git"
   def gitRepoBranch = "v3.12.0"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitGatlingTests.scala b/integration/manual/migrating-sbt/src/MillInitGatlingTests.scala
@@ -7,7 +7,7 @@ object MillInitGatlingTests extends GitRepoIntegrationTestSuite {
 
   // sbt 1.10.11
   // Scala version 2.13.16
-  def gitRepoUrl = "git@github.com:gatling/gatling.git"
+  def gitRepoUrl = "https://github.com/gatling/gatling.git"
   def gitRepoBranch = "v3.14.3"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitLilaTests.scala b/integration/manual/migrating-sbt/src/MillInitLilaTests.scala
@@ -7,7 +7,7 @@ object MillInitLilaTests extends GitRepoIntegrationTestSuite {
 
   // sbt 1.11.3
   // Scala version 3.7.2
-  def gitRepoUrl = "git@github.com:lichess-org/lila.git"
+  def gitRepoUrl = "https://github.com/lichess-org/lila.git"
   def gitRepoBranch = "master"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitNscalaTimeTests.scala b/integration/manual/migrating-sbt/src/MillInitNscalaTimeTests.scala
@@ -8,7 +8,7 @@ object MillInitNscalaTimeTests extends GitRepoIntegrationTestSuite {
   // sbt 1.10.7
   // cross Scala versions 2.11.12 2.12.20 2.13.15 3.3.4
   // single root module
-  def gitRepoUrl = "git@github.com:nscala-time/nscala-time.git"
+  def gitRepoUrl = "https://github.com/nscala-time/nscala-time.git"
   def gitRepoBranch = "releases/3.0.0"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitRefinedTests.scala b/integration/manual/migrating-sbt/src/MillInitRefinedTests.scala
@@ -8,7 +8,7 @@ object MillInitRefinedTests extends GitRepoIntegrationTestSuite {
   // sbt 1.10.7
   // cross Scala versions 2.12.20 2.13.15 3.3.4
   // sbt-crossproject 1.3.2
-  def gitRepoUrl = "git@github.com:fthomas/refined.git"
+  def gitRepoUrl = "https://github.com/fthomas/refined.git"
   def gitRepoBranch = "v0.11.3"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitScala3Tests.scala b/integration/manual/migrating-sbt/src/MillInitScala3Tests.scala
@@ -7,7 +7,7 @@ object MillInitScala3Tests extends GitRepoIntegrationTestSuite {
 
   // sbt 1.11.0
   // Scala version 3.7.0
-  def gitRepoUrl = "git@github.com:scala/scala3.git"
+  def gitRepoUrl = "https://github.com/scala/scala3.git"
   def gitRepoBranch = "3.7.1"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitScalaLoggingTests.scala b/integration/manual/migrating-sbt/src/MillInitScalaLoggingTests.scala
@@ -8,7 +8,7 @@ object MillInitScalaLoggingTests extends GitRepoIntegrationTestSuite {
   // sbt 1.6.2
   // cross Scala versions 2.11.12 2.12.15 2.13.8 3.1.2
   // single root module
-  def gitRepoUrl = "git@github.com:lightbend-labs/scala-logging.git"
+  def gitRepoUrl = "https://github.com/lightbend-labs/scala-logging.git"
   def gitRepoBranch = "v3.9.5"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitScalaPBTests.scala b/integration/manual/migrating-sbt/src/MillInitScalaPBTests.scala
@@ -6,7 +6,7 @@ import utest.*
 object MillInitScalaPBTests extends GitRepoIntegrationTestSuite {
 
   // sbt 1.11.2
-  def gitRepoUrl = "git@github.com:scalapb/ScalaPB.git"
+  def gitRepoUrl = "https://github.com/scalapb/ScalaPB.git"
   def gitRepoBranch = "v0.11.19"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitScoptTests.scala b/integration/manual/migrating-sbt/src/MillInitScoptTests.scala
@@ -9,7 +9,7 @@ object MillInitScoptTests extends GitRepoIntegrationTestSuite {
   // cross Scala versions 2.11.12 2.12.16 2.13.8 3.1.3
   // sbt-crossproject 1.0.0
   // single cross-platform/version root module
-  def gitRepoUrl = "git@github.com:scopt/scopt.git"
+  def gitRepoUrl = "https://github.com/scopt/scopt.git"
   def gitRepoBranch = "v4.1.0"
 
   def tests = Tests {
diff --git a/integration/manual/migrating-sbt/src/MillInitScryptoTests.scala b/integration/manual/migrating-sbt/src/MillInitScryptoTests.scala
@@ -9,7 +9,7 @@ object MillInitScryptoTests extends GitRepoIntegrationTestSuite {
   // cross Scala versions 2.11.12 2.12.20, 2.13.16 3.3.5
   // sbt-crossproject 1.3.2
   // root is a cross-platform/version module
-  def gitRepoUrl = "git@github.com:input-output-hk/scrypto.git"
+  def gitRepoUrl = "https://github.com/input-output-hk/scrypto.git"
   def gitRepoBranch = "v3.1.0"
 
   def tests = Tests {
diff --git a/integration/migrating/init/src/MillInitGradleTests.scala b/integration/migrating/init/src/MillInitGradleTests.scala
@@ -2,81 +2,81 @@ package mill.integration
 
 import mill.constants.Util
 import mill.integration.MillInitUtils.*
-import mill.testkit.GitRepoIntegrationTestSuite
 import utest.*
 
 import scala.collection.immutable.{Seq, SortedSet}
 
-object MillInitGradleJCommanderTests extends GitRepoIntegrationTestSuite {
-
-  // gradle 8.9
-  // single module
-  // testng 7.0.0
-  def gitRepoUrl = "git@github.com:cbeust/jcommander.git"
-  def gitRepoBranch = "2.0"
+object MillInitGradleJCommanderTests extends BuildGenTestSuite {
 
   def tests: Tests = Tests {
-    test - integrationTest { tester =>
-      import tester.*
-
-      writeMillJvmVersion(workspacePath, "11")
-
-      eval("init").isSuccess ==> true
-      eval("publishLocal").isSuccess ==> true // implies compile
-
-      // annotations defined in main-module cannot be used in test-module?
-      eval("test.compile").err.linesIterator.exists(_.contains(
-        "jcommander/src/test/java/com/beust/jcommander/ParameterOrderTest.java:33:23: cannot find symbol"
-      )) ==> true
-    }
+    // - single module
+    // - custom javacOptions
+    // - TestNg
+    // - Gradle 8.9
+    val url = "https://github.com/cbeust/jcommander/archive/refs/tags/2.0.zip"
+
+    test - integrationTest(url)(
+      testMillInit(
+        _,
+        initCommand = Seq("init"),
+        expectedAllSourceFileNums = Map("allSourceFiles" -> 65, "test.allSourceFiles" -> 107),
+        expectedCompileTaskResults =
+          Some(SplitTaskResults(
+            successful = SortedSet("compile"),
+            // errors related to annotation classes defined in main module
+            failed = SortedSet("test.compile")
+          )),
+        expectedTestTaskResults =
+          Some(SplitTaskResults(successful = SortedSet(), failed = SortedSet("test")))
+      )
+    )
   }
 }
 
-object MillInitGradleFastCsvTests extends GitRepoIntegrationTestSuite {
-
-  // gradle 9.0.0-rc-1
-  // Junit5
-  def gitRepoUrl = "git@github.com:osiegmar/FastCSV.git"
-  def gitRepoBranch = "v4.0.0"
+object MillInitGradleFastCsvTests extends BuildGenTestSuite {
 
   def tests: Tests = Tests {
-    test - integrationTest { tester =>
-      import tester.*
-
-      // from tasks.compileJava.options.release
-      writeMillJvmVersion(workspacePath, "17")
-
-      eval("init").isSuccess ==> true
-      eval("lib.publishLocal").isSuccess ==> true // implies compile
-
-      // requires javacOptions for Java modules
-      eval("example.compile").err.linesIterator.exists(_.contains(
-        "FastCSV/example/src/main/java/module-info.java:3:24: module not found: de.siegmar.fastcsv"
-      )) ==> true
-
-      // junit-platform-launcher version is set implicitly (tasks.test.useJunitPlatform())
-      eval("lib.test.compile").err.linesIterator.exists(_.contains(
-        "lib.test.resolvedMvnDeps coursier.error.ResolutionError$Several: Error downloading org.junit.platform:junit-platform-launcher:"
-      )) ==> true
+    // - multi-module
+    // - JUnit 5
+    // - requires Java 17+
+    // - Gradle 8.10.1
+    val url = "https://github.com/osiegmar/FastCSV/archive/refs/tags/v3.4.0.zip"
+
+    test - integrationTest(url) { tester =>
+      writeMillJvmVersion(tester.workspacePath, "17")
+
+      testMillInit(
+        tester,
+        initCommand = Seq("init"),
+        expectedAllSourceFileNums = Map(
+          "example.allSourceFiles" -> 24,
+          "lib.allSourceFiles" -> 41,
+          "lib.test.allSourceFiles" -> 9
+        ),
+        expectedCompileTaskResults = Some(SplitTaskResults(
+          successful = SortedSet("lib.compile"),
+          failed = SortedSet(
+            "example.compile",
+            "lib.test.compile"
+          )
+        )),
+        expectedTestTaskResults =
+          Some(SplitTaskResults(successful = SortedSet(), failed = SortedSet("lib.test")))
+      )
     }
   }
 }
 
-object MillInitGradleEhcache3Tests extends GitRepoIntegrationTestSuite {
-
-  // gradle 7.2
-  // custom dependency configurations
-  // dependencies with version constraints
-  // custom layout
-  // custom repository
-  // bom dependencies
-  // modules with pom packaging
-  // Junit4
-  def gitRepoUrl = "git@github.com:ehcache/ehcache3.git"
-  def gitRepoBranch = "v3.10.8"
+object MillInitGradleEhcache3Tests extends BuildGenTestSuite {
 
   def tests: Tests = Tests {
-    test - integrationTest { tester =>
+    // - multi-level modules
+    // - additional repository (Terracotta)
+    // - JUnit 5
+    // - Gradle 7.6.2
+    val url = "https://github.com/ehcache/ehcache3/archive/refs/tags/v3.10.8.zip"
+
+    test - integrationTest(url) { tester =>
       // Takes forever on windows
       if (!Util.isWindows) {
         writeMillJvmVersionTemurin11(tester.workspacePath)
