Skip to content

Commit 8d0ecfe

Browse files
authored
Merge pull request #107 from typesafehub/scala-2.12.3
Support Scala 2.12.3
2 parents 9feefbe + 1eedd09 commit 8d0ecfe

File tree

3 files changed

+56
-2
lines changed

3 files changed

+56
-2
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ env:
3232
- SCALA_VERSION=2.12.0
3333
- SCALA_VERSION=2.12.1
3434
- SCALA_VERSION=2.12.2
35+
- SCALA_VERSION=2.12.3
3536
- SCALA_VERSION=2.13.0-M1
3637

3738
# there's no better way it seems.. https://github.com/travis-ci/travis-ci/issues/1519

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
2+
* Copyright (C) 2009-2017 Typesafe Inc. <http://www.typesafe.com>
33
*/
44

55
// so we can set this from automated builds and also depending on Scala version
@@ -55,7 +55,7 @@ lazy val defaults = Seq(
5555
crossScalaVersions := {
5656
val latest210 = 6
5757
val latest211 = 11
58-
val latest212 = 2
58+
val latest212 = 3
5959
val pre213 = List("M1")
6060
val skipVersions = Set("2.11.9", "2.11.10")
6161
val scala210and211Versions = (2 to latest210).map(i => s"2.10.$i") ++ (0 to latest211).map(i => s"2.11.$i")
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
--- target/expected_output/basic/akka/rk/buh/is/it/A.java
2+
+++ target/expected_output/basic/akka/rk/buh/is/it/A.java
3+
@@ -48,13 +48,13 @@
4+
public class NonStatic {
5+
public NonStatic () { throw new RuntimeException(); }
6+
}
7+
+ public akka.rk.buh.is.it.A.D$.E$ E () { throw new RuntimeException(); }
8+
public D$ () { throw new RuntimeException(); }
9+
/**
10+
* def A.D.math
11+
* @return (undocumented)
12+
*/
13+
public long math () { throw new RuntimeException(); }
14+
- public akka.rk.buh.is.it.A.D$.E$ E () { throw new RuntimeException(); }
15+
}
16+
/**
17+
* class A.B
18+
@@ -94,12 +94,12 @@
19+
public class C1$ {
20+
public C1$ () { throw new RuntimeException(); }
21+
}
22+
- public C1 () { throw new RuntimeException(); }
23+
/**
24+
* Accessor for nested Scala object
25+
* @return (undocumented)
26+
*/
27+
public akka.rk.buh.is.it.A.C1.C1$ C1 () { throw new RuntimeException(); }
28+
+ public C1 () { throw new RuntimeException(); }
29+
}
30+
/**
31+
* object C1
32+
@@ -147,6 +147,11 @@
33+
static public java.lang.String stattic () { throw new RuntimeException(); }
34+
static public java.lang.Object x () { throw new RuntimeException(); }
35+
/**
36+
+ * Accessor for nested Scala object
37+
+ * @return (undocumented)
38+
+ */
39+
+ public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
40+
+ /**
41+
* varargs
42+
* @param s (undocumented)
43+
* @return (undocumented)
44+
@@ -219,9 +224,4 @@
45+
*/
46+
public int testthrows () throws java.lang.IllegalArgumentException, java.lang.NullPointerException { throw new RuntimeException(); }
47+
public scala.runtime.Null$ getNull () { throw new RuntimeException(); }
48+
- /**
49+
- * Accessor for nested Scala object
50+
- * @return (undocumented)
51+
- */
52+
- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
53+
}

0 commit comments

Comments
 (0)