Skip to content

Commit 25cffaa

Browse files
committed
wip
1 parent 95d0433 commit 25cffaa

File tree

4 files changed

+305
-51
lines changed

4 files changed

+305
-51
lines changed

.jvmopts

Lines changed: 0 additions & 7 deletions
This file was deleted.

.mill-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

build.mill

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
//| mill-version: 1.0.0-RC1
2+
//| mill-jvm-opts: ["-XX:NonProfiledCodeHeapSize=250m", "-XX:ReservedCodeCacheSize=500m", "-Xss10m"]
3+
//| mill-opts: ["--jobs=0.5C"]
4+
//| mvnDeps:
5+
//| - com.github.lolgab::mill-mima_mill1.0.0-RC1:0.2.0-M1
16
package build
2-
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
3-
import $ivy.`com.github.lolgab::mill-mima::0.1.0`
47

58
import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
6-
import de.tobiasroeser.mill.vcs.version.VcsVersion
9+
import mill.main.VcsVersion
710
import com.github.lolgab.mill.mima._
8-
import mill.scalalib.api.ZincWorkerUtil.isScala3
911

1012
val dottyCommunityBuildVersion = sys.props.get("dottyVersion").toList
1113

@@ -16,7 +18,7 @@ trait MimaCheck extends Mima {
1618
def mimaPreviousVersions = Seq("0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.3.0", "0.3.1")
1719

1820
def mimaReportBinaryIssues() =
19-
if (this.isInstanceOf[ScalaNativeModule] || this.isInstanceOf[ScalaJSModule]) T.command()
21+
if (this.isInstanceOf[ScalaNativeModule] || this.isInstanceOf[ScalaJSModule]) Task.Command{}
2022
else super.mimaReportBinaryIssues()
2123
}
2224

@@ -30,7 +32,7 @@ trait SourcecodeModule extends PublishModule with MimaCheck {
3032
// Temporary until the next version of Mima gets released with
3133
// https://github.com/lightbend/mima/issues/693 included in the release.
3234
def mimaPreviousArtifacts =
33-
if(isScala3(crossScalaVersion)) Agg.empty[Dep] else super.mimaPreviousArtifacts()
35+
if(crossScalaVersion.startsWith("3.")) Agg.empty[Dep] else super.mimaPreviousArtifacts()
3436

3537
def pomSettings = PomSettings(
3638
description = artifactName(),
@@ -44,10 +46,10 @@ trait SourcecodeModule extends PublishModule with MimaCheck {
4446
)
4547
}
4648
trait SourcecodeMainModule extends CrossScalaModule with PlatformScalaModule {
47-
def compileIvyDeps =
49+
def compileMvnDeps =
4850
if (crossScalaVersion.startsWith("2")) Agg(
49-
ivy"org.scala-lang:scala-reflect:${crossScalaVersion}",
50-
ivy"org.scala-lang:scala-compiler:${crossScalaVersion}"
51+
mvn"org.scala-lang:scala-reflect:${crossScalaVersion}",
52+
mvn"org.scala-lang:scala-compiler:${crossScalaVersion}"
5153
)
5254
else Agg.empty[Dep]
5355
}

0 commit comments

Comments
 (0)