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

Update Scala to 2.12.7 #571

Merged
merged 5 commits into from
Oct 2, 2018
Merged

Update Scala to 2.12.7 #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca2aa48
Update Scala to 2.12.7
fthomas Sep 29, 2018
f70f8da
Update Scala.js to 0.6.25
fthomas Sep 29, 2018
55eeb49
Update Scala 2.13.0 to M5
fthomas Sep 29, 2018
28547b9
Updates for 2.13.0-M5
fthomas Sep 29, 2018
c4c9be0
Update javap output
fthomas Oct 2, 2018
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ 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
- scala: 2.12.6
- sbt ++$TRAVIS_SCALA_VERSION coreJVM/compile scalazJVM/compile shapelessJVM/compile &&
sbt ++$TRAVIS_SCALA_VERSION coreJS/compile scalazJS/compile shapelessJS/compile
- scala: 2.12.7
13 changes: 6 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.@@
""",
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"),
Expand Down
4 changes: 2 additions & 2 deletions modules/core/shared/src/main/scala/eu/timepit/refined/internal/Adjacent.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
18 changes: 9 additions & 9 deletions modules/scalaz/jvm/src/test/scala-2.12/eu/timepit/refined/scalaz/InferJavapSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,39 +49,39 @@ 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
| 13: ireturn
| 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();
| Code:
| 0: aload_0
| 1: invokespecial #60 // Method java/lang/Object."<init>":()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."<init>":()V
| 12: putfield #13 // Field r:Leu/timepit/refined/scalaz/RefineAnyValTest;
Expand Down
12 changes: 6 additions & 6 deletions modules/scalaz/jvm/src/test/scala-2.12/eu/timepit/refined/scalaz/RefineJavapSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion project/plugin-scalajs.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")