luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build

This commit is contained in:
Adrien Piquerez 2024-06-04 11:10:52 +02:00
parent 629245a3e0
commit 91a2b3d8ad
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
build.sbt
View File

@ -18,7 +18,7 @@ inThisBuild(List(
semanticdbEnabled := true, semanticdbEnabled := true,
semanticdbVersion := "4.8.14", semanticdbVersion := "4.8.14",
scalafixDependencies += "net.hamnaberg" %% "dataclass-scalafix" % dataclassScalafixV, scalafixDependencies += "net.hamnaberg" %% "dataclass-scalafix" % dataclassScalafixV,
version := "2.0.0-alpha7-SNAPSHOT", version := "2.0.0-alpha8-SNAPSHOT",
scalaVersion := scala3, scalaVersion := scala3,
)) ))
@ -43,10 +43,10 @@ ThisBuild / assemblyMergeStrategy := {
oldStrategy(x) oldStrategy(x)
} }
val coursierVersion0 = "2.1.0-M5" val coursierVersion0 = "2.1.9"
val lmVersion = "1.3.4" val lmVersion = "1.3.4"
val lm2_13Version = "1.5.0-M3" val lm2_13Version = "1.5.0-M3"
val lm3Version = "2.0.0-alpha12" val lm3Version = "2.0.0-alpha15"
lazy val scalafixGen = Def.taskDyn { lazy val scalafixGen = Def.taskDyn {
val root = (ThisBuild / baseDirectory).value.toURI.toString val root = (ThisBuild / baseDirectory).value.toURI.toString
@ -65,11 +65,19 @@ lazy val scalafixGen = Def.taskDyn {
Global / excludeLintKeys += scriptedBufferLog Global / excludeLintKeys += scriptedBufferLog
Global / excludeLintKeys += scriptedLaunchOpts Global / excludeLintKeys += scriptedLaunchOpts
def coursierVersion0 = "2.1.9"
def coursierDep = ("io.get-coursier" %% "coursier" % coursierVersion0) def coursierDep = ("io.get-coursier" %% "coursier" % coursierVersion0)
.cross(CrossVersion.for3Use2_13)
.exclude("org.codehaus.plexus", "plexus-archiver") .exclude("org.codehaus.plexus", "plexus-archiver")
.exclude("org.codehaus.plexus", "plexus-container-default") .exclude("org.codehaus.plexus", "plexus-container-default")
def coursierSbtMavenRepoDep = ("io.get-coursier" %% "coursier-sbt-maven-repository" % coursierVersion0)
.cross(CrossVersion.for3Use2_13)
def excludedDependencies = Seq(
ExclusionRule("org.scala-lang.modules", "scala-xml_2.13"),
ExclusionRule("org.scala-lang.modules", "scala-collection-compat_2.13"),
)
def dataclassGen(data: Reference) = Def.taskDyn { def dataclassGen(data: Reference) = Def.taskDyn {
val root = (ThisBuild / baseDirectory).value.toURI.toString val root = (ThisBuild / baseDirectory).value.toURI.toString
val from = (data / Compile / sourceDirectory).value val from = (data / Compile / sourceDirectory).value
@ -125,7 +133,7 @@ lazy val `lm-coursier` = project
Mima.lmCoursierFilters, Mima.lmCoursierFilters,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
coursierDep, coursierDep,
"io.get-coursier" %% "coursier-sbt-maven-repository" % coursierVersion0, coursierSbtMavenRepoDep,
"io.get-coursier.jniutils" % "windows-jni-utils-lmcoursier" % jniUtilsVersion, "io.get-coursier.jniutils" % "windows-jni-utils-lmcoursier" % jniUtilsVersion,
"net.hamnaberg" %% "dataclass-annotation" % dataclassScalafixV % Provided, "net.hamnaberg" %% "dataclass-annotation" % dataclassScalafixV % Provided,
@ -135,8 +143,9 @@ lazy val `lm-coursier` = project
// IvySbt#Module (seems DependencyResolutionInterface.moduleDescriptor // IvySbt#Module (seems DependencyResolutionInterface.moduleDescriptor
// is ignored). // is ignored).
lmIvy.value, lmIvy.value,
("org.scalatest" %% "scalatest" % "3.2.18" % Test).cross(CrossVersion.for3Use2_13), "org.scalatest" %% "scalatest" % "3.2.18" % Test,
), ),
excludeDependencies ++= excludedDependencies,
Test / exportedProducts := { Test / exportedProducts := {
(Test / preTest).value (Test / preTest).value
(Test / exportedProducts).value (Test / exportedProducts).value
@ -201,7 +210,6 @@ lazy val `lm-coursier-shaded` = project
"org.tukaani", "org.tukaani",
"scala.collection.compat", "scala.collection.compat",
"scala.util.control.compat", "scala.util.control.compat",
"scala.xml",
"com.github.plokhotnyuk.jsoniter_scala", "com.github.plokhotnyuk.jsoniter_scala",
"scala.cli", "scala.cli",
"com.github.luben.zstd", "com.github.luben.zstd",
@ -212,12 +220,13 @@ lazy val `lm-coursier-shaded` = project
}, },
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
coursierDep, coursierDep,
"io.get-coursier" %% "coursier-sbt-maven-repository" % coursierVersion0, coursierSbtMavenRepoDep,
"io.get-coursier.jniutils" % "windows-jni-utils-lmcoursier" % jniUtilsVersion, "io.get-coursier.jniutils" % "windows-jni-utils-lmcoursier" % jniUtilsVersion,
"net.hamnaberg" %% "dataclass-annotation" % dataclassScalafixV % Provided, "net.hamnaberg" %% "dataclass-annotation" % dataclassScalafixV % Provided,
lmIvy.value % Provided, lmIvy.value % Provided,
"org.scalatest" %% "scalatest" % "3.2.18" % Test, "org.scalatest" %% "scalatest" % "3.2.18" % Test,
), ),
excludeDependencies ++= excludedDependencies,
conflictWarning := ConflictWarning.disable, conflictWarning := ConflictWarning.disable,
dontPublish, dontPublish,
) )
@ -317,10 +326,10 @@ lazy val `sbt-coursier-root` = project
definitions, definitions,
`lm-coursier`, `lm-coursier`,
`lm-coursier-shaded`, `lm-coursier-shaded`,
`sbt-coursier`, // `sbt-coursier`,
`sbt-coursier-shared`, // `sbt-coursier-shared`,
`sbt-coursier-shared-shaded`, // `sbt-coursier-shared-shaded`,
`sbt-lm-coursier` // `sbt-lm-coursier`
) )
.settings( .settings(
shared, shared,