Stop using native java rules (#258)

Fixes #247
bazelbuild · Jan 15, 2020 · 186c1e1 · 186c1e1
1 parent a3d4d56
commit 186c1e1
Show file tree

Hide file tree

Showing 44 changed files with 46 additions and 2 deletions.
diff --git a/examples/dagger/BUILD b/examples/dagger/BUILD
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_plugin")
 package(default_visibility = ["//visibility:private"])
 
 load("//kotlin:kotlin.bzl", "kt_jvm_library")

diff --git a/kotlin/internal/repositories/BUILD.com_github_jetbrains_kotlin b/kotlin/internal/repositories/BUILD.com_github_jetbrains_kotlin
@@ -14,6 +14,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_js_import", "kt_jvm_import")
+load("@rules_java//java:defs.bzl", "java_import")
 
 # Kotlin home filegroup containing everything that is needed.
 filegroup(

diff --git a/src/main/kotlin/BUILD b/src/main/kotlin/BUILD
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_java//java:defs.bzl", "java_binary")
 load("//src/main/kotlin:bootstrap.bzl", "kt_bootstrap_library")
 load("//kotlin:kotlin.bzl", "kt_jvm_library")
 load("//third_party:jarjar.bzl", "jar_jar")

diff --git a/src/main/kotlin/bootstrap.bzl b/src/main/kotlin/bootstrap.bzl
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_java//java:defs.bzl", "java_import", "java_library")
 load("//kotlin:kotlin.bzl", _for_ide = "kt_jvm_library")
 
 _BOOTSTRAP_LIB_ARGS = ["-jvm-target", "1.8"]
@@ -100,7 +101,7 @@ rm $(@D)/$${NAME}_temp.jar
         ],
         cmd = command,
     )
-    native.java_import(
+    java_import(
         name = name,
         jars = [jar_label],
         tags = ["no-ide"],

diff --git a/src/main/kotlin/io/bazel/kotlin/builder/BUILD b/src/main/kotlin/io/bazel/kotlin/builder/BUILD
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_java//java:defs.bzl", "java_library")
 load("//src/main/kotlin:bootstrap.bzl", "kt_bootstrap_library")
 
 kt_bootstrap_library(

diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_java//java:defs.bzl", "java_import")
 package(default_visibility = ["//visibility:public"])
 
 proto_library(

diff --git a/src/test/data/jvm/basic/BUILD b/src/test/data/jvm/basic/BUILD
@@ -13,6 +13,7 @@
 # limitations under the License.
 package(default_visibility = ["//visibility:private"])
 
+load("@rules_java//java:defs.bzl", "java_binary", "java_library")
 load("//kotlin:kotlin.bzl", "kt_jvm_binary", "kt_jvm_library", "kt_jvm_test")
 
 kt_jvm_binary(

diff --git a/src/test/data/jvm/kapt/BUILD b/src/test/data/jvm/kapt/BUILD
@@ -13,6 +13,7 @@
 # limitations under the License.
 package(default_visibility = ["//visibility:private"])
 
+load("@rules_java//java:defs.bzl", "java_plugin", "java_library")
 load("//kotlin:kotlin.bzl", "kt_jvm_library")
 
 java_plugin(

diff --git a/src/test/kotlin/io/bazel/kotlin/builder/BUILD b/src/test/kotlin/io/bazel/kotlin/builder/BUILD
@@ -13,6 +13,7 @@
 # limitations under the License.
 package(default_visibility = ["//visibility:private"])
 
+load("@rules_java//java:defs.bzl", "java_library")
 load("//src/test/kotlin/io/bazel/kotlin:defs.bzl", "kt_rules_test")
 
 _COMMON_DEPS = [

diff --git a/src/test/kotlin/io/bazel/kotlin/defs.bzl b/src/test/kotlin/io/bazel/kotlin/defs.bzl
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_java//java:defs.bzl", "java_test")
 load("//kotlin:kotlin.bzl", "kt_jvm_test")
 
 def _get_class_name(kwargs):
@@ -30,7 +31,7 @@ def kt_rules_test(name, **kwargs):
         if f.endswith(".kt"):
             kt_jvm_test(name = name, **kwargs)
             return
-    native.java_test(name = name, **kwargs)
+    java_test(name = name, **kwargs)
 
 def kt_rules_e2e_test(name, **kwargs):
     kwargs.setdefault("size", "small")

diff --git a/third_party/BUILD b/third_party/BUILD
@@ -13,6 +13,7 @@
 # limitations under the License.
 package(default_visibility = ["//visibility:public"])
 
+load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_plugin")
 load("//kotlin:kotlin.bzl", "kt_jvm_import")
 
 

diff --git a/third_party/jvm/com/google/auto/BUILD b/third_party/jvm/com/google/auto/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/auto/service/BUILD b/third_party/jvm/com/google/auto/service/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/auto/value/BUILD b/third_party/jvm/com/google/auto/value/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/code/findbugs/BUILD b/third_party/jvm/com/google/code/findbugs/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/code/gson/BUILD b/third_party/jvm/com/google/code/gson/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/dagger/BUILD b/third_party/jvm/com/google/dagger/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/errorprone/BUILD b/third_party/jvm/com/google/errorprone/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/googlejavaformat/BUILD b/third_party/jvm/com/google/googlejavaformat/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/guava/BUILD b/third_party/jvm/com/google/guava/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/j2objc/BUILD b/third_party/jvm/com/google/j2objc/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/protobuf/BUILD b/third_party/jvm/com/google/protobuf/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/google/truth/BUILD b/third_party/jvm/com/google/truth/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/googlecode/java_diff_utils/BUILD b/third_party/jvm/com/googlecode/java_diff_utils/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/com/squareup/BUILD b/third_party/jvm/com/squareup/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/javax/annotation/BUILD b/third_party/jvm/javax/annotation/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/javax/enterprise/BUILD b/third_party/jvm/javax/enterprise/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/javax/inject/BUILD b/third_party/jvm/javax/inject/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/junit/BUILD b/third_party/jvm/junit/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/net/ltgt/gradle/incap/BUILD b/third_party/jvm/net/ltgt/gradle/incap/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/apache/ant/BUILD b/third_party/jvm/org/apache/ant/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/apache/commons/BUILD b/third_party/jvm/org/apache/commons/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/apache/maven/BUILD b/third_party/jvm/org/apache/maven/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/checkerframework/BUILD b/third_party/jvm/org/checkerframework/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/codehaus/mojo/BUILD b/third_party/jvm/org/codehaus/mojo/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/codehaus/plexus/BUILD b/third_party/jvm/org/codehaus/plexus/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/eclipse/sisu/BUILD b/third_party/jvm/org/eclipse/sisu/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/hamcrest/BUILD b/third_party/jvm/org/hamcrest/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/jetbrains/BUILD b/third_party/jvm/org/jetbrains/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/jetbrains/kotlin/BUILD b/third_party/jvm/org/jetbrains/kotlin/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/jetbrains/kotlinx/BUILD b/third_party/jvm/org/jetbrains/kotlinx/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/ow2/asm/BUILD b/third_party/jvm/org/ow2/asm/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/org/pantsbuild/BUILD b/third_party/jvm/org/pantsbuild/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 licenses(["notice"])
 
 java_library(

diff --git a/third_party/jvm/workspace.bzl b/third_party/jvm/workspace.bzl
@@ -20,6 +20,7 @@ def _jar_artifact_impl(ctx):
         srcjar_attr = '\n    srcjar = ":%s",' % src_name
 
     build_file_contents = """
+load("@rules_java//java:defs.bzl", "java_import")
 package(default_visibility = ['//visibility:public'])
 java_import(
     name = 'jar',