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

Jump to bottom

Adjustments for 3.2.11 #2098

Merged
merged 1 commit into from
Jan 24, 2022
Merged

Adjustments for 3.2.11 #2098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions project/BuildCommons.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ trait BuildCommons {
"org.scala-js" %% "scalajs-test-interface" % scalaJSVersion
)

val releaseVersion = "3.2.10"
val releaseVersion = "3.2.11"

val previousReleaseVersion = "3.2.9"
val previousReleaseVersion = "3.2.10"

val plusJUnitVersion = "3.2.9.0"
val plusTestNGVersion = "3.2.9.0"
val plusJUnitVersion = "3.2.10.0"
val plusTestNGVersion = "3.2.10.0"
val flexmarkVersion = "0.62.2"

def rootProject: Project
Expand Down
3 changes: 2 additions & 1 deletion project/JsBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,8 @@ trait JsBuild { this: BuildCommons =>
mimaBinaryIssueFilters ++= {
Seq(
exclude[DirectMissingMethodProblem]("org.scalatest.concurrent.TimeLimits.failAfterImpl"), // New function not in current version
exclude[DirectMissingMethodProblem]("org.scalatest.concurrent.TimeLimits.cancelAfterImpl") // New function not in current version
exclude[DirectMissingMethodProblem]("org.scalatest.concurrent.TimeLimits.cancelAfterImpl"), // New function not in current version
exclude[ReversedMissingMethodProblem]("org.scalatest.events.Event.withPayload") // New private[scalatest] function not in current version
)
}
).settings(osgiSettings: _*).settings(
Expand Down
2 changes: 1 addition & 1 deletion project/NativeBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._

trait NativeBuild { this: BuildCommons =>

val scalaNativeVersion = Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.4.0")
val scalaNativeVersion = Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.4.3")

lazy val nativeCrossBuildLibraryDependencies = Def.setting {
CrossVersion.partialVersion(scalaVersion.value) match {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")

addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.1")

val scalaNativeVersion = Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.4.0")
val scalaNativeVersion = Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.4.3")

addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)

Expand Down
4 changes: 3 additions & 1 deletion project/scalatest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,9 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
mimaBinaryIssueFilters ++= {
Seq(
exclude[DirectMissingMethodProblem]("org.scalatest.concurrent.TimeLimits.failAfterImpl"), // New function not in current version
exclude[DirectMissingMethodProblem]("org.scalatest.concurrent.TimeLimits.cancelAfterImpl") // New function not in current version
exclude[DirectMissingMethodProblem]("org.scalatest.concurrent.TimeLimits.cancelAfterImpl"), // New function not in current version
exclude[ReversedMissingMethodProblem]("org.scalatest.events.Event.withPayload"), // New private[scalatest] function not in current version
exclude[IncompatibleMethTypeProblem]("org.scalatest.tools.Framework#ScalaTestRunner#Skeleton#1#React.this") // SBT integration class not meant for third-party use.
)
}
).settings(osgiSettings: _*).settings(
Expand Down
6 changes: 3 additions & 3 deletions publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sbt "project scalacticMacroJS" clean
sbt ++2.11.12 "project scalacticJS" clean publishSigned
sbt ++2.12.15 "project scalacticJS" clean publishSigned
sbt ++2.13.6 "project scalacticJS" clean publishSigned
export SCALANATIVE_VERSION=0.4.0
export SCALANATIVE_VERSION=0.4.3
sbt "project scalacticMacroNative" clean
sbt ++2.11.12 "project scalacticNative" clean publishSigned
sbt ++2.12.15 "project scalacticNative" clean publishSigned
Expand All @@ -36,7 +36,7 @@ sbt "project scalacticJS" clean
sbt ++2.11.12 "project scalatestJS" clean publishSigned
sbt ++2.12.15 "project scalatestJS" clean publishSigned
sbt ++2.13.6 "project scalatestJS" clean publishSigned
export SCALANATIVE_VERSION=0.4.0
export SCALANATIVE_VERSION=0.4.3
sbt "project scalacticMacroNative" clean
sbt ++2.11.12 "project scalatestNative" clean publishSigned
sbt ++2.12.15 "project scalatestNative" clean publishSigned
Expand All @@ -60,7 +60,7 @@ sbt "project scalacticJS" clean
sbt ++2.11.12 "project scalatestAppJS" clean publishSigned
sbt ++2.12.15 "project scalatestAppJS" clean publishSigned
sbt ++2.13.6 "project scalatestAppJS" clean publishSigned
export SCALANATIVE_VERSION=0.4.0
export SCALANATIVE_VERSION=0.4.3
sbt "project scalacticMacroNative" clean
sbt ++2.11.12 "project scalatestAppNative" clean publishSigned
sbt ++2.12.15 "project scalatestAppNative" clean publishSigned
Expand Down