Skip to content

Commit 601b370

Browse files
SethTisueSethTisue
authored
Merge pull request #322 from SethTisue/scala-2.13.10
2 parents 28014c3 + 8ba2489 commit 601b370

File tree

4 files changed

+299
-67
lines changed

4 files changed

+299
-67
lines changed

‎.github/workflows/validate.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
- 2.13.7
3838
- 2.13.8
3939
- 2.13.9
40+
- 2.13.10
4041
java: [8, 11, 17]
4142

4243
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 9).map(p => s"2.13.$p")
50+
val supportedScala213Versions = (0 to 10).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: 36 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
static public akka.actor.Identify apply (Object messageId) { throw new RuntimeException(); }
1717
static public scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0) { throw new RuntimeException(); }
1818
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(); }
19+
@@ -13,6 +13,7 @@
2220
public Object productElement (int x$1) { throw new RuntimeException(); }
23-
- public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
21+
public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
2422
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
2523
+ public java.lang.String productElementName (int x$1) { throw new RuntimeException(); }
2624
public int hashCode () { throw new RuntimeException(); }
@@ -53,6 +51,33 @@
5351
public Props () { throw new RuntimeException(); }
5452
public abstract akka.actor.typed.Props next () ;
5553
}
54+
--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java
55+
+++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java
56+
@@ -5,7 +5,9 @@
57+
* Static reference to the singleton instance of this Scala object.
58+
*/
59+
public static final JournalPolicies$ MODULE$ = null;
60+
+ public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll () { throw new RuntimeException(); }
61+
public JournalPolicies$ () { throw new RuntimeException(); }
62+
}
63+
- public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy () ;
64+
+ public void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1) ;
65+
+ public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy () ;
66+
}
67+
--- target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java
68+
+++ target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java
69+
@@ -10,8 +10,10 @@
70+
static public int hashCode () { throw new RuntimeException(); }
71+
static public java.lang.String toString () { throw new RuntimeException(); }
72+
static public abstract boolean equals (Object that) ;
73+
+ static public java.lang.String productElementName (int n) { throw new RuntimeException(); }
74+
+ static public scala.collection.Iterator<java.lang.String> productElementNames () { throw new RuntimeException(); }
75+
}
76+
- public class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, scala.Serializable {
77+
+ public class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, java.io.Serializable {
78+
/**
79+
* Static reference to the singleton instance of this Scala object.
80+
*/
5681
--- target/expected_output/basic/akka/rk/buh/is/it/A.java
5782
+++ target/expected_output/basic/akka/rk/buh/is/it/A.java
5883
@@ -35,7 +35,7 @@
@@ -140,15 +165,7 @@
140165
/**
141166
* Static reference to the singleton instance of this Scala object.
142167
*/
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 @@
168+
@@ -18,9 +16,8 @@
152169
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
153170
public int hashCode () { throw new RuntimeException(); }
154171
public java.lang.String toString () { throw new RuntimeException(); }
@@ -159,11 +176,9 @@
159176
public java.lang.String x () { throw new RuntimeException(); }
160177
// not preceding
161178
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(); }
179+
@@ -32,12 +29,12 @@
165180
public Object productElement (int x$1) { throw new RuntimeException(); }
166-
- public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
181+
public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
167182
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
168183
+ public java.lang.String productElementName (int x$1) { throw new RuntimeException(); }
169184
public int hashCode () { throw new RuntimeException(); }
@@ -187,11 +202,9 @@
187202
static public akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected apply (Object key, int id, long count) { throw new RuntimeException(); }
188203
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(); }
189204
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(); }
205+
@@ -24,11 +24,12 @@
193206
public Object productElement (int x$1) { throw new RuntimeException(); }
194-
- public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
207+
public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
195208
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
196209
+ public java.lang.String productElementName (int x$1) { throw new RuntimeException(); }
197210
public int hashCode () { throw new RuntimeException(); }
@@ -224,11 +237,9 @@
224237
// not preceding
225238
static public akka.rk.buh.is.it.EWMA apply (double value, double alpha) { throw new RuntimeException(); }
226239
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(); }
240+
@@ -44,6 +44,7 @@
230241
public Object productElement (int x$1) { throw new RuntimeException(); }
231-
- public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
242+
public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
232243
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
233244
+ public java.lang.String productElementName (int x$1) { throw new RuntimeException(); }
234245
public int hashCode () { throw new RuntimeException(); }
@@ -248,44 +259,3 @@
248259
-public interface X extends scala.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
249260
+public interface X extends java.io.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
250261
}
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)