Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Scala Native to 0.5.1 #45

Closed
wants to merge 3 commits into from
Closed

Upgrade Scala Native to 0.5.1 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14e0f7c
Upgrade Scala Native to 0.5.1
xerial Apr 19, 2024
6dac458
breaking: Drop Scala.js 0.6.x support
xerial Apr 20, 2024
57da2a2
Ignore mima check for 1.1.3
xerial May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ jobs:
strategy:
fail-fast: false
matrix:
scalaversion: ["2.11.12", "2.12.13", "2.13.4"]
platform: ["JVM", "JS", "JS-0.6.x", "Native"]
scalaversion: ["2.12.19", "2.13.13"]
platform: ["JVM", "JS", "Native"]
env:
SCALAJS_VERSION: "${{ matrix.platform == 'JS-0.6.x' && '0.6.33' || '' }}"
PROJECT_NAME: "portable-scala-reflect${{ matrix.platform == 'JS-0.6.x' && 'JS' || matrix.platform }}"
PROJECT_NAME: "portable-scala-reflect${{ matrix.platform }}"
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v10
Expand Down
23 changes: 14 additions & 9 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
import com.typesafe.tools.mima.core._
import sbtcrossproject.{crossProject, CrossType}

val previousVersion = "1.1.2"
val previousVersion = "1.1.3"

inThisBuild(Def.settings(
crossScalaVersions := Seq("2.12.13", "2.11.12", "2.13.4"),
crossScalaVersions := Seq("2.12.19", "2.13.13"),
scalaVersion := crossScalaVersions.value.head,
version := "1.1.3-SNAPSHOT",
organization := "org.portable-scala",
Expand All @@ -30,11 +30,16 @@ inThisBuild(Def.settings(
lazy val `portable-scala-reflect` = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.in(file("."))
.settings(
scalacOptions in (Compile, doc) -= "-Xfatal-warnings",

mimaPreviousArtifacts +=
organization.value %%% moduleName.value % previousVersion,

Compile / doc /scalacOptions -= "-Xfatal-warnings",
mimaPreviousArtifacts := {
version.value match {
case v if v.startsWith("1.1.3") =>
// During migration to Scala Native 0.5.x, ignore the binary compatibility
Set.empty
case _ =>
Set(organization.value %%% moduleName.value % previousVersion)
}
},
publishMavenStyle := true,
publishTo := {
val nexus = "https://oss.sonatype.org/"
Expand Down Expand Up @@ -76,7 +81,7 @@ lazy val `portable-scala-reflect` = crossProject(JSPlatform, JVMPlatform, Native
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
.nativeSettings(
libraryDependencies +=
"org.scala-native" %%% "junit-runtime" % "0.4.0" % "test",
"org.scala-native" %%% "junit-runtime" % "0.5.1" % "test",
addCompilerPlugin(
"org.scala-native" % "junit-plugin" % "0.4.0" cross CrossVersion.full),
"org.scala-native" % "junit-plugin" % "0.5.1" cross CrossVersion.full),
)
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.7
sbt.version=1.9.9
8 changes: 4 additions & 4 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("1.0.0")
Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("1.16.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")

addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
Loading