Skip to content

Commit

Permalink
Merge pull request #1814 from olafurpg/scala-2.12.8
Browse files Browse the repository at this point in the history
Upgrade to 2.12.8
  • Loading branch information
olafurpg committed Dec 7, 2018
2 parents c10bc88 + f29186c commit 55f7651
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 29 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ matrix:
- curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x
- env:
- CI_TEST: ci-fast
- CI_SCALA_VERSION: 2.12.7
- CI_SCALA_VERSION: 2.12.8
- CI_PUBLISH: true
- jdk: openjdk11 # Run 2.12.7 JVM tests on Java 11.
- jdk: openjdk11 # Run 2.12.8 JVM tests on Java 11.
env:
- CI_TEST: ci-fast
- CI_SCALA_VERSION: 2.12.7
- CI_SCALA_VERSION: 2.12.8
- env:
- CI_TEST: ci-fast
- CI_SCALA_VERSION: 2.12.7
- CI_SCALA_VERSION: 2.12.8
- CI_SCALA_JS: true
- env:
- CI_TEST: ci-slow
- CI_SCALA_VERSION: 2.12.7
- CI_SCALA_VERSION: 2.12.8
- env:
- CI_TEST: mima

Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,8 @@ lazy val fullCrossVersionSettings = Seq(
// That's why we have to work around here.
val base = sourceDirectory.in(Compile).value
val versionDir =
if (scalaVersion.value.startsWith("2.12.7-bin")) "2.12.7" else scalaVersion.value
if (scalaVersion.value.startsWith(s"$LatestScala212-bin")) LatestScala212
else scalaVersion.value
base / ("scala-" + versionDir)
}
)
Expand Down
2 changes: 1 addition & 1 deletion project/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ package build
object Versions {
val LatestScala210 = "2.10.7"
val LatestScala211 = "2.11.12"
val LatestScala212 = "2.12.7"
val LatestScala212 = "2.12.8"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object Libraries {
"scalameta_2.12",
"3.2.0",
provided = List(
ModuleID.scalaReflect("2.12.7")
ModuleID.scalaReflect("2.12.8")
)
)
buf += Library("com.typesafe.akka", "akka-testkit_2.12", "2.5.9")
Expand Down
22 changes: 1 addition & 21 deletions tests/jvm/src/test/resources/metac-metacp.diff
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ advanced/D#
kind: TYPE
properties: 4
display_name: "_"
self {
declarations {
+ symlinks: "advanced/D#_$2#"
symlinks: "advanced/D#`<init>`()."
+ symlinks: "advanced/D#_$2#"


==========================
Expand Down Expand Up @@ -329,25 +328,6 @@ example/Synthetic#x$2.
+ private_this_access {


================
flags/p/package.
================
--- metac
+++ metacp
symlinks: "flags/p/package.C#"
symlinks: "flags/p/package.T1#"
symlinks: "flags/p/package.T2#"
+ symlinks: "flags/p/package.S#"
symlinks: "flags/p/package.U#"
symlinks: "flags/p/package.V#"
symlinks: "flags/p/package.X."
symlinks: "flags/p/package.Y#"
symlinks: "flags/p/package.Z#"
symlinks: "flags/p/package.AA#"
- symlinks: "flags/p/package.S#"
symlinks: "flags/p/package.xs1."


======================
types/Test.C#annType1.
======================
Expand Down

0 comments on commit 55f7651

Please sign in to comment.