azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tests for Java modules to be compatible with JDK 17

Browse Source
This commit is contained in:
Mikhael Bogdanov
2021-12-07 15:46:59 +01:00
committed by Space
parent 913c7ad956
commit 78597912c0
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/javaModules/jdkModulesFromNamed/main.txt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt:11:24: error: unresolved reference: httpserver compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt:11:18: error: unresolved reference: swing
val s: com.sun.net.httpserver.HttpServer? = null val s: javax.swing.JFrame? = null
^ ^
compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt:12:5: error: overload resolution ambiguity: compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt:12:5: error: overload resolution ambiguity:
public inline fun println(message: Any?): Unit defined in kotlin.io public inline fun println(message: Any?): Unit defined in kotlin.io
public inline fun println(message: Boolean): Unit defined in kotlin.io public inline fun println(message: Boolean): Unit defined in kotlin.io
compiler/testData/javaModules/jdkModulesFromNamed/main/module-info.java
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
module main { module main {
requires java.naming; requires java.naming;
requires jdk.net; requires java.logging;
requires kotlin.stdlib; requires kotlin.stdlib;
} }
compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt
Vendored
+4 -4
View File
@@ -3,11 +3,11 @@ fun main() {
val b: javax.naming.Binding? = null val b: javax.naming.Binding? = null
println(b) println(b)
// Module jdk.net // Module java.logging
val j: jdk.net.Sockets? = null val j: java.util.logging.Filter? = null
println(j) println(j)
// Module jdk.httpserver (this module doesn't depend on it) // Module java.desktop (this module doesn't depend on it)
val s: com.sun.net.httpserver.HttpServer? = null val s: javax.swing.JFrame? = null
println(s) println(s)
} }
compiler/testData/javaModules/jdkModulesFromUnnamed/main/test.kt
Vendored
+4 -4
View File
@@ -3,11 +3,11 @@ fun main() {
val b: javax.naming.Binding? = null val b: javax.naming.Binding? = null
println(b) println(b)
// Module jdk.net // Module java.logging
val j: jdk.net.Sockets? = null val j: java.util.logging.Filter? = null
println(j) println(j)
// Module jdk.httpserver // Module java.desktop
val s: com.sun.net.httpserver.HttpServer? = null val s: javax.swing.JFrame? = null
println(s) println(s)
} }