Move build to sbt-crossproject

JD557 · Nov 18, 2023 · 4aedf9e · 4aedf9e
1 parent 124f792
commit 4aedf9e
Show file tree

Hide file tree

Showing 33 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/compile_test.yml b/.github/workflows/compile_test.yml
@@ -17,7 +17,7 @@ jobs:
         platform: [JVM, JS, Native]
 
     env:
-      PROJECT: core${{ matrix.platform != 'JVM' && matrix.platform || '' }}${{ matrix.scala }}
+      PROJECT: core${{ matrix.platform }}${{ matrix.scala }}
 
     steps:
     - uses: actions/checkout@v2

diff --git a/build.sbt b/build.sbt
@@ -32,7 +32,8 @@ val siteSettings = Seq(
   )
 )
 
-lazy val core = (projectMatrix in file("core"))
+lazy val core =
+  crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .settings(
     name                                    := "interim",
     libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M10" % Test,
@@ -47,9 +48,6 @@ lazy val core = (projectMatrix in file("core"))
         "docs"
       )
   )
-  .jvmPlatform(scalaVersions = Seq("3.3.1"))
-  .jsPlatform(scalaVersions = Seq("3.3.1"))
-  .nativePlatform(scalaVersions = Seq("3.3.1"))
 
 releaseCrossBuild    := true
 releaseTagComment    := s"Release ${(ThisBuild / version).value}"

diff --git a/...in/scala/eu/joaocosta/interim/Color.scala → ...in/scala/eu/joaocosta/interim/Color.scala b/...in/scala/eu/joaocosta/interim/Color.scala → ...in/scala/eu/joaocosta/interim/Color.scala
diff --git a/...ain/scala/eu/joaocosta/interim/Font.scala → ...ain/scala/eu/joaocosta/interim/Font.scala b/...ain/scala/eu/joaocosta/interim/Font.scala → ...ain/scala/eu/joaocosta/interim/Font.scala
diff --git a/...ala/eu/joaocosta/interim/InputState.scala → ...ala/eu/joaocosta/interim/InputState.scala b/...ala/eu/joaocosta/interim/InputState.scala → ...ala/eu/joaocosta/interim/InputState.scala
diff --git a/.../scala/eu/joaocosta/interim/InterIm.scala → .../scala/eu/joaocosta/interim/InterIm.scala b/.../scala/eu/joaocosta/interim/InterIm.scala → .../scala/eu/joaocosta/interim/InterIm.scala
diff --git a/...n/scala/eu/joaocosta/interim/ItemId.scala → ...n/scala/eu/joaocosta/interim/ItemId.scala b/...n/scala/eu/joaocosta/interim/ItemId.scala → ...n/scala/eu/joaocosta/interim/ItemId.scala
diff --git a/...ala/eu/joaocosta/interim/PanelState.scala → ...ala/eu/joaocosta/interim/PanelState.scala b/...ala/eu/joaocosta/interim/PanelState.scala → ...ala/eu/joaocosta/interim/PanelState.scala
diff --git a/...ain/scala/eu/joaocosta/interim/Rect.scala → ...ain/scala/eu/joaocosta/interim/Rect.scala b/...ain/scala/eu/joaocosta/interim/Rect.scala → ...ain/scala/eu/joaocosta/interim/Rect.scala
diff --git a/...main/scala/eu/joaocosta/interim/Ref.scala → ...main/scala/eu/joaocosta/interim/Ref.scala b/...main/scala/eu/joaocosta/interim/Ref.scala → ...main/scala/eu/joaocosta/interim/Ref.scala
diff --git a/...scala/eu/joaocosta/interim/RenderOp.scala → ...scala/eu/joaocosta/interim/RenderOp.scala b/...scala/eu/joaocosta/interim/RenderOp.scala → ...scala/eu/joaocosta/interim/RenderOp.scala
diff --git a/...ala/eu/joaocosta/interim/TextLayout.scala → ...ala/eu/joaocosta/interim/TextLayout.scala b/...ala/eu/joaocosta/interim/TextLayout.scala → ...ala/eu/joaocosta/interim/TextLayout.scala
diff --git a/...cala/eu/joaocosta/interim/UiContext.scala → ...cala/eu/joaocosta/interim/UiContext.scala b/...cala/eu/joaocosta/interim/UiContext.scala → ...cala/eu/joaocosta/interim/UiContext.scala
diff --git a/...eu/joaocosta/interim/api/Components.scala → ...eu/joaocosta/interim/api/Components.scala b/...eu/joaocosta/interim/api/Components.scala → ...eu/joaocosta/interim/api/Components.scala
diff --git a/.../eu/joaocosta/interim/api/Constants.scala → .../eu/joaocosta/interim/api/Constants.scala b/.../eu/joaocosta/interim/api/Constants.scala → .../eu/joaocosta/interim/api/Constants.scala
diff --git a/...la/eu/joaocosta/interim/api/Layouts.scala → ...la/eu/joaocosta/interim/api/Layouts.scala b/...la/eu/joaocosta/interim/api/Layouts.scala → ...la/eu/joaocosta/interim/api/Layouts.scala
diff --git a/...ala/eu/joaocosta/interim/api/Panels.scala → ...ala/eu/joaocosta/interim/api/Panels.scala b/...ala/eu/joaocosta/interim/api/Panels.scala → ...ala/eu/joaocosta/interim/api/Panels.scala
diff --git a/...eu/joaocosta/interim/api/Primitives.scala → ...eu/joaocosta/interim/api/Primitives.scala b/...eu/joaocosta/interim/api/Primitives.scala → ...eu/joaocosta/interim/api/Primitives.scala
diff --git a/.../joaocosta/interim/skins/ButtonSkin.scala → .../joaocosta/interim/skins/ButtonSkin.scala b/.../joaocosta/interim/skins/ButtonSkin.scala → .../joaocosta/interim/skins/ButtonSkin.scala
diff --git a/...oaocosta/interim/skins/CheckboxSkin.scala → ...oaocosta/interim/skins/CheckboxSkin.scala b/...oaocosta/interim/skins/CheckboxSkin.scala → ...oaocosta/interim/skins/CheckboxSkin.scala
diff --git a/...joaocosta/interim/skins/ColorScheme.scala → ...joaocosta/interim/skins/ColorScheme.scala b/...joaocosta/interim/skins/ColorScheme.scala → ...joaocosta/interim/skins/ColorScheme.scala
diff --git a/...joaocosta/interim/skins/DefaultSkin.scala → ...joaocosta/interim/skins/DefaultSkin.scala b/...joaocosta/interim/skins/DefaultSkin.scala → ...joaocosta/interim/skins/DefaultSkin.scala
diff --git a/.../joaocosta/interim/skins/HandleSkin.scala → .../joaocosta/interim/skins/HandleSkin.scala b/.../joaocosta/interim/skins/HandleSkin.scala → .../joaocosta/interim/skins/HandleSkin.scala
diff --git a/.../joaocosta/interim/skins/SelectSkin.scala → .../joaocosta/interim/skins/SelectSkin.scala b/.../joaocosta/interim/skins/SelectSkin.scala → .../joaocosta/interim/skins/SelectSkin.scala
diff --git a/.../joaocosta/interim/skins/SliderSkin.scala → .../joaocosta/interim/skins/SliderSkin.scala b/.../joaocosta/interim/skins/SliderSkin.scala → .../joaocosta/interim/skins/SliderSkin.scala
diff --git a/...aocosta/interim/skins/TextInputSkin.scala → ...aocosta/interim/skins/TextInputSkin.scala b/...aocosta/interim/skins/TextInputSkin.scala → ...aocosta/interim/skins/TextInputSkin.scala
diff --git a/.../joaocosta/interim/skins/WindowSkin.scala → .../joaocosta/interim/skins/WindowSkin.scala b/.../joaocosta/interim/skins/WindowSkin.scala → .../joaocosta/interim/skins/WindowSkin.scala
diff --git a/...eu/joaocosta/interim/InputStateSpec.scala → ...eu/joaocosta/interim/InputStateSpec.scala b/...eu/joaocosta/interim/InputStateSpec.scala → ...eu/joaocosta/interim/InputStateSpec.scala
diff --git a/...scala/eu/joaocosta/interim/RectSpec.scala → ...scala/eu/joaocosta/interim/RectSpec.scala b/...scala/eu/joaocosta/interim/RectSpec.scala → ...scala/eu/joaocosta/interim/RectSpec.scala
diff --git a/.../scala/eu/joaocosta/interim/RefSpec.scala → .../scala/eu/joaocosta/interim/RefSpec.scala b/.../scala/eu/joaocosta/interim/RefSpec.scala → .../scala/eu/joaocosta/interim/RefSpec.scala
diff --git a/.../eu/joaocosta/interim/UiContextSpec.scala → .../eu/joaocosta/interim/UiContextSpec.scala b/.../eu/joaocosta/interim/UiContextSpec.scala → .../eu/joaocosta/interim/UiContextSpec.scala
diff --git a/...u/joaocosta/interim/api/LayoutsSpec.scala → ...u/joaocosta/interim/api/LayoutsSpec.scala b/...u/joaocosta/interim/api/LayoutsSpec.scala → ...u/joaocosta/interim/api/LayoutsSpec.scala
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,9 @@
-addSbtPlugin("ch.epfl.scala"    % "sbt-scalafix"      % "0.11.1")
-addSbtPlugin("com.eed3si9n"     % "sbt-projectmatrix" % "0.9.1")
-addSbtPlugin("com.github.sbt"   % "sbt-pgp"           % "2.2.1")
-addSbtPlugin("com.github.sbt"   % "sbt-release"       % "1.1.0")
-addSbtPlugin("org.scala-js"     % "sbt-scalajs"       % "1.14.0")
-addSbtPlugin("org.scala-native" % "sbt-scala-native"  % "0.4.16")
-addSbtPlugin("org.scalameta"    % "sbt-scalafmt"      % "2.5.2")
-addSbtPlugin("org.xerial.sbt"   % "sbt-sonatype"      % "3.10.0")
+addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"                  % "0.11.1")
+addSbtPlugin("com.github.sbt"     % "sbt-pgp"                       % "2.2.1")
+addSbtPlugin("com.github.sbt"     % "sbt-release"                   % "1.1.0")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.14.0")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.16")
+addSbtPlugin("org.scalameta"      % "sbt-scalafmt"                  % "2.5.2")
+addSbtPlugin("org.xerial.sbt"     % "sbt-sonatype"                  % "3.10.0")