Skip to content

Commit

Permalink
support Scala 2.12.15 (and 2.12.16 nightlies) (#295)
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue authored Sep 15, 2021
1 parent a289166 commit ed83fe4
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
- 2.12.12
- 2.12.13
- 2.12.14
- 2.12.15
- 2.13.0
- 2.13.1
- 2.13.2
Expand Down
2 changes: 1 addition & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ It is often the case when this compiler plugin needs to be released for a newly
* master, if no features or bug fixes were merged to master since the latest release. In this case create a tag recording you released from this commit, e.g. `git tag v0.16_2.12.13; git push --tags`.
* 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.
1. Create a file `version.sbt` containing `version in ThisBuild := "0.16"` 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.
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.
1. Publish the release by running `SONATYPE_USERNAME=xxx SONATYPE_PASSWORD=xxx sbt clean ++2.12.15 publishSigned sonatypeBundleRelease` (with the appropriate credentials and scala version). You will need Sonatype OSS repository rights to publish under `com.typesafe` organisation.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ lazy val defaults = Seq(
sonatypeProfileName := "com.typesafe",
scalaVersion := crossScalaVersions.value.last,
crossScalaVersions := {
// Remember to keep this list aligned with .travis.yml
// Remember to keep these lists aligned with .github/workflows/validate.yml
// 2.11.6 is the first to be supported and we skip 2.11.9 and 2.11.10
val supportedScala211Versions = Seq("2.11.6", "2.11.7", "2.11.8", "2.11.11", "2.11.12")
// Scala 2.12.[0-2] are not supported
val supportedScala212Versions = (3 to 14).map(p => s"2.12.$p")
val supportedScala212Versions = (3 to 15).map(p => s"2.12.$p")
val supportedScala213Versions = (0 to 6).map(p => s"2.13.$p")
supportedScala211Versions ++ supportedScala212Versions ++ supportedScala213Versions
},
Expand Down
71 changes: 71 additions & 0 deletions src/test/resources/patches/2.12.16.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
--- target/expected_output/basic/akka/rk/buh/is/it/A.java
+++ target/expected_output/basic/akka/rk/buh/is/it/A.java
@@ -48,13 +48,13 @@
public class NonStatic {
public NonStatic () { throw new RuntimeException(); }
}
+ public akka.rk.buh.is.it.A.D$.E$ E () { throw new RuntimeException(); }
public D$ () { throw new RuntimeException(); }
/**
* def A.D.math
* @return (undocumented)
*/
public long math () { throw new RuntimeException(); }
- public akka.rk.buh.is.it.A.D$.E$ E () { throw new RuntimeException(); }
}
/**
* class A.B
@@ -103,8 +103,8 @@
* class A.C
*/
static public class C1 {
- public C1 () { throw new RuntimeException(); }
public akka.rk.buh.is.it.A.C1$C1$ C1 () { throw new RuntimeException(); }
+ public C1 () { throw new RuntimeException(); }
}
/**
* object C1
@@ -142,6 +142,11 @@
static public java.lang.String stattic () { throw new RuntimeException(); }
static public java.lang.Object x () { throw new RuntimeException(); }
/**
+ * Accessor for nested Scala object
+ * @return (undocumented)
+ */
+ public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
+ /**
* varargs
* @param s (undocumented)
* @return (undocumented)
@@ -214,9 +219,4 @@
*/
public int testthrows () throws java.lang.IllegalArgumentException, java.lang.NullPointerException { throw new RuntimeException(); }
public scala.runtime.Null$ getNull () { throw new RuntimeException(); }
- /**
- * Accessor for nested Scala object
- * @return (undocumented)
- */
- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
}
--- target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:52.473679518 +0100
+++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
@@ -2,5 +2,6 @@
public interface Inbox {
public interface InboxExtension {
public int DSLInboxQueueSize () ;
+ public void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1) ;
}
}
--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java 2020-03-23 16:04:03.313049968 +0100
+++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java 2020-03-23 16:04:03.313049968 +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 () ;
}

0 comments on commit ed83fe4

Please sign in to comment.