From 1eedd090a7e71e365441eb29c143961ae1790ceb Mon Sep 17 00:00:00 2001 From: Greg Methvin Date: Thu, 27 Jul 2017 16:40:39 -0700 Subject: [PATCH] Support Scala 2.12.3 --- .travis.yml | 1 + build.sbt | 4 +- .../src/test/resources/patches/2.12.3.patch | 53 +++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 plugin/src/test/resources/patches/2.12.3.patch diff --git a/.travis.yml b/.travis.yml index cf40b7a..fb41c64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ env: - SCALA_VERSION=2.12.0 - SCALA_VERSION=2.12.1 - SCALA_VERSION=2.12.2 + - SCALA_VERSION=2.12.3 - SCALA_VERSION=2.13.0-M1 # there's no better way it seems.. https://github.com/travis-ci/travis-ci/issues/1519 diff --git a/build.sbt b/build.sbt index c21cfb6..6156363 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2011 Typesafe Inc. + * Copyright (C) 2009-2017 Typesafe Inc. */ // so we can set this from automated builds and also depending on Scala version @@ -55,7 +55,7 @@ lazy val defaults = Seq( crossScalaVersions := { val latest210 = 6 val latest211 = 11 - val latest212 = 2 + val latest212 = 3 val pre213 = List("M1") val skipVersions = Set("2.11.9", "2.11.10") val scala210and211Versions = (2 to latest210).map(i => s"2.10.$i") ++ (0 to latest211).map(i => s"2.11.$i") diff --git a/plugin/src/test/resources/patches/2.12.3.patch b/plugin/src/test/resources/patches/2.12.3.patch new file mode 100644 index 0000000..7d6008c --- /dev/null +++ b/plugin/src/test/resources/patches/2.12.3.patch @@ -0,0 +1,53 @@ +--- target/expected_output/basic/akka/rk/buh/is/it/A.java ++++ target/expected_output/basic/akka/rk/buh/is/it/A.java +@@ -48,13 +48,13 @@ + public class NonStatic { + public NonStatic () { throw new RuntimeException(); } + } ++ public akka.rk.buh.is.it.A.D$.E$ E () { throw new RuntimeException(); } + public D$ () { throw new RuntimeException(); } + /** + * def A.D.math + * @return (undocumented) + */ + public long math () { throw new RuntimeException(); } +- public akka.rk.buh.is.it.A.D$.E$ E () { throw new RuntimeException(); } + } + /** + * class A.B +@@ -94,12 +94,12 @@ + public class C1$ { + public C1$ () { throw new RuntimeException(); } + } +- public C1 () { throw new RuntimeException(); } + /** + * Accessor for nested Scala object + * @return (undocumented) + */ + public akka.rk.buh.is.it.A.C1.C1$ C1 () { throw new RuntimeException(); } ++ public C1 () { throw new RuntimeException(); } + } + /** + * object C1 +@@ -147,6 +147,11 @@ + static public java.lang.String stattic () { throw new RuntimeException(); } + static public java.lang.Object x () { throw new RuntimeException(); } + /** ++ * Accessor for nested Scala object ++ * @return (undocumented) ++ */ ++ public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); } ++ /** + * varargs + * @param s (undocumented) + * @return (undocumented) +@@ -219,9 +224,4 @@ + */ + public int testthrows () throws java.lang.IllegalArgumentException, java.lang.NullPointerException { throw new RuntimeException(); } + public scala.runtime.Null$ getNull () { throw new RuntimeException(); } +- /** +- * Accessor for nested Scala object +- * @return (undocumented) +- */ +- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); } + }