Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThijsBroersen
ThijsBroersen committed Oct 6, 2024
1 parent 974cde0 commit 20e807a
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 78 deletions.
71 changes: 24 additions & 47 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,51 +32,51 @@ addCommandAlias("compileAll", "; root2-12/compile; root2-13/compile; root3/compi
addCommandAlias("testAll", "; root2-12/test; root2-13/test; root3/test;")
addCommandAlias(
"testJS",
";" + jsProjects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(VirtualAxis.js).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testJS212",
";" + scala212JSprojects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(Scala212, VirtualAxis.js).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testJS213",
";" + scala213JSprojects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(Scala213, VirtualAxis.js).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testJS3",
";" + scala3JSprojects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(Scala3, VirtualAxis.js).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testJVM",
";" + jvmProjects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(VirtualAxis.jvm).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testJVM212",
";" + scala212JVMprojects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(Scala212, VirtualAxis.jvm).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testJVM213",
";" + scala213JVMprojects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(Scala213, VirtualAxis.jvm).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testJVM3",
";" + scala3JVMprojects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(Scala3, VirtualAxis.jvm).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testNative",
";" + nativeProjects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(VirtualAxis.native).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testNative212",
";" + scala212NativeProjects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(Scala212, VirtualAxis.native).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testNative213",
";" + scala213NativeProjects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(Scala213, VirtualAxis.native).map(_.id).mkString("/test;") + "/test"
)
addCommandAlias(
"testNative3",
";" + scala3NativeProjects.map(_.id).mkString("/test;") + "/test"
";" + selectProjects(Scala3, VirtualAxis.native).map(_.id).mkString("/test;") + "/test"
)

val awsVersion = "1.12.773"
Expand Down Expand Up @@ -123,33 +123,14 @@ lazy val allProjects = Seq[sbt.internal.ProjectMatrix](
docs
)

lazy val jvmProjects = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.jvm)))
lazy val jsProjects = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.js)))
lazy val nativeProjects = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.native)))

lazy val scala212projects = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.scalaVersionAxis(Scala212, ""))))
lazy val scala212JVMprojects =
allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.jvm, VirtualAxis.scalaVersionAxis(Scala212, ""))))
lazy val scala212JSprojects =
allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.js, VirtualAxis.scalaVersionAxis(Scala212, ""))))
lazy val scala212NativeProjects =
allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.native, VirtualAxis.scalaVersionAxis(Scala212, ""))))

lazy val scala213projects = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.scalaVersionAxis(Scala213, ""))))
lazy val scala213JVMprojects =
allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.jvm, VirtualAxis.scalaVersionAxis(Scala213, ""))))
lazy val scala213JSprojects =
allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.js, VirtualAxis.scalaVersionAxis(Scala213, ""))))
lazy val scala213NativeProjects =
allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.native, VirtualAxis.scalaVersionAxis(Scala213, ""))))

lazy val scala3projects = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.scalaVersionAxis(Scala3, ""))))
lazy val scala3JVMprojects =
allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.jvm, VirtualAxis.scalaVersionAxis(Scala3, ""))))
lazy val scala3JSprojects =
allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.js, VirtualAxis.scalaVersionAxis(Scala3, ""))))
lazy val scala3NativeProjects =
allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.native, VirtualAxis.scalaVersionAxis(Scala3, ""))))
def selectProjects(scalaVersion: String) =
allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.scalaVersionAxis(scalaVersion, ""))))

def selectProjects(platform: VirtualAxis.PlatformAxis) =
allProjects.flatMap(_.filterProjects(Seq(platform)))

def selectProjects(scalaVersion: String, platform: VirtualAxis.PlatformAxis) =
allProjects.flatMap(_.filterProjects(Seq(platform, VirtualAxis.scalaVersionAxis(scalaVersion, ""))))

lazy val root =
project
Expand All @@ -161,19 +142,19 @@ lazy val `root2-12` =
project
.in(file("2-12"))
.settings(publish / skip := true)
.aggregate(scala212projects.map(_.project): _*)
.aggregate(selectProjects(Scala212).map(_.project): _*)

lazy val `root2-13` =
project
.in(file("2-13"))
.settings(publish / skip := true)
.aggregate(scala213projects.map(_.project): _*)
.aggregate(selectProjects(Scala213).map(_.project): _*)

lazy val `root3` =
project
.in(file("3"))
.settings(publish / skip := true)
.aggregate(scala3projects.map(_.project): _*)
.aggregate(selectProjects(Scala3).map(_.project): _*)

lazy val zioConfig = projectMatrix
.in(file("core"))
Expand All @@ -192,8 +173,7 @@ lazy val zioConfig = projectMatrix
)
.jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
.jsPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
.nativePlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
.settings(nativeSettings)
.nativePlatform(scalaVersions = Seq(Scala212, Scala213, Scala3), settings = nativeSettings)

lazy val zioConfigAws = projectMatrix
.in(file("aws"))
Expand Down Expand Up @@ -372,7 +352,6 @@ lazy val zioConfigScalaz = projectMatrix
.jvmPlatform(scalaVersions = Seq(Scala213, Scala3))
.jsPlatform(scalaVersions = Seq(Scala213, Scala3))
.nativePlatform(scalaVersions = Seq(Scala213, Scala3))
.settings(nativeSettings)

lazy val zioConfigCats = projectMatrix
.in(file("cats"))
Expand All @@ -389,7 +368,6 @@ lazy val zioConfigCats = projectMatrix
.jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
.jsPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
.nativePlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
.settings(nativeSettings)

lazy val zioConfigEnumeratum = projectMatrix
.in(file("enumeratum"))
Expand All @@ -406,7 +384,6 @@ lazy val zioConfigEnumeratum = projectMatrix
.jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
.jsPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
.nativePlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
.settings(nativeSettings)

lazy val zioConfigEnumeratumJVM = zioConfigEnumeratum.jvm

Expand Down
39 changes: 8 additions & 31 deletions project/BuildHelper.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,6 @@ object BuildHelper {
case _ => Seq.empty
}

def platformSpecificSources(platform: String, conf: String, baseDirectory: File)(versions: String*) = for {
platform <- List("shared", platform)
version <- "scala" :: versions.toList.map("scala-" + _)
result = baseDirectory.getParentFile / platform.toLowerCase / "src" / conf / version
if result.exists
} yield result

lazy val crossProjectSettings = Seq(
resolvers +=
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
Expand All @@ -142,7 +135,7 @@ object BuildHelper {
def stdSettings(prjName: String) = Seq(
resolvers +=
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
name := s"$prjName",
name := s"$prjName",
scalacOptions ++= stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value),
libraryDependencies ++= {
if (scalaVersion.value == Scala3)
Expand All @@ -152,17 +145,16 @@ object BuildHelper {
compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full)
)
},
semanticdbEnabled := scalaVersion.value != Scala3, // enable SemanticDB
semanticdbEnabled := scalaVersion.value != Scala3, // enable SemanticDB
semanticdbOptions += "-P:semanticdb:synthetics:on",
semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version
ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value),
semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version
ThisBuild / scalafixDependencies ++= List(
"com.github.liancheng" %% "organize-imports" % "0.6.0",
"com.github.vovapolu" %% "scaluzzi" % "0.1.23"
),
Test / parallelExecution := true,
Test / parallelExecution := true,
incOptions ~= (_.withLogRecompileOnMacro(false)),
autoAPIMappings := true,
autoAPIMappings := true,
unusedCompileDependenciesFilter -= moduleFilter("org.scala-js", "scalajs-library")
)

Expand Down Expand Up @@ -194,25 +186,10 @@ object BuildHelper {
}
)

def jsSettings = Seq(
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.6.0",
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.6.0"
)

def nativeSettings = Seq(
Test / skip := (if (virtualAxes.value.contains(VirtualAxis.native)) true else false),
doc / skip := (if (virtualAxes.value.contains(VirtualAxis.native)) true else false),
Compile / doc / sources := (if (virtualAxes.value.contains(VirtualAxis.native)) Seq.empty
else (Compile / doc / sources).value)
)

val scalaReflectTestSettings: List[Setting[_]] = List(
libraryDependencies ++= {
if (scalaVersion.value == Scala3)
Seq()
else
Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value % Test)
}
// Test / skip := true,
doc / skip := true,
Compile / doc / sources := Seq.empty
)

def welcomeMessage = onLoadMessage := {
Expand Down

0 comments on commit 20e807a

Please sign in to comment.