Skip to content

Commit

Permalink
Update dependencies and build settings
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Apr 14, 2024
1 parent b59a772 commit 34430b9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 23 deletions.
29 changes: 10 additions & 19 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import Common.isScala3

val argonautVersion = "6.3.9"

def Scala3 = "3.3.3"

val msgpack4zArgonaut = CrossProject(
id = msgpack4zArgonautName,
base = file(".")
Expand All @@ -21,12 +19,12 @@ val msgpack4zArgonaut = CrossProject(
("io.argonaut" %%% "argonaut" % argonautVersion) ::
("io.argonaut" %%% "argonaut-scalaz" % argonautVersion % "test") ::
("com.github.scalaprops" %%% "scalaprops" % "0.9.1" % "test") ::
("com.github.xuwei-k" %%% "msgpack4z-core" % "0.6.1") ::
("com.github.xuwei-k" %%% "msgpack4z-core" % "0.6.2") ::
Nil
)
).jvmSettings(
libraryDependencies ++= (
("com.github.xuwei-k" %% "msgpack4z-native" % "0.3.9" % "test") ::
("com.github.xuwei-k" %% "msgpack4z-native" % "0.4.0" % "test") ::
("com.github.xuwei-k" % "msgpack4z-java" % "0.4.0" % "test") ::
("com.github.xuwei-k" % "msgpack4z-java06" % "0.2.0" % "test") ::
Nil
Expand All @@ -41,8 +39,6 @@ val msgpack4zArgonaut = CrossProject(
Seq(s"-P:scalajs:mapSourceURI:$a->$g/")
}
},
).platformsSettings(JVMPlatform, JSPlatform)(
crossScalaVersions += Scala3,
).nativeSettings(
scalapropsNativeSettings,
)
Expand All @@ -51,16 +47,11 @@ val msgpack4zArgonautJVM = msgpack4zArgonaut.jvm
val msgpack4zArgonautJS = msgpack4zArgonaut.js
val msgpack4zArgonautNative = msgpack4zArgonaut.native

val root = Project("root", file(".")).settings(
Common.settings,
crossScalaVersions += Scala3,
PgpKeys.publishLocalSigned := {},
PgpKeys.publishSigned := {},
publishLocal := {},
publish := {},
Compile / publishArtifact := false,
Compile / scalaSource := baseDirectory.value / "dummy",
Test / scalaSource := baseDirectory.value / "dummy"
).aggregate(
msgpack4zArgonautJS, msgpack4zArgonautJVM
)
Common.settings
PgpKeys.publishLocalSigned := {}
PgpKeys.publishSigned := {}
publishLocal := {}
publish := {}
Compile / publishArtifact := false
Compile / scalaSource := baseDirectory.value / "dummy"
Test / scalaSource := baseDirectory.value / "dummy"
4 changes: 2 additions & 2 deletions project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ object Common {

val Scala212 = "2.12.19"
private[this] val Scala213 = "2.13.13"
private[this] val Scala3 = "3.3.3"

val settings = Seq(
ReleasePlugin.extraReleaseCommands
Expand All @@ -49,7 +50,6 @@ object Common {
},
enableCrossBuild = true
),
releaseStepCommandAndRemaining("+ msgpack4z-argonautNative/publishSigned"),
releaseStepCommandAndRemaining("sonatypeBundleRelease"),
setNextVersion,
commitNextVersion,
Expand Down Expand Up @@ -92,7 +92,7 @@ object Common {
}
},
scalaVersion := Scala212,
crossScalaVersions := Scala212 :: Scala213 :: Nil,
crossScalaVersions := Scala212 :: Scala213 :: Scala3 :: Nil,
(Compile / doc / scalacOptions) ++= {
val tag = tagOrHash.value
if (isScala3.value) {
Expand Down
4 changes: 2 additions & 2 deletions project/plugin.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("com.github.scalaprops" % "sbt-scalaprops" % "0.4.4")
addSbtPlugin("com.github.scalaprops" % "sbt-scalaprops" % "0.5.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.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.4.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.0")

scalacOptions ++= (
"-deprecation" ::
Expand Down

0 comments on commit 34430b9

Please sign in to comment.