From ca2aa483f3bbbe4047a872376a1eb66fa660188a Mon Sep 17 00:00:00 2001 From: "Frank S. Thomas" Date: Sat, 29 Sep 2018 06:23:02 +0200 Subject: [PATCH 1/5] Update Scala to 2.12.7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6874ec246..a1fef9c00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,4 +38,4 @@ matrix: script: - sbt ++$TRAVIS_SCALA_VERSION coreJVM/test scalacheckJVM/test scalazJVM/test shapelessJVM/test && sbt ++$TRAVIS_SCALA_VERSION coreJS/test scalacheckJS/test scalazJS/test shapelessJS/test - - scala: 2.12.6 + - scala: 2.12.7 From f70f8dab9509f33e684ddf975eee4a7bf7b0a65a Mon Sep 17 00:00:00 2001 From: "Frank S. Thomas" Date: Sat, 29 Sep 2018 19:35:23 +0200 Subject: [PATCH 2/5] Update Scala.js to 0.6.25 --- project/plugin-scalajs.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin-scalajs.sbt b/project/plugin-scalajs.sbt index 12398525d..de38c267d 100644 --- a/project/plugin-scalajs.sbt +++ b/project/plugin-scalajs.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25") From 55eeb4965c62ae161aa2efbcfa970ee143855dcf Mon Sep 17 00:00:00 2001 From: "Frank S. Thomas" Date: Sat, 29 Sep 2018 19:35:49 +0200 Subject: [PATCH 3/5] Update Scala 2.13.0 to M5 --- .travis.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1fef9c00..7e37865fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ matrix: - sbt ++$TRAVIS_SCALA_VERSION validateJVM && sbt ++$TRAVIS_SCALA_VERSION validateJS && sbt ++$TRAVIS_SCALA_VERSION validateNative - - scala: 2.13.0-M4 # Remember to update this in build.sbt, too. + - scala: 2.13.0-M5 # Remember to update this in build.sbt, too. script: - sbt ++$TRAVIS_SCALA_VERSION coreJVM/test scalacheckJVM/test scalazJVM/test shapelessJVM/test && sbt ++$TRAVIS_SCALA_VERSION coreJS/test scalacheckJS/test scalazJS/test shapelessJS/test diff --git a/build.sbt b/build.sbt index 84bdd077d..d54d9a171 100644 --- a/build.sbt +++ b/build.sbt @@ -60,7 +60,7 @@ val allSubprojectsNative = allSubprojectsOf(NativePlatform) // Remember to update these in .travis.yml, too. val Scala211 = "2.11.12" -val Scala213 = "2.13.0-M4" +val Scala213 = "2.13.0-M5" /// projects From 28547b9743ce3181d8060534fc84c5347e68ccf3 Mon Sep 17 00:00:00 2001 From: "Frank S. Thomas" Date: Sat, 29 Sep 2018 19:53:39 +0200 Subject: [PATCH 4/5] Updates for 2.13.0-M5 --- .travis.yml | 4 ++-- build.sbt | 11 +++++------ .../scala/eu/timepit/refined/internal/Adjacent.scala | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e37865fd..afadcfb81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,6 @@ matrix: sbt ++$TRAVIS_SCALA_VERSION validateNative - scala: 2.13.0-M5 # Remember to update this in build.sbt, too. script: - - sbt ++$TRAVIS_SCALA_VERSION coreJVM/test scalacheckJVM/test scalazJVM/test shapelessJVM/test && - sbt ++$TRAVIS_SCALA_VERSION coreJS/test scalacheckJS/test scalazJS/test shapelessJS/test + - sbt ++$TRAVIS_SCALA_VERSION coreJVM/compile scalazJVM/compile shapelessJVM/compile && + sbt ++$TRAVIS_SCALA_VERSION coreJS/compile scalazJS/compile shapelessJS/compile - scala: 2.12.7 diff --git a/build.sbt b/build.sbt index d54d9a171..3bc190b28 100644 --- a/build.sbt +++ b/build.sbt @@ -105,9 +105,8 @@ lazy val core = myCrossProject("core") scalaOrganization.value % "scala-reflect" % scalaVersion.value, scalaOrganization.value % "scala-compiler" % scalaVersion.value, "com.chuusai" %%% "shapeless" % shapelessVersion, - "org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion, - scalaCheckDep.value % Test - ), + "org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion + ) ++ (if (scalaVersion.value != Scala213) Seq(scalaCheckDep.value % Test) else Seq()), initialCommands += s""" import shapeless.tag.@@ """, @@ -165,7 +164,7 @@ lazy val pureconfigJVM = pureconfig.jvm lazy val scalacheck = myCrossProject("scalacheck") .dependsOn(core % "compile->compile;test->test") .settings( - crossScalaVersions += Scala213, + //crossScalaVersions += Scala213, libraryDependencies += scalaCheckDep.value, initialCommands += s""" import org.scalacheck.Arbitrary @@ -452,8 +451,8 @@ lazy val releaseSettings = { releaseStepCommand(s"++$Scala213"), releaseStepCommand("coreJVM/publishSigned"), releaseStepCommand("coreJS/publishSigned"), - releaseStepCommand("scalacheckJVM/publishSigned"), - releaseStepCommand("scalacheckJS/publishSigned"), + //releaseStepCommand("scalacheckJVM/publishSigned"), + //releaseStepCommand("scalacheckJS/publishSigned"), releaseStepCommand("scalazJVM/publishSigned"), releaseStepCommand("scalazJS/publishSigned"), releaseStepCommand("shapelessJVM/publishSigned"), diff --git a/modules/core/shared/src/main/scala/eu/timepit/refined/internal/Adjacent.scala b/modules/core/shared/src/main/scala/eu/timepit/refined/internal/Adjacent.scala index fc76b7ce8..3ff125e33 100644 --- a/modules/core/shared/src/main/scala/eu/timepit/refined/internal/Adjacent.scala +++ b/modules/core/shared/src/main/scala/eu/timepit/refined/internal/Adjacent.scala @@ -48,10 +48,10 @@ object Adjacent { } implicit val doubleAdjacent: Adjacent[Double] = - instance(Ordering.Double.compare, Math.nextUp, Math.nextDown) + instance(java.lang.Double.compare, Math.nextUp, Math.nextDown) implicit val floatAdjacent: Adjacent[Float] = - instance(Ordering.Float.compare, Math.nextUp, Math.nextDown) + instance(java.lang.Float.compare, Math.nextUp, Math.nextDown) implicit def integralAdjacent[T]( implicit it: Integral[T] From c4c9be04b663f416055ddeaf203ee75a33b7006b Mon Sep 17 00:00:00 2001 From: "Frank S. Thomas" Date: Tue, 2 Oct 2018 20:40:56 +0200 Subject: [PATCH 5/5] Update javap output --- .../refined/scalaz/InferJavapSpec.scala | 18 +++++++++--------- .../refined/scalaz/RefineJavapSpec.scala | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/scalaz/jvm/src/test/scala-2.12/eu/timepit/refined/scalaz/InferJavapSpec.scala b/modules/scalaz/jvm/src/test/scala-2.12/eu/timepit/refined/scalaz/InferJavapSpec.scala index 11c6e3092..5bcefa171 100644 --- a/modules/scalaz/jvm/src/test/scala-2.12/eu/timepit/refined/scalaz/InferJavapSpec.scala +++ b/modules/scalaz/jvm/src/test/scala-2.12/eu/timepit/refined/scalaz/InferJavapSpec.scala @@ -49,17 +49,17 @@ class InferJavapSpec extends Properties("InferJavapTest") { | 4: areturn | public int Refined(); | Code: - | 0: getstatic #23 // Field eu/timepit/refined/api/Refined$.MODULE$:Leu/timepit/refined/api/Refined$; + | 0: getstatic #24 // Field eu/timepit/refined/api/Refined$.MODULE$:Leu/timepit/refined/api/Refined$; | 3: aload_0 - | 4: invokevirtual #25 // Method r:()Leu/timepit/refined/scalaz/RefineAnyValTest; - | 7: invokevirtual #29 // Method eu/timepit/refined/scalaz/RefineAnyValTest.Refined:()Ljava/lang/Integer; - | 10: invokevirtual #33 // Method eu/timepit/refined/api/Refined$.unsafeApply:(Ljava/lang/Object;)Ljava/lang/Object; - | 13: checkcast #35 // class java/lang/Integer + | 4: invokevirtual #26 // Method r:()Leu/timepit/refined/scalaz/RefineAnyValTest; + | 7: invokevirtual #30 // Method eu/timepit/refined/scalaz/RefineAnyValTest.Refined:()Ljava/lang/Integer; + | 10: invokevirtual #34 // Method eu/timepit/refined/api/Refined$.unsafeApply:(Ljava/lang/Object;)Ljava/lang/Object; + | 13: checkcast #36 // class java/lang/Integer | 16: areturn | public int shapeless_tag(); | Code: | 0: aload_0 - | 1: invokevirtual #25 // Method r:()Leu/timepit/refined/scalaz/RefineAnyValTest; + | 1: invokevirtual #26 // Method r:()Leu/timepit/refined/scalaz/RefineAnyValTest; | 4: invokevirtual #39 // Method eu/timepit/refined/scalaz/RefineAnyValTest.shapeless_tag:()I | 7: invokestatic #45 // Method scala/runtime/BoxesRunTime.boxToInteger:(I)Ljava/lang/Integer; | 10: invokestatic #49 // Method scala/runtime/BoxesRunTime.unboxToInt:(Ljava/lang/Object;)I @@ -67,13 +67,13 @@ class InferJavapSpec extends Properties("InferJavapTest") { | public java.lang.Object scalaz_tag(); | Code: | 0: aload_0 - | 1: invokevirtual #25 // Method r:()Leu/timepit/refined/scalaz/RefineAnyValTest; + | 1: invokevirtual #26 // Method r:()Leu/timepit/refined/scalaz/RefineAnyValTest; | 4: invokevirtual #53 // Method eu/timepit/refined/scalaz/RefineAnyValTest.scalaz_tag:()Ljava/lang/Object; | 7: areturn | public int unrefined(); | Code: | 0: aload_0 - | 1: invokevirtual #25 // Method r:()Leu/timepit/refined/scalaz/RefineAnyValTest; + | 1: invokevirtual #26 // Method r:()Leu/timepit/refined/scalaz/RefineAnyValTest; | 4: invokevirtual #56 // Method eu/timepit/refined/scalaz/RefineAnyValTest.unrefined:()I | 7: ireturn | public eu.timepit.refined.scalaz.InferAnyValTest(); @@ -81,7 +81,7 @@ class InferJavapSpec extends Properties("InferJavapTest") { | 0: aload_0 | 1: invokespecial #60 // Method java/lang/Object."":()V | 4: aload_0 - | 5: new #27 // class eu/timepit/refined/scalaz/RefineAnyValTest + | 5: new #28 // class eu/timepit/refined/scalaz/RefineAnyValTest | 8: dup | 9: invokespecial #61 // Method eu/timepit/refined/scalaz/RefineAnyValTest."":()V | 12: putfield #13 // Field r:Leu/timepit/refined/scalaz/RefineAnyValTest; diff --git a/modules/scalaz/jvm/src/test/scala-2.12/eu/timepit/refined/scalaz/RefineJavapSpec.scala b/modules/scalaz/jvm/src/test/scala-2.12/eu/timepit/refined/scalaz/RefineJavapSpec.scala index cf6312aae..4baf0d73b 100644 --- a/modules/scalaz/jvm/src/test/scala-2.12/eu/timepit/refined/scalaz/RefineJavapSpec.scala +++ b/modules/scalaz/jvm/src/test/scala-2.12/eu/timepit/refined/scalaz/RefineJavapSpec.scala @@ -42,22 +42,22 @@ class RefineJavapSpec extends Properties("RefineJavap") { |public class eu.timepit.refined.scalaz.RefineAnyValTest { | public int Refined(); | Code: - | 0: getstatic #16 // Field eu/timepit/refined/api/Refined$.MODULE$:Leu/timepit/refined/api/Refined$; + | 0: getstatic #17 // Field eu/timepit/refined/api/Refined$.MODULE$:Leu/timepit/refined/api/Refined$; | 3: iconst_2 - | 4: invokestatic #22 // Method scala/runtime/BoxesRunTime.boxToInteger:(I)Ljava/lang/Integer; - | 7: invokevirtual #26 // Method eu/timepit/refined/api/Refined$.unsafeApply:(Ljava/lang/Object;)Ljava/lang/Object; - | 10: checkcast #28 // class java/lang/Integer + | 4: invokestatic #23 // Method scala/runtime/BoxesRunTime.boxToInteger:(I)Ljava/lang/Integer; + | 7: invokevirtual #27 // Method eu/timepit/refined/api/Refined$.unsafeApply:(Ljava/lang/Object;)Ljava/lang/Object; + | 10: checkcast #29 // class java/lang/Integer | 13: areturn | public int shapeless_tag(); | Code: | 0: iconst_2 - | 1: invokestatic #22 // Method scala/runtime/BoxesRunTime.boxToInteger:(I)Ljava/lang/Integer; + | 1: invokestatic #23 // Method scala/runtime/BoxesRunTime.boxToInteger:(I)Ljava/lang/Integer; | 4: invokestatic #36 // Method scala/runtime/BoxesRunTime.unboxToInt:(Ljava/lang/Object;)I | 7: ireturn | public java.lang.Object scalaz_tag(); | Code: | 0: iconst_2 - | 1: invokestatic #22 // Method scala/runtime/BoxesRunTime.boxToInteger:(I)Ljava/lang/Integer; + | 1: invokestatic #23 // Method scala/runtime/BoxesRunTime.boxToInteger:(I)Ljava/lang/Integer; | 4: areturn | public int unrefined(); | Code: