Skip to content

Commit

Permalink
Update scala-native to 0.5.1 in series/7.2.x (#2697)
Browse files Browse the repository at this point in the history
Co-authored-by: scalaz-bot[bot] <74843977+scalaz-bot[bot]@users.noreply.github.com>
Co-authored-by: xuwei-k <6b656e6a69@gmail.com>
  • Loading branch information
scalaz-bot[bot] and xuwei-k committed Apr 17, 2024
1 parent 56c445f commit 6b9cea0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 15 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Expand Up @@ -163,7 +163,7 @@ lazy val exampleNative = example.native
def scalacheckBindingProject(
id: String,
base: String,
scalacheckVersion: SettingKey[String],
scalacheckVersion: String,
versionSuffix: String,
platforms: Seq[Platform]
) = {
Expand All @@ -186,7 +186,7 @@ def scalacheckBindingProject(
(Compile / unmanagedSourceDirectories) += {
(LocalRootProject / baseDirectory).value / "scalacheck-binding/src/main/scala"
},
libraryDependencies += scalaCheckGroupId.value %%% "scalacheck" % scalacheckVersion.value,
libraryDependencies += "org.scalacheck" %%% "scalacheck" % scalacheckVersion,
osgiExport("scalaz.scalacheck"))
.dependsOn(core, iteratee)
.jvmConfigure(_ dependsOn concurrent)
Expand Down Expand Up @@ -231,7 +231,7 @@ def scalacheckBindingProject(
lazy val scalacheckBinding_1_15 = scalacheckBindingProject(
id = "scalacheck-binding_1_15",
base = "scalacheck-binding_1_15",
scalacheckVersion = scalaCheckVersion_1_15,
scalacheckVersion = "1.18.0",
versionSuffix = "1.15",
platforms = Seq(JVMPlatform, JSPlatform, NativePlatform)
)
Expand Down
11 changes: 0 additions & 11 deletions project/build.scala
Expand Up @@ -62,8 +62,6 @@ object build {
reapply(Seq(ThisBuild / scalazMimaBasis := releaseV), st)
}

val scalaCheckVersion_1_15 = SettingKey[String]("scalaCheckVersion_1_15")
val scalaCheckGroupId = SettingKey[String]("scalaCheckGroupId")
val kindProjectorVersion = SettingKey[String]("kindProjectorVersion")

private[this] def gitHash(): String = sys.process.Process("git rev-parse HEAD").lineStream_!.head
Expand Down Expand Up @@ -189,15 +187,6 @@ object build {
s"""set ThisBuild / version := "${out.sonatypeVersion(date)}" """ :: state
},
fullResolvers ~= {_.filterNot(_.name == "jcenter")}, // https://github.com/sbt/sbt/issues/2217
scalaCheckVersion_1_15 := {
scalaBinaryVersion.value match {
case "3" =>
"1.16.0"
case _ =>
"1.15.2"
}
},
scalaCheckGroupId := "org.scalacheck",
scalacOptions ++= Seq(
// contains -language:postfixOps (because 1+ as a parameter to a higher-order function is treated as a postfix op)
"-deprecation",
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
@@ -1,7 +1,7 @@
scalacOptions += "-deprecation"

val scalaJsVersion = sys.env.get("SCALA_JS_VERSION").filter(_.trim.nonEmpty).getOrElse("1.16.0")
val scalaNativeVersion = sys.env.get("SCALA_NATIVE_VERSION").filter(_.trim.nonEmpty).getOrElse("0.4.17")
val scalaNativeVersion = sys.env.get("SCALA_NATIVE_VERSION").filter(_.trim.nonEmpty).getOrElse("0.5.1")

addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
Expand Down

0 comments on commit 6b9cea0

Please sign in to comment.