From 5e8c52ea35d2217c771d6b7ec678f2038bfaf7fc Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 11 Nov 2022 13:50:01 -0800 Subject: [PATCH] [J2KT] Add missing @NullMarked annotations in java.util and remove Objects.equal(String, String) method, which is not part of the JRE. PiperOrigin-RevId: 487908001 --- .../javatests/com/google/j2cl/readable/java/jsenum/BUILD | 2 -- .../google/j2cl/readable/java/jsenum/output_kt/Main.kt.txt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/BUILD b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/BUILD index 9666eaf584..31e84e4f4f 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/BUILD +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/BUILD @@ -10,8 +10,6 @@ readable_example( "*.java", "*.native.js", ]), - # TODO(b/204593842): [J2KT] Figure out how to deal with JS native types - build_kt_readables = False, generate_wasm_readables = False, deps = ["//third_party:gwt-jsinterop-annotations-j2cl"], ) diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_kt/Main.kt.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_kt/Main.kt.txt index cacc0cc5d1..36f0081af4 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_kt/Main.kt.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_kt/Main.kt.txt @@ -85,7 +85,7 @@ open class Main { @JvmStatic fun boxingWithGenerics() { - Main.Foo(Optional.of(Main.IntJsEnum.MINUSONE)) + Main.Foo(Optional.of(Main.IntJsEnum.MINUSONE) as Optional?) } } @@ -164,6 +164,6 @@ open class Main { } open class Foo { - constructor(c: Optional?) + constructor(c: Optional?) } }