Skip to content

Commit bd654c7

Browse files
SethTisueSethTisue
authored
Merge pull request #266 from SethTisue/scala-2.13.6-is-next
2 parents 821df47 + eea383f commit bd654c7

File tree

1 file changed

+262
-0
lines changed

1 file changed

+262
-0
lines changed

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

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

0 commit comments

Comments
 (0)