From a4e604825fe9b02ee6ca68d0834b629ae8173eed Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Sat, 29 May 2021 07:21:27 -0400 Subject: [PATCH 1/2] add support for Scala 2.12.15 nightlies --- src/test/resources/patches/2.12.15.patch | 71 ++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 src/test/resources/patches/2.12.15.patch diff --git a/src/test/resources/patches/2.12.15.patch b/src/test/resources/patches/2.12.15.patch new file mode 100644 index 0000000..e812eb8 --- /dev/null +++ b/src/test/resources/patches/2.12.15.patch @@ -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.PassAll$ PassAll () { throw new RuntimeException(); } + public JournalPolicies$ () { throw new RuntimeException(); } + } +- public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies.PassAll$ DefaultPolicy () ; ++ public void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies.PassAll x$1) ; ++ public akka.persistence.testkit.ProcessingPolicy.DefaultPolicies.PassAll DefaultPolicy () ; + } From 29b548e248acc48cdd6b0b09e3cfdccd9f652845 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Sat, 29 May 2021 07:28:27 -0400 Subject: [PATCH 2/2] add Scala 2.12.14 to CI matrix --- .travis.yml | 4 ++++ RELEASING.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 11df08e..1a4f8fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,10 @@ env: TRAVIS_JDK=adopt@~1.8.0-0 - SCALA_VERSION=2.12.13 TRAVIS_JDK=adopt@~1.11.0-0 + - SCALA_VERSION=2.12.14 + TRAVIS_JDK=adopt@~1.8.0-0 + - SCALA_VERSION=2.12.14 + TRAVIS_JDK=adopt@~1.11.0-0 # # Scala 2.13 supported versions # diff --git a/RELEASING.md b/RELEASING.md index 65d24c8..85e5f93 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -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 * 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.11"` 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.13 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.14 publishSigned sonatypeBundleRelease` (with the appropriate credentials and scala version). You will need Sonatype OSS repository rights to publish under `com.typesafe` organisation.