Skip to content

More JDK 21 fixes #10403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 18, 2023
Merged

More JDK 21 fixes #10403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7808770
fix a warning on JDK 21
SethTisue May 18, 2023
826dd7a
for now, skip TASTy tests on JDK 21
SethTisue May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/junit/scala/jdk/javaapi/StreamConvertersJavaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class StreamConvertersJavaTest {
public List<Integer> li = CollectionConverters.asScala(Arrays.asList(1, 2)).toList();
public List<Float> lf = CollectionConverters.asScala(Arrays.asList(1f, 2f)).toList();

public <K, V> Map<K, V> mkm(K k1, V v1, K k2, V v2) {
public static <K, V> Map<K, V> mkm(K k1, V v1, K k2, V v2) {
java.util.Map<K, V> m = new java.util.HashMap<K, V>();
m.put(k1, v1);
m.put(k2, v2);
Expand Down
3 changes: 3 additions & 0 deletions test/tasty/test/scala/tools/tastytest/TastyTestJUnit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package scala.tools.tastytest

import org.junit.{Test => test, BeforeClass => setup, AfterClass => teardown}
import org.junit.Assert._
import org.junit.Assume._

import scala.util.{Try, Failure, Properties}

Expand Down Expand Up @@ -91,6 +92,8 @@ object TastyTestJUnit {

@setup
def init(): Unit = {
// TODO remove once Scala 3 has a fix for scala/bug#12783
assumeFalse(scala.util.Properties.isJavaAtLeast("21"))
_dottyClassLoader = Dotc.initClassloader().get
}

Expand Down