Skip to content

Commit

Permalink
Revert "Revert "Merge pull request #9 from arturaz/feat/cross-building""
Browse files Browse the repository at this point in the history
This reverts commit edf3db9.
  • Loading branch information
jkugiya committed Aug 26, 2024
1 parent fa048c7 commit c5ecd06
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 7 deletions.
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
.idea/
target/
.bsp
/.bsp
# SBT cross compilation targets
/.js
/.jvm
/.native
# Metals files
.bloop
/.metals
metals.sbt

null
16 changes: 11 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import Dependencies._

ThisBuild / scalaVersion := "3.3.3"
ThisBuild / crossScalaVersions := Seq("3.3.3", "2.13.14", "2.12.19", "2.11.19")
ThisBuild / version := "1.0.3-SNAPSHOT"
ThisBuild / crossScalaVersions := Seq("3.3.3", "2.13.14", "2.12.19", "2.11.12")
ThisBuild / version := "1.0.4-SNAPSHOT"
ThisBuild / organization := "com.github.jkugiya"
ThisBuild / organizationName := "jkugiya"

lazy val root = (project in file("."))
lazy val root =
(
crossProject(JVMPlatform, JSPlatform, NativePlatform)
.withoutSuffixFor(JVMPlatform)
.crossType(CrossType.Pure)
.in(file("."))
)
.settings(
name := "ulid-scala",
libraryDependencies += scalaTest % Test
Expand All @@ -20,13 +26,13 @@ lazy val benchmark = (project in file("benchmark"))
"io.azam.ulidj" % "ulidj" % "1.0.0"
)
)
.dependsOn(root)
.dependsOn(root.jvm)

// Uncomment the following for publishing to Sonatype.
// See https://www.scala-sbt.org/1.x/docs/Using-Sonatype.html for more detail.

ThisBuild / description := "A Scala port of alizain/ulid"
ThisBuild / licenses := List("MIT" -> new URL("https://github.com/jkugiya/ulid-scala/blob/master/LICENSE"))
ThisBuild / licenses := List("MIT" -> new URI("https://github.com/jkugiya/ulid-scala/blob/master/LICENSE").toURL)
ThisBuild / homepage := Some(url("https://github.com/jkugiya/ulid-scala"))
ThisBuild / scmInfo := Some(
ScmInfo(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.2
sbt.version=1.10.1
6 changes: 6 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
// coverage
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.1")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.13")

// Cross-compilation
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4")

0 comments on commit c5ecd06

Please sign in to comment.