Skip to content

Commit

Permalink
Merge pull request #14 from susliko/scala-native-support
Browse files Browse the repository at this point in the history
Scala Native 0.5.0 support
  • Loading branch information
kitlangton authored Apr 16, 2024
2 parents 43f4c85 + da62f2a commit e646514
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: sbt '++ ${{ matrix.scala }}' test

- name: Compress target directories
run: tar cf targets.tar js/target modules/core/.js/target modules/core/.jvm/target jvm/target examples/.jvm/target target project/target
run: tar cf targets.tar js/target modules/core/.native/target modules/core/.js/target modules/core/.jvm/target jvm/target native/target examples/.jvm/target target project/target

- name: Upload target directories
uses: actions/upload-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ThisBuild / githubWorkflowPublish := Seq(
// Project Definitions //
/////////////////////////

lazy val root = crossProject(JSPlatform, JVMPlatform)
lazy val root = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.in(file("."))
.settings(
name := "root",
Expand All @@ -54,7 +54,7 @@ lazy val root = crossProject(JSPlatform, JVMPlatform)
examples
)

lazy val core = (crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure) in file("modules/core"))
lazy val core = (crossProject(JSPlatform, JVMPlatform, NativePlatform).crossType(CrossType.Pure) in file("modules/core"))
.settings(
name := "quotidian",
libraryDependencies ++= Seq(
Expand Down
10 changes: 6 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.23.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.0")
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.23.0")

0 comments on commit e646514

Please sign in to comment.