From 3499796cb602739b3644e3a9b50819c18279a8d1 Mon Sep 17 00:00:00 2001 From: Lars Hupel Date: Sun, 7 Apr 2019 14:34:53 +0200 Subject: [PATCH] Scala 2.13.0-RC1 --- .travis.yml | 2 +- README.md | 2 +- build.sbt | 14 ++++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3960508..54f6d45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ scala: - "2.10.7" - "2.11.12" - "2.12.7" - - "2.13.0-M5" + - "2.13.0-RC1" jdk: - oraclejdk8 diff --git a/README.md b/README.md index b646380..6030845 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ Note that the second approach will not include the `map` operation of its grandp ## Including Simulacrum -This project supports Scala 2.10, 2.11 2.12, and 2.13.0-M5. The project is based on macro paradise. To use the project, add the following to your build.sbt: +This project supports Scala 2.10, 2.11 2.12, and 2.13.0-RC1. The project is based on macro paradise. To use the project, add the following to your build.sbt: ```scala libraryDependencies += "com.github.mpilquist" %% "simulacrum" % "0.15.0" diff --git a/build.sbt b/build.sbt index 35baa75..55d3667 100644 --- a/build.sbt +++ b/build.sbt @@ -15,13 +15,7 @@ def ifAtLeast(scalaBinaryVersion: String, atLeastVersion: String)(options: Strin else Seq.empty } -lazy val scalatestSetting = Def.setting( - if (scalaVersion.value == "2.13.0-M5") { - Seq("org.scalatest" %%% "scalatest" % "3.0.6-SNAP4" % "test") - } else { - Seq("org.scalatest" %%% "scalatest" % "3.0.6-SNAP6" % "test") - } -) +lazy val scalatest = Def.setting("org.scalatest" %%% "scalatest" % "3.0.8-RC2" % "test") lazy val nativeCommonSettings = Def.settings( // https://github.com/scalatest/scalatest/issues/1112#issuecomment-366856502 @@ -51,7 +45,7 @@ lazy val commonSettings = Seq( scalacOptions in (Compile, console) ~= { _ filterNot { o => o == "-Ywarn-unused-import" || o == "-Xfatal-warnings" } }, scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value, scalaVersion := Scala211, - crossScalaVersions := Seq("2.10.7", Scala211, "2.12.7", "2.13.0-M5"), + crossScalaVersions := Seq("2.10.7", Scala211, "2.12.7", "2.13.0-RC1"), resolvers ++= Seq( Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots") @@ -157,7 +151,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform).crossType( nativeCommonSettings ) .platformsSettings(JVMPlatform, JSPlatform)( - libraryDependencies ++= scalatestSetting.value + libraryDependencies += scalatest.value ) .platformsSettings(JSPlatform, NativePlatform)( excludeFilter in (Test, unmanagedSources) := "jvm.scala" @@ -178,7 +172,7 @@ lazy val examples = crossProject(JSPlatform, JVMPlatform, NativePlatform).crossT .settings(moduleName := "simulacrum-examples") .settings(noPublishSettings: _*) .platformsSettings(JVMPlatform, JSPlatform)( - libraryDependencies ++= scalatestSetting.value + libraryDependencies += scalatest.value ) .nativeSettings( nativeCommonSettings