Skip to content

Commit 28014c3

Browse files
SethTisueSethTisue
authored
Merge pull request #320 from SethTisue/scala-2.13.9-followup
2 parents 8784fec + 1d79be1 commit 28014c3

File tree

3 files changed

+293
-1
lines changed

3 files changed

+293
-1
lines changed

‎.github/workflows/validate.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- 2.13.6
3737
- 2.13.7
3838
- 2.13.8
39+
- 2.13.9
3940
java: [8, 11, 17]
4041

4142
steps:

‎build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ lazy val defaults = Seq(
4747
scalaVersion := crossScalaVersions.value.last,
4848
crossScalaVersions := {
4949
val supportedScala212Versions = (5 to 17).map(p => s"2.12.$p")
50-
val supportedScala213Versions = (0 to 8).map(p => s"2.13.$p")
50+
val supportedScala213Versions = (0 to 9).map(p => s"2.13.$p")
5151
supportedScala212Versions ++ supportedScala213Versions
5252
},
5353
scalaMajorVersion := CrossVersion.partialVersion(scalaVersion.value).get._2.toInt,

‎src/test/resources/patches/2.13.10.patch‎

Lines changed: 291 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,291 @@
1+
--- target/expected_output/basic/akka/actor/Identify$.java
2+
+++ target/expected_output/basic/akka/actor/Identify$.java
3+
@@ -1,5 +1,5 @@
4+
package akka.actor;
5+
-public class Identify$ extends scala.runtime.AbstractFunction1<java.lang.Object, akka.actor.Identify> implements scala.Serializable {
6+
+public class Identify$ extends scala.runtime.AbstractFunction1<java.lang.Object, akka.actor.Identify> implements java.io.Serializable {
7+
/**
8+
* Static reference to the singleton instance of this Scala object.
9+
*/
10+
--- target/expected_output/basic/akka/actor/Identify.java
11+
+++ target/expected_output/basic/akka/actor/Identify.java
12+
@@ -1,5 +1,5 @@
13+
package akka.actor;
14+
-public final class Identify implements scala.Product, scala.Serializable {
15+
+public final class Identify implements scala.Product, java.io.Serializable {
16+
static public akka.actor.Identify apply (Object messageId) { throw new RuntimeException(); }
17+
static public scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0) { throw new RuntimeException(); }
18+
public Object messageId () { throw new RuntimeException(); }
19+
@@ -11,8 +11,8 @@
20+
public java.lang.String productPrefix () { throw new RuntimeException(); }
21+
public int productArity () { throw new RuntimeException(); }
22+
public Object productElement (int x$1) { throw new RuntimeException(); }
23+
- public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
24+
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
25+
+ public java.lang.String productElementName (int x$1) { throw new RuntimeException(); }
26+
public int hashCode () { throw new RuntimeException(); }
27+
public java.lang.String toString () { throw new RuntimeException(); }
28+
public boolean equals (Object x$1) { throw new RuntimeException(); }
29+
--- target/expected_output/basic/akka/actor/dsl/Inbox.java
30+
+++ target/expected_output/basic/akka/actor/dsl/Inbox.java
31+
@@ -2,5 +2,6 @@
32+
public interface Inbox {
33+
public interface InboxExtension {
34+
public int DSLInboxQueueSize () ;
35+
+ public void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1) ;
36+
}
37+
}
38+
--- target/expected_output/basic/akka/actor/typed/DispatcherSelector$.java
39+
+++ target/expected_output/basic/akka/actor/typed/DispatcherSelector$.java
40+
@@ -1,5 +1,5 @@
41+
package akka.actor.typed;
42+
-public class DispatcherSelector$ implements scala.Serializable {
43+
+public class DispatcherSelector$ implements java.io.Serializable {
44+
/**
45+
* Static reference to the singleton instance of this Scala object.
46+
*/
47+
--- target/expected_output/basic/akka/actor/typed/Props.java
48+
+++ target/expected_output/basic/akka/actor/typed/Props.java
49+
@@ -1,5 +1,5 @@
50+
package akka.actor.typed;
51+
-public abstract class Props implements scala.Product, scala.Serializable {
52+
+public abstract class Props implements scala.Product, java.io.Serializable {
53+
public Props () { throw new RuntimeException(); }
54+
public abstract akka.actor.typed.Props next () ;
55+
}
56+
--- target/expected_output/basic/akka/rk/buh/is/it/A.java
57+
+++ target/expected_output/basic/akka/rk/buh/is/it/A.java
58+
@@ -35,7 +35,7 @@
59+
/**
60+
* object A.D
61+
*/
62+
- public class D$ implements scala.Serializable {
63+
+ public class D$ implements java.io.Serializable {
64+
/**
65+
* And a nested object.
66+
*/
67+
@@ -48,13 +48,13 @@
68+
public class NonStatic {
69+
public NonStatic () { throw new RuntimeException(); }
70+
}
71+
+ public akka.rk.buh.is.it.A.D$.E$ E () { throw new RuntimeException(); }
72+
public D$ () { throw new RuntimeException(); }
73+
/**
74+
* def A.D.math
75+
* @return (undocumented)
76+
*/
77+
public long math () { throw new RuntimeException(); }
78+
- public akka.rk.buh.is.it.A.D$.E$ E () { throw new RuntimeException(); }
79+
}
80+
/**
81+
* class A.B
82+
@@ -76,7 +76,7 @@
83+
* def b(args: java.lang.String*): Unit
84+
* @param args (undocumented)
85+
*/
86+
- public void b (scala.collection.Seq<java.lang.String> args) { throw new RuntimeException(); }
87+
+ public void b (scala.collection.immutable.Seq<java.lang.String> args) { throw new RuntimeException(); }
88+
public java.lang.String d (java.lang.String a, akka.rk.buh.is.it.X b) { throw new RuntimeException(); }
89+
}
90+
public class C implements akka.rk.buh.is.it.X {
91+
@@ -103,8 +103,8 @@
92+
* class A.C
93+
*/
94+
static public class C1 {
95+
- public C1 () { throw new RuntimeException(); }
96+
public akka.rk.buh.is.it.A.C1$C1$ C1 () { throw new RuntimeException(); }
97+
+ public C1 () { throw new RuntimeException(); }
98+
}
99+
/**
100+
* object C1
101+
@@ -142,6 +142,11 @@
102+
static public java.lang.String stattic () { throw new RuntimeException(); }
103+
static public java.lang.Object x () { throw new RuntimeException(); }
104+
/**
105+
+ * Accessor for nested Scala object
106+
+ * @return (undocumented)
107+
+ */
108+
+ public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
109+
+ /**
110+
* varargs
111+
* @param s (undocumented)
112+
* @return (undocumented)
113+
@@ -207,16 +212,11 @@
114+
* @param s (undocumented)
115+
* @return (undocumented)
116+
*/
117+
- public int hello (scala.collection.Seq<java.lang.String> s) { throw new RuntimeException(); }
118+
+ public int hello (scala.collection.immutable.Seq<java.lang.String> s) { throw new RuntimeException(); }
119+
/**
120+
* throws
121+
* @return (undocumented)
122+
*/
123+
public int testthrows () throws java.lang.IllegalArgumentException, java.lang.NullPointerException { throw new RuntimeException(); }
124+
public scala.runtime.Null$ getNull () { throw new RuntimeException(); }
125+
- /**
126+
- * Accessor for nested Scala object
127+
- * @return (undocumented)
128+
- */
129+
- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
130+
}
131+
--- target/expected_output/basic/akka/rk/buh/is/it/Blarb.java
132+
+++ target/expected_output/basic/akka/rk/buh/is/it/Blarb.java
133+
@@ -4,8 +3,7 @@
134+
* I am an object. I have no class.
135+
*/
136+
public class Blarb {
137+
- // no position
138+
- static public class A$ implements akka.rk.buh.is.it.Blarb.Fuz, scala.Product, scala.Serializable {
139+
+ static public class A$ implements akka.rk.buh.is.it.Blarb.Fuz, scala.Product, java.io.Serializable {
140+
/**
141+
* Static reference to the singleton instance of this Scala object.
142+
*/
143+
@@ -14,7 +12,6 @@
144+
public java.lang.String productPrefix () { throw new RuntimeException(); }
145+
public int productArity () { throw new RuntimeException(); }
146+
public Object productElement (int x$1) { throw new RuntimeException(); }
147+
- public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
148+
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
149+
public int hashCode () { throw new RuntimeException(); }
150+
public java.lang.String toString () { throw new RuntimeException(); }
151+
@@ -18,9 +15,8 @@
152+
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
153+
public int hashCode () { throw new RuntimeException(); }
154+
public java.lang.String toString () { throw new RuntimeException(); }
155+
- private java.lang.Object readResolve () { throw new RuntimeException(); }
156+
}
157+
- static public class B implements akka.rk.buh.is.it.Blarb.Fuz, scala.Product, scala.Serializable {
158+
+ static public class B implements akka.rk.buh.is.it.Blarb.Fuz, scala.Product, java.io.Serializable {
159+
public java.lang.String x () { throw new RuntimeException(); }
160+
// not preceding
161+
public B (java.lang.String x) { throw new RuntimeException(); }
162+
@@ -30,14 +26,13 @@
163+
public java.lang.String productPrefix () { throw new RuntimeException(); }
164+
public int productArity () { throw new RuntimeException(); }
165+
public Object productElement (int x$1) { throw new RuntimeException(); }
166+
- public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
167+
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
168+
+ public java.lang.String productElementName (int x$1) { throw new RuntimeException(); }
169+
public int hashCode () { throw new RuntimeException(); }
170+
public java.lang.String toString () { throw new RuntimeException(); }
171+
public boolean equals (Object x$1) { throw new RuntimeException(); }
172+
}
173+
- // no position
174+
- static public class B$ extends scala.runtime.AbstractFunction1<java.lang.String, akka.rk.buh.is.it.Blarb.B> implements scala.Serializable {
175+
+ static public class B$ extends scala.runtime.AbstractFunction1<java.lang.String, akka.rk.buh.is.it.Blarb.B> implements java.io.Serializable {
176+
/**
177+
* Static reference to the singleton instance of this Scala object.
178+
*/
179+
--- target/expected_output/basic/akka/rk/buh/is/it/CompressionProtocol.java
180+
+++ target/expected_output/basic/akka/rk/buh/is/it/CompressionProtocol.java
181+
@@ -5,7 +5,7 @@
182+
* Static reference to the singleton instance of this Scala object.
183+
*/
184+
public static final Events$ MODULE$ = null;
185+
- public final class HeavyHitterDetected implements akka.rk.buh.is.it.CompressionProtocol.Events.Event, scala.Product, scala.Serializable {
186+
+ public final class HeavyHitterDetected implements akka.rk.buh.is.it.CompressionProtocol.Events.Event, scala.Product, java.io.Serializable {
187+
static public akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected apply (Object key, int id, long count) { throw new RuntimeException(); }
188+
static public scala.Option<scala.Tuple3<java.lang.Object, java.lang.Object, java.lang.Object>> unapply (akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected x$0) { throw new RuntimeException(); }
189+
public Object key () { throw new RuntimeException(); }
190+
@@ -22,13 +22,13 @@
191+
public java.lang.String productPrefix () { throw new RuntimeException(); }
192+
public int productArity () { throw new RuntimeException(); }
193+
public Object productElement (int x$1) { throw new RuntimeException(); }
194+
- public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
195+
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
196+
+ public java.lang.String productElementName (int x$1) { throw new RuntimeException(); }
197+
public int hashCode () { throw new RuntimeException(); }
198+
public java.lang.String toString () { throw new RuntimeException(); }
199+
public boolean equals (Object x$1) { throw new RuntimeException(); }
200+
}
201+
- public class HeavyHitterDetected$ extends scala.runtime.AbstractFunction3<java.lang.Object, java.lang.Object, java.lang.Object, akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected> implements scala.Serializable {
202+
+ public class HeavyHitterDetected$ extends scala.runtime.AbstractFunction3<java.lang.Object, java.lang.Object, java.lang.Object, akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected> implements java.io.Serializable {
203+
/**
204+
* Static reference to the singleton instance of this Scala object.
205+
*/
206+
--- target/expected_output/basic/akka/rk/buh/is/it/EWMA$.java
207+
+++ target/expected_output/basic/akka/rk/buh/is/it/EWMA$.java
208+
@@ -1,6 +1,5 @@
209+
package akka.rk.buh.is.it;
210+
-// no position
211+
-public class EWMA$ implements scala.Serializable {
212+
+public class EWMA$ implements java.io.Serializable {
213+
/**
214+
* Static reference to the singleton instance of this Scala object.
215+
*/
216+
--- target/expected_output/basic/akka/rk/buh/is/it/EWMA.java
217+
+++ target/expected_output/basic/akka/rk/buh/is/it/EWMA.java
218+
@@ -18,7 +18,7 @@
219+
* This value is always used as the previous EWMA to calculate the new EWMA.
220+
* <p>
221+
*/
222+
-public final class EWMA implements scala.Product, scala.Serializable {
223+
+public final class EWMA implements scala.Product, java.io.Serializable {
224+
// not preceding
225+
static public akka.rk.buh.is.it.EWMA apply (double value, double alpha) { throw new RuntimeException(); }
226+
static public scala.Option<scala.Tuple2<java.lang.Object, java.lang.Object>> unapply (akka.rk.buh.is.it.EWMA x$0) { throw new RuntimeException(); }
227+
@@ -42,8 +42,8 @@
228+
public java.lang.String productPrefix () { throw new RuntimeException(); }
229+
public int productArity () { throw new RuntimeException(); }
230+
public Object productElement (int x$1) { throw new RuntimeException(); }
231+
- public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
232+
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
233+
+ public java.lang.String productElementName (int x$1) { throw new RuntimeException(); }
234+
public int hashCode () { throw new RuntimeException(); }
235+
public java.lang.String toString () { throw new RuntimeException(); }
236+
public boolean equals (Object x$1) { throw new RuntimeException(); }
237+
--- target/expected_output/basic/akka/rk/buh/is/it/Status$Status.java
238+
+++ target/expected_output/basic/akka/rk/buh/is/it/Status$Status.java
239+
@@ -1,3 +1,3 @@
240+
package akka.rk.buh.is.it;
241+
-public interface Status$Status extends scala.Serializable {
242+
+public interface Status$Status extends java.io.Serializable {
243+
}
244+
--- target/expected_output/basic/akka/rk/buh/is/it/X.java
245+
+++ target/expected_output/basic/akka/rk/buh/is/it/X.java
246+
@@ -1,3 +1,3 @@
247+
package akka.rk.buh.is.it;
248+
-public interface X extends scala.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
249+
+public interface X extends java.io.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
250+
}
251+
--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java 2020-03-23 16:20:58.647999228 +0100
252+
+++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java 2020-03-23 16:20:58.647999228 +0100
253+
@@ -5,7 +5,9 @@
254+
* Static reference to the singleton instance of this Scala object.
255+
*/
256+
public static final JournalPolicies$ MODULE$ = null;
257+
+ public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll () { throw new RuntimeException(); }
258+
public JournalPolicies$ () { throw new RuntimeException(); }
259+
}
260+
- public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy () ;
261+
+ public void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1) ;
262+
+ public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy () ;
263+
}
264+
--- target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java
265+
+++ target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java
266+
@@ -5,13 +5,15 @@
267+
static public java.lang.String productPrefix () { throw new RuntimeException(); }
268+
static public int productArity () { throw new RuntimeException(); }
269+
static public Object productElement (int x$1) { throw new RuntimeException(); }
270+
- static public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
271+
static public boolean canEqual (Object x$1) { throw new RuntimeException(); }
272+
static public int hashCode () { throw new RuntimeException(); }
273+
static public java.lang.String toString () { throw new RuntimeException(); }
274+
static public abstract boolean equals (Object that) ;
275+
+ static public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
276+
+ static public java.lang.String productElementName (int n) { throw new RuntimeException(); }
277+
+ static public scala.collection.Iterator<java.lang.String> productElementNames () { throw new RuntimeException(); }
278+
}
279+
- public class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, scala.Serializable {
280+
+ public class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, java.io.Serializable {
281+
/**
282+
* Static reference to the singleton instance of this Scala object.
283+
*/
284+
@@ -20,7 +22,6 @@
285+
public java.lang.String productPrefix () { throw new RuntimeException(); }
286+
public int productArity () { throw new RuntimeException(); }
287+
public Object productElement (int x$1) { throw new RuntimeException(); }
288+
- public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
289+
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
290+
public int hashCode () { throw new RuntimeException(); }
291+
public java.lang.String toString () { throw new RuntimeException(); }

0 commit comments

Comments
 (0)