Merge pull request #322 from SethTisue/scala-2.13.10

lightbend · Oct 12, 2022 · 601b370 · 601b370
2 parents 28014c3 + 8ba2489
commit 601b370
Show file tree

Hide file tree

Showing 4 changed files with 299 additions and 67 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -37,6 +37,7 @@ jobs:
           - 2.13.7
           - 2.13.8
           - 2.13.9
+          - 2.13.10
         java: [8, 11, 17]
 
     steps:

diff --git a/build.sbt b/build.sbt
@@ -47,7 +47,7 @@ lazy val defaults = Seq(
   scalaVersion := crossScalaVersions.value.last,
   crossScalaVersions := {
     val supportedScala212Versions = (5 to 17).map(p => s"2.12.$p")
-    val supportedScala213Versions = (0 to 9).map(p => s"2.13.$p")
+    val supportedScala213Versions = (0 to 10).map(p => s"2.13.$p")
     supportedScala212Versions ++ supportedScala213Versions
   },
   scalaMajorVersion := CrossVersion.partialVersion(scalaVersion.value).get._2.toInt,

diff --git a/src/test/resources/patches/2.13.10.patch b/src/test/resources/patches/2.13.10.patch
@@ -16,11 +16,9 @@
    static public  akka.actor.Identify apply (Object messageId)  { throw new RuntimeException(); }
    static public  scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0)  { throw new RuntimeException(); }
    public  Object messageId ()  { throw new RuntimeException(); }
-@@ -11,8 +11,8 @@
-   public  java.lang.String productPrefix ()  { throw new RuntimeException(); }
-   public  int productArity ()  { throw new RuntimeException(); }
+@@ -13,6 +13,7 @@
    public  Object productElement (int x$1)  { throw new RuntimeException(); }
--  public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
+   public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
    public  boolean canEqual (Object x$1)  { throw new RuntimeException(); }
 +  public  java.lang.String productElementName (int x$1)  { throw new RuntimeException(); }
    public  int hashCode ()  { throw new RuntimeException(); }
@@ -53,6 +51,33 @@
    public   Props ()  { throw new RuntimeException(); }
    public abstract  akka.actor.typed.Props next ()  ;
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
+--- target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java
++++ target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java
+@@ -10,8 +10,10 @@
+       static public  int hashCode ()  { throw new RuntimeException(); }
+       static public  java.lang.String toString ()  { throw new RuntimeException(); }
+       static public abstract  boolean equals (Object that)  ;
++      static public  java.lang.String productElementName (int n)  { throw new RuntimeException(); }
++      static public  scala.collection.Iterator<java.lang.String> productElementNames ()  { throw new RuntimeException(); }
+     }
+-    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, scala.Serializable {
++    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, java.io.Serializable {
+       /**
+         * Static reference to the singleton instance of this Scala object.
+         */
 --- target/expected_output/basic/akka/rk/buh/is/it/A.java
 +++ target/expected_output/basic/akka/rk/buh/is/it/A.java
 @@ -35,7 +35,7 @@
@@ -140,15 +165,7 @@
      /**
       * Static reference to the singleton instance of this Scala object.
       */
-@@ -14,7 +12,6 @@
-     public  java.lang.String productPrefix () { throw new RuntimeException(); }
-     public  int productArity () { throw new RuntimeException(); }
-     public  Object productElement (int x$1) { throw new RuntimeException(); }
--    public  scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
-     public  boolean canEqual (Object x$1) { throw new RuntimeException(); }
-     public  int hashCode () { throw new RuntimeException(); }
-     public  java.lang.String toString () { throw new RuntimeException(); }
-@@ -18,9 +15,8 @@
+@@ -18,9 +16,8 @@
      public  boolean canEqual (Object x$1) { throw new RuntimeException(); }
      public  int hashCode () { throw new RuntimeException(); }
      public  java.lang.String toString () { throw new RuntimeException(); }
@@ -159,11 +176,9 @@
      public  java.lang.String x () { throw new RuntimeException(); }
      // not preceding
      public   B (java.lang.String x) { throw new RuntimeException(); }
-@@ -30,14 +26,13 @@
-     public  java.lang.String productPrefix () { throw new RuntimeException(); }
-     public  int productArity () { throw new RuntimeException(); }
+@@ -32,12 +29,12 @@
      public  Object productElement (int x$1) { throw new RuntimeException(); }
--    public  scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
+     public  scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
      public  boolean canEqual (Object x$1) { throw new RuntimeException(); }
 +    public  java.lang.String productElementName (int x$1)  { throw new RuntimeException(); }
      public  int hashCode () { throw new RuntimeException(); }
@@ -187,11 +202,9 @@
        static public  akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected apply (Object key, int id, long count)  { throw new RuntimeException(); }
        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(); }
        public  Object key ()  { throw new RuntimeException(); }
-@@ -22,13 +22,13 @@
-       public  java.lang.String productPrefix ()  { throw new RuntimeException(); }
-       public  int productArity ()  { throw new RuntimeException(); }
+@@ -24,11 +24,12 @@
        public  Object productElement (int x$1)  { throw new RuntimeException(); }
--      public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
+       public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
        public  boolean canEqual (Object x$1)  { throw new RuntimeException(); }
 +      public  java.lang.String productElementName (int x$1)  { throw new RuntimeException(); }
        public  int hashCode ()  { throw new RuntimeException(); }
@@ -224,11 +237,9 @@
    // not preceding
    static public  akka.rk.buh.is.it.EWMA apply (double value, double alpha) { throw new RuntimeException(); }
    static public  scala.Option<scala.Tuple2<java.lang.Object, java.lang.Object>> unapply (akka.rk.buh.is.it.EWMA x$0) { throw new RuntimeException(); }
-@@ -42,8 +42,8 @@
-   public  java.lang.String productPrefix () { throw new RuntimeException(); }
-   public  int productArity () { throw new RuntimeException(); }
+@@ -44,6 +44,7 @@
    public  Object productElement (int x$1) { throw new RuntimeException(); }
--  public  scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
+   public  scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
    public  boolean canEqual (Object x$1) { throw new RuntimeException(); }
 +  public  java.lang.String productElementName (int x$1)  { throw new RuntimeException(); }
    public  int hashCode () { throw new RuntimeException(); }
@@ -248,44 +259,3 @@
 -public  interface X extends scala.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
 +public  interface X extends java.io.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
  }
---- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:20:58.647999228 +0100
-+++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:20:58.647999228 +0100
-@@ -5,7 +5,9 @@
-       * Static reference to the singleton instance of this Scala object.
-       */
-     public static final JournalPolicies$ MODULE$ = null;
-+    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
-     public   JournalPolicies$ ()  { throw new RuntimeException(); }
-   }
--  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
-+  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
-+  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
- }
---- target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java
-+++ target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java
-@@ -5,13 +5,15 @@
-       static public  java.lang.String productPrefix ()  { throw new RuntimeException(); }
-       static public  int productArity ()  { throw new RuntimeException(); }
-       static public  Object productElement (int x$1)  { throw new RuntimeException(); }
--      static public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
-       static public  boolean canEqual (Object x$1)  { throw new RuntimeException(); }
-       static public  int hashCode ()  { throw new RuntimeException(); }
-       static public  java.lang.String toString ()  { throw new RuntimeException(); }
-       static public abstract  boolean equals (Object that)  ;
-+      static public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
-+      static public  java.lang.String productElementName (int n)  { throw new RuntimeException(); }
-+      static public  scala.collection.Iterator<java.lang.String> productElementNames ()  { throw new RuntimeException(); }
-     }
--    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, scala.Serializable {
-+    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, java.io.Serializable {
-       /**
-         * Static reference to the singleton instance of this Scala object.
-         */
-@@ -20,7 +22,6 @@
-       public  java.lang.String productPrefix ()  { throw new RuntimeException(); }
-       public  int productArity ()  { throw new RuntimeException(); }
-       public  Object productElement (int x$1)  { throw new RuntimeException(); }
--      public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
-       public  boolean canEqual (Object x$1)  { throw new RuntimeException(); }
-       public  int hashCode ()  { throw new RuntimeException(); }
-       public  java.lang.String toString ()  { throw new RuntimeException(); }
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ jobs: @@
               - 2.13.7
               - 2.13.8
               - 2.13.9
+              - 2.13.10
             java: [8, 11, 17]
         steps:
@@ Expand Down @@