Skip to content

Commit b71c0e1

Browse files
authored
Merge pull request #281 from SethTisue/scala-2.12.15-is-next
2 parents 1372c5d + 29b548e commit b71c0e1

File tree

3 files changed

+76
-1
lines changed

3 files changed

+76
-1
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ env:
6060
TRAVIS_JDK=adopt@~1.8.0-0
6161
- SCALA_VERSION=2.12.13
6262
TRAVIS_JDK=adopt@~1.11.0-0
63+
- SCALA_VERSION=2.12.14
64+
TRAVIS_JDK=adopt@~1.8.0-0
65+
- SCALA_VERSION=2.12.14
66+
TRAVIS_JDK=adopt@~1.11.0-0
6367
#
6468
# Scala 2.13 supported versions
6569
#

RELEASING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ It is often the case when this compiler plugin needs to be released for a newly
1313
* master, if no features or bug fixes were merged to master since the latest release
1414
* tag, if the master has unreleased features or bug fixes. In this case you will need to cherry pick the commit that adds support for the new Scala version.
1515
1. Create a file `version.sbt` containing `version in ThisBuild := "0.11"` which sets the version to be back-released. This will override the automatic version derivation from the git history. Alternatively you can `set version in ThisBuild := ...` in the command line.
16-
1. Publish the release by running `SONATYPE_USERNAME=xxx SONATYPE_PASSWORD=xxx sbt clean ++2.12.13 publishSigned sonatypeBundleRelease` (with the appropriate credentials and scala version). You will need Sonatype OSS repository rights to publish under `com.typesafe` organisation.
16+
1. Publish the release by running `SONATYPE_USERNAME=xxx SONATYPE_PASSWORD=xxx sbt clean ++2.12.14 publishSigned sonatypeBundleRelease` (with the appropriate credentials and scala version). You will need Sonatype OSS repository rights to publish under `com.typesafe` organisation.
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
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+
@@ -103,8 +103,8 @@
19+
* class A.C
20+
*/
21+
static public class C1 {
22+
- public C1 () { throw new RuntimeException(); }
23+
public akka.rk.buh.is.it.A.C1$C1$ C1 () { throw new RuntimeException(); }
24+
+ public C1 () { throw new RuntimeException(); }
25+
}
26+
/**
27+
* object C1
28+
@@ -142,6 +142,11 @@
29+
static public java.lang.String stattic () { throw new RuntimeException(); }
30+
static public java.lang.Object x () { throw new RuntimeException(); }
31+
/**
32+
+ * Accessor for nested Scala object
33+
+ * @return (undocumented)
34+
+ */
35+
+ public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
36+
+ /**
37+
* varargs
38+
* @param s (undocumented)
39+
* @return (undocumented)
40+
@@ -214,9 +219,4 @@
41+
*/
42+
public int testthrows () throws java.lang.IllegalArgumentException, java.lang.NullPointerException { throw new RuntimeException(); }
43+
public scala.runtime.Null$ getNull () { throw new RuntimeException(); }
44+
- /**
45+
- * Accessor for nested Scala object
46+
- * @return (undocumented)
47+
- */
48+
- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
49+
}
50+
--- target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:52.473679518 +0100
51+
+++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
52+
@@ -2,5 +2,6 @@
53+
public interface Inbox {
54+
public interface InboxExtension {
55+
public int DSLInboxQueueSize () ;
56+
+ public void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1) ;
57+
}
58+
}
59+
--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java 2020-03-23 16:04:03.313049968 +0100
60+
+++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java 2020-03-23 16:04:03.313049968 +0100
61+
@@ -5,7 +5,9 @@
62+
* Static reference to the singleton instance of this Scala object.
63+
*/
64+
public static final JournalPolicies$ MODULE$ = null;
65+
+ public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll () { throw new RuntimeException(); }
66+
public JournalPolicies$ () { throw new RuntimeException(); }
67+
}
68+
- public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy () ;
69+
+ public void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1) ;
70+
+ public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy () ;
71+
}

0 commit comments

Comments
 (0)