Merge pull request scala#10400 from SethTisue/jdk-21-ea-rebased-2

Author: SethTisue

.github/workflows/ci.yml

@@ -16,7 +16,16 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
+        java-distribution: [temurin]
         java: [8, 11, 17, 20]
+        # 21-ea will presumably be available from Temurin eventually, but for now:
+        include:
+          - os: ubuntu-latest
+            java-distribution: zulu
+            java: 21-ea
+          - os: windows-latest
+            java-distribution: zulu
+            java: 21-ea
     runs-on: ${{matrix.os}}
     steps:
       - run: git config --global core.autocrlf false
@@ -26,15 +35,15 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          distribution: temurin
+          distribution: ${{matrix.java-distribution}}
           java-version: ${{matrix.java}}
           cache: sbt
 
       - name: Build
         run: |
-          sbt setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
+          sbt -Dsbt.scala.version=2.12.18-M2 setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
 
       - name: Test
         run: |
           STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
-          sbt -Dstarr.version=$STARR setupValidateTest test:compile info testAll
+          sbt -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest test:compile info testAll

.travis.yml

@@ -40,9 +40,9 @@ jobs:
         name: "JDK 8 pr validation"
         if: type = pull_request
         script:
-          - sbt -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
+          - sbt -Dsbt.scala.version=2.12.18-M2 -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
           - STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
-          - sbt -Dstarr.version=$STARR -warn setupValidateTest test:compile info testAll
+          - sbt -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR -warn setupValidateTest test:compile info testAll
 
       # build the spec using jekyll
       - stage: build

project/build.properties

@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.8.3

scripts/common

@@ -17,7 +17,7 @@ mkdir -p "$WORKSPACE/resolutionScratch_"
 SBT_VERSION=`grep sbt.version $WORKSPACE/project/build.properties | sed -n 's/sbt.version=\(.*\)/\1/p'`
 
 SBT_CMD=${SBT_CMD-sbt}
-SBT_CMD="$SBT_CMD -sbt-version $SBT_VERSION"
+SBT_CMD="$SBT_CMD -Dsbt.scala.version=2.12.18-M2 -sbt-version $SBT_VERSION"
 
 # repo to publish builds
 integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}

test/files/neg/macro-exception.check

@@ -1,8 +1,11 @@
 Test_2.scala:2: error: exception during macro expansion:
 java.lang.Exception
 	at Macros$.impl(Macros_1.scala:6)
-#partest java20+
+#partest java20
 	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104)
+#partest java21+
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+#partest java20+
 	at java.base/java.lang.reflect.Method.invoke(Method.java:578)
 	at scala.reflect.macros.runtime.JavaReflectionRuntimes$JavaReflectionResolvers.$anonfun$resolveJavaReflectionRuntime$6(JavaReflectionRuntimes.scala:51)
 	at scala.tools.nsc.typechecker.Macros.macroExpandWithRuntime(Macros.scala:849)

test/files/neg/macro-invalidret.check

@@ -18,8 +18,11 @@ Macros_Test_2.scala:7: error: macro defs must have explicitly specified return t
 Macros_Test_2.scala:15: error: exception during macro expansion:
 java.lang.NullPointerException
 	at Impls$.foo3(Impls_1.scala:8)
-#partest java20+
+#partest java20
 	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104)
+#partest java21+
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+#partest java20+
 	at java.base/java.lang.reflect.Method.invoke(Method.java:578)
 	at scala.reflect.macros.runtime.JavaReflectionRuntimes$JavaReflectionResolvers.$anonfun$resolveJavaReflectionRuntime$6(JavaReflectionRuntimes.scala:51)
 	at scala.tools.nsc.typechecker.Macros.macroExpandWithRuntime(Macros.scala:849)

test/files/run/sammy_after_implicit_view.scala

@@ -3,7 +3,7 @@ trait MySam { def apply(x: Int): String }
 // check that SAM conversion happens after implicit view application
 object Test extends App {
   final val AnonFunClass = "$anon$"
-  final val LMFClass = "$$Lambda$" // LambdaMetaFactory names classes like this
+  final val LMFClass = "$$Lambda" // LambdaMetaFactory names classes like this
 
   //  if there's an implicit conversion, it does not takes precedence (because that's what dotty does)
   def implicitSam() = {

test/files/run/sammy_restrictions_LMF.scala

@@ -15,7 +15,7 @@ trait TClassParent extends B { def apply(x: Int): String }
 
 object Test extends App {
   final val AnonFunClass = "$anonfun$"
-  final val LMFClass = "$$Lambda$" // LambdaMetaFactory names classes like this
+  final val LMFClass = "$$Lambda" // LambdaMetaFactory names classes like this
 
   private def LMF(f: Any): Unit = {
     val className = f.getClass.toString

versions.properties

@@ -1,5 +1,5 @@
 # Scala version used for bootstrapping (see README.md)
-starr.version=2.12.18-M1
+starr.version=2.12.18-M2
 
 # The scala.binary.version determines how modules are resolved. It is set as follows:
 #  - After 2.x.0 is released, the binary version is 2.x