Flatten unnecessary "internal_do_not_use" directories now that starlark has visibility

PiperOrigin-RevId: 574353714
Change-Id: Iab912674125d7993a4b842afdf98a0d30314ceaf

18 files changed, 5 insertions, 24 deletions

diff --git a/copy.bara.sky b/copy.bara.sky
index 2954923..616f41e 100644
--- a/copy.bara.sky
+++ b/copy.bara.sky
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
--685151712
\ No newline at end of file
+1660301306
\ No newline at end of file
diff --git a/kotlin/common.bzl b/kotlin/common.bzl
index dbd86f0..cabe9fa 100644
--- a/kotlin/common.bzl
+++ b/kotlin/common.bzl
@@ -15,8 +15,8 @@
 """Common Kotlin definitions."""
 
 load("//:visibility.bzl", "RULES_DEFS_THAT_COMPILE_KOTLIN")
-load("//kotlin/jvm/internal_do_not_use/util:file_factory.bzl", "FileFactory")
-load("//kotlin/jvm/internal_do_not_use/util:srcjars.bzl", "kt_srcjars")
+load("//kotlin/jvm/util:file_factory.bzl", "FileFactory")
+load("//kotlin/jvm/util:srcjars.bzl", "kt_srcjars")
 load("//toolchains/kotlin_jvm:androidlint_toolchains.bzl", "androidlint_toolchains")
 load("//toolchains/kotlin_jvm:kt_jvm_toolchains.bzl", "kt_jvm_toolchains")
 load("@bazel_skylib//lib:sets.bzl", "sets")
diff --git a/kotlin/jvm/internal_do_not_use/traverse_exports/BUILD b/kotlin/jvm/traverse_exports/BUILD
index 9b5382c..9b5382c 100644
--- a/kotlin/jvm/internal_do_not_use/traverse_exports/BUILD
+++ b/kotlin/jvm/traverse_exports/BUILD
diff --git a/kotlin/jvm/internal_do_not_use/traverse_exports/compiler_plugin.bzl b/kotlin/jvm/traverse_exports/compiler_plugin.bzl
index 4a52cb5..4a52cb5 100644
--- a/kotlin/jvm/internal_do_not_use/traverse_exports/compiler_plugin.bzl
+++ b/kotlin/jvm/traverse_exports/compiler_plugin.bzl
diff --git a/kotlin/jvm/internal_do_not_use/traverse_exports/direct_jdeps.bzl b/kotlin/jvm/traverse_exports/direct_jdeps.bzl
index 75e2a15..75e2a15 100644
--- a/kotlin/jvm/internal_do_not_use/traverse_exports/direct_jdeps.bzl
+++ b/kotlin/jvm/traverse_exports/direct_jdeps.bzl
diff --git a/kotlin/jvm/internal_do_not_use/traverse_exports/forbidden_deps.bzl b/kotlin/jvm/traverse_exports/forbidden_deps.bzl
index 570b260..570b260 100644
--- a/kotlin/jvm/internal_do_not_use/traverse_exports/forbidden_deps.bzl
+++ b/kotlin/jvm/traverse_exports/forbidden_deps.bzl
diff --git a/kotlin/jvm/internal_do_not_use/traverse_exports/friend_jars.bzl b/kotlin/jvm/traverse_exports/friend_jars.bzl
index 4d34abd..4d34abd 100644
--- a/kotlin/jvm/internal_do_not_use/traverse_exports/friend_jars.bzl
+++ b/kotlin/jvm/traverse_exports/friend_jars.bzl
diff --git a/kotlin/jvm/internal_do_not_use/traverse_exports/friend_labels.bzl b/kotlin/jvm/traverse_exports/friend_labels.bzl
index c91340c..c91340c 100644
--- a/kotlin/jvm/internal_do_not_use/traverse_exports/friend_labels.bzl
+++ b/kotlin/jvm/traverse_exports/friend_labels.bzl
diff --git a/kotlin/jvm/internal_do_not_use/traverse_exports/java_plugin.bzl b/kotlin/jvm/traverse_exports/java_plugin.bzl
index 3ee38ef..3ee38ef 100644
--- a/kotlin/jvm/internal_do_not_use/traverse_exports/java_plugin.bzl
+++ b/kotlin/jvm/traverse_exports/java_plugin.bzl
diff --git a/kotlin/jvm/internal_do_not_use/traverse_exports/traverse_exports.bzl b/kotlin/jvm/traverse_exports/traverse_exports.bzl
index bf69f32..c32f3a4 100644
--- a/kotlin/jvm/internal_do_not_use/traverse_exports/traverse_exports.bzl
+++ b/kotlin/jvm/traverse_exports/traverse_exports.bzl
@@ -14,7 +14,6 @@
 
 """Combined aspect for all rules_kotlin behaviours that need to traverse exports."""
 
-# go/keep-sorted start
 load("//:visibility.bzl", "RULES_KOTLIN")
 load(":compiler_plugin.bzl", "kt_compiler_plugin_visitor")
 load(":direct_jdeps.bzl", "kt_direct_jdeps_visitor")
@@ -22,7 +21,6 @@ load(":forbidden_deps.bzl", "kt_forbidden_deps_visitor")
 load(":friend_jars.bzl", "kt_friend_jars_visitor")
 load(":friend_labels.bzl", "kt_friend_labels_visitor")
 load(":java_plugin.bzl", "java_plugin_visitor")
-# go/keep-sorted end
 
 visibility(RULES_KOTLIN)
 
diff --git a/kotlin/jvm/internal_do_not_use/util/BUILD b/kotlin/jvm/util/BUILD
index 157c675..157c675 100644
--- a/kotlin/jvm/internal_do_not_use/util/BUILD
+++ b/kotlin/jvm/util/BUILD
diff --git a/kotlin/jvm/internal_do_not_use/util/file_factory.bzl b/kotlin/jvm/util/file_factory.bzl
index 49791f7..49791f7 100644
--- a/kotlin/jvm/internal_do_not_use/util/file_factory.bzl
+++ b/kotlin/jvm/util/file_factory.bzl
diff --git a/kotlin/jvm/internal_do_not_use/util/run_deploy_jar.bzl b/kotlin/jvm/util/run_deploy_jar.bzl
index d4d087a..d4d087a 100644
--- a/kotlin/jvm/internal_do_not_use/util/run_deploy_jar.bzl
+++ b/kotlin/jvm/util/run_deploy_jar.bzl
diff --git a/kotlin/jvm/internal_do_not_use/util/srcjars.bzl b/kotlin/jvm/util/srcjars.bzl
index 01618d9..01618d9 100644
--- a/kotlin/jvm/internal_do_not_use/util/srcjars.bzl
+++ b/kotlin/jvm/util/srcjars.bzl
diff --git a/kotlin/traverse_exports.bzl b/kotlin/traverse_exports.bzl
index 8f6d4f5..bb8b81d 100644
--- a/kotlin/traverse_exports.bzl
+++ b/kotlin/traverse_exports.bzl
@@ -15,7 +15,7 @@
 """Combined aspect for all rules_kotlin behaviours that need to traverse exports."""
 
 load("//:visibility.bzl", "RULES_DEFS_THAT_COMPILE_KOTLIN")
-load("//kotlin/jvm/internal_do_not_use/traverse_exports:traverse_exports.bzl", _kt_traverse_exports = "kt_traverse_exports")
+load("//kotlin/jvm/traverse_exports:traverse_exports.bzl", _kt_traverse_exports = "kt_traverse_exports")
 
 visibility(RULES_DEFS_THAT_COMPILE_KOTLIN)
 
diff --git a/tests/analysis/BUILD b/tests/analysis/BUILD
deleted file mode 100644
index 7a4d844..0000000
--- a/tests/analysis/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022 Google LLC. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the License);
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-# Analysis Tests
-
-licenses(["notice"])
diff --git a/tests/analysis/internal_do_not_use/util/file_factory/BUILD b/tests/jvm/analysis/util/file_factory/BUILD
index 3a0b592..3a0b592 100644
--- a/tests/analysis/internal_do_not_use/util/file_factory/BUILD
+++ b/tests/jvm/analysis/util/file_factory/BUILD
diff --git a/tests/analysis/internal_do_not_use/util/file_factory/unittests.bzl b/tests/jvm/analysis/util/file_factory/unittests.bzl
index 2f4703b..cf7a2a4 100644
--- a/tests/analysis/internal_do_not_use/util/file_factory/unittests.bzl
+++ b/tests/jvm/analysis/util/file_factory/unittests.bzl
@@ -16,7 +16,7 @@
 
 load("//:visibility.bzl", "RULES_KOTLIN")
 load("//kotlin/common/testing:unittest_suites.bzl", "kt_unittest_suites")
-load("//kotlin/jvm/internal_do_not_use/util:file_factory.bzl", "FileFactory")
+load("//kotlin/jvm/util:file_factory.bzl", "FileFactory")
 load("@bazel_skylib//lib:unittest.bzl", "asserts")
 
 visibility(RULES_KOTLIN)