Skip to content

Commit 12db6c1

Browse files
authored
Split mill.scalalib out of mill.javalib (#5470)
Final follow up from #3567, breaking `libs.javalib` and `libs.scalalib` into two separate modules, with `scalalib` depending on `javalib` but not vice versa. Most files application code files were already split into two packages, though the tests were previously mostly in `scalalib` and were mostly moved unchanged with just package/import renamings. A few were split into two separate files to avoid circular dependencies between the two modules, e.g. Java and Scala versions of `GenIdeaModule.scala`, or Java and Scala versions of `JavaHomeTests`
1 parent b71a65a commit 12db6c1

File tree

334 files changed

+724
-928
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

334 files changed

+724
-928
lines changed

.scalafmt.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ project {
3232
"glob:**/javalib/test/resources/javalib/palantirformat/**",
3333
"glob:**/integration/failure/parse-error/**",
3434
"glob:**/testkit/test/resources/example-test-example-project/build.mill",
35-
"glob:**/javalib/test/resources/scalafmt/**",
36-
"glob:**/javalib/test/resources/spotless/**"
35+
"glob:**/scalalib/test/resources/scalafmt/**",
36+
"glob:**/scalalib/test/resources/spotless/**"
3737
]
3838
}
3939

contrib/artifactory/src/mill/contrib/artifactory/ArtifactoryPublishModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package mill.contrib.artifactory
22

33
import mill._
44
import mill.api.Result
5-
import scalalib._
5+
import javalib._
66
import mill.contrib.artifactory.ArtifactoryPublishModule.checkArtifactoryCreds
77
import mill.api.{ExternalModule, Task}
88

contrib/artifactory/src/mill/contrib/artifactory/ArtifactoryPublisher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package mill.contrib.artifactory
22

33
import mill.api.Logger
4-
import mill.scalalib.publish.Artifact
4+
import mill.javalib.publish.Artifact
55

66
class ArtifactoryPublisher(
77
releaseUri: String,

contrib/codeartifact/src/mill/contrib/codeartifact/CodeArtifactPublisher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import java.time.{Instant, ZoneId}
44
import java.time.format.DateTimeFormatter
55

66
import mill.api.Logger
7-
import mill.scalalib.publish.Artifact
7+
import mill.javalib.publish.Artifact
88

99
class CodeartifactPublisher(
1010
releaseUri: String,

contrib/codeartifact/src/mill/contrib/codeartifact/CodeartifactPublishModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package mill.contrib.codeartifact
22

33
import mill._
4-
import scalalib._
4+
import javalib._
55
import mill.api.ExternalModule
66

77
trait CodeartifactPublishModule extends PublishModule {

contrib/docker/src/mill/contrib/docker/DockerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package mill
22
package contrib.docker
33

4-
import mill.scalalib.JavaModule
4+
import mill.javalib.JavaModule
55
import os.Shellable.IterableShellable
66

77
import scala.collection.immutable._

contrib/docker/test/src/mill/contrib/docker/DockerModuleTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package mill
22
package contrib.docker
33

4-
import mill.scalalib.JavaModule
4+
import mill.javalib.JavaModule
55
import mill.api.ExecResult
66
import mill.api.Discover
77
import mill.testkit.UnitTester

contrib/flyway/src/mill/contrib/flyway/FlywayModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import scala.jdk.CollectionConverters._
1010

1111
import mill.*
1212
import mill.api.PathRef
13-
import mill.scalalib.{Dep, JavaModule}
13+
import mill.javalib.{Dep, JavaModule}
1414
import org.flywaydb.core.api.output.{BaselineResult, CleanResult, MigrateOutput, MigrateResult}
1515

1616
trait FlywayModule extends JavaModule {

contrib/flyway/test/src/mill/contrib/flyway/BuildTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package mill.contrib.flyway
22

33
import mill.*
44
import mill.api.Discover
5-
import mill.scalalib.*
5+
import mill.javalib.*
66
import mill.testkit.UnitTester
77
import mill.testkit.TestRootModule
88
import utest.{TestSuite, Tests, assert, *}

contrib/gitlab/src/mill/contrib/gitlab/GitlabPackageRepository.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package mill.contrib.gitlab
22

3-
import mill.scalalib.publish.Artifact
3+
import mill.javalib.publish.Artifact
44

55
sealed trait GitlabPackageRepository {
66
def url(): String

0 commit comments

Comments
 (0)