Skip to content

Commit 02bb828

Browse files
authored
Merge pull request #120 from mahendrapk/master
Added Support for Scala 2.12.4
2 parents f0847fc + 308a788 commit 02bb828

File tree

3 files changed

+57
-1
lines changed

3 files changed

+57
-1
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ env:
3333
- SCALA_VERSION=2.12.1
3434
- SCALA_VERSION=2.12.2
3535
- SCALA_VERSION=2.12.3
36+
- SCALA_VERSION=2.12.4
3637
- SCALA_VERSION=2.13.0-M2
3738

3839
# there's no better way it seems.. https://github.com/travis-ci/travis-ci/issues/1519
@@ -47,6 +48,8 @@ matrix:
4748
env: SCALA_VERSION=2.12.2
4849
- jdk: openjdk6
4950
env: SCALA_VERSION=2.12.3
51+
- jdk: openjdk6
52+
env: SCALA_VERSION=2.12.4
5053
- jdk: openjdk6
5154
env: SCALA_VERSION=2.13.0-M2
5255

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ lazy val defaults = Seq(
5151
scalaVersion := crossScalaVersions.value.last,
5252
crossScalaVersions := {
5353
val latest211 = 11
54-
val latest212 = 3
54+
val latest212 = 4
5555
val pre213 = List("M2")
5656
val skipVersions = Set("2.11.9", "2.11.10")
5757
val scala211Versions =
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)