From 3936f8b205986e3ed8b244ae11500439fcff7075 Mon Sep 17 00:00:00 2001 From: Andy Scott Date: Tue, 28 Jan 2020 18:03:53 -0800 Subject: [PATCH 1/5] rename rulesscala to rules_scala --- scala/private/common_attributes.bzl | 6 +++--- scala/private/rules/scala_junit_test.bzl | 4 ++-- scala/private/rules/scala_test.bzl | 4 ++-- scala/scala.bzl | 4 ++-- scala/scalafmt/BUILD | 2 +- scala/scalafmt/scalafmt/ScalafmtRunner.scala | 2 +- scala_proto/scala_proto_toolchain.bzl | 2 +- .../io/bazel/rulesscala/coverage/instrumenter/BUILD | 8 ++++---- .../coverage/instrumenter/JacocoInstrumenter.java | 8 ++++---- src/java/io/bazel/rulesscala/exe/BUILD | 2 +- src/java/io/bazel/rulesscala/exe/LaunchInfo.java | 2 +- .../io/bazel/rulesscala/exe/LauncherFileWriter.java | 2 +- .../bazel/rulesscala/io_utils/DeleteRecursively.java | 2 +- src/java/io/bazel/rulesscala/jar/BUILD | 2 +- src/java/io/bazel/rulesscala/jar/JarCreator.java | 2 +- src/java/io/bazel/rulesscala/jar/JarHelper.java | 2 +- src/java/io/bazel/rulesscala/scala_test/Runner.java | 2 +- src/java/io/bazel/rulesscala/scalac/BUILD | 8 ++++---- .../io/bazel/rulesscala/scalac/CompileOptions.java | 2 +- src/java/io/bazel/rulesscala/scalac/Resource.java | 2 +- .../io/bazel/rulesscala/scalac/ScalaCInvoker.java | 4 ++-- .../io/bazel/rulesscala/scalac/ScalacProcessor.java | 8 ++++---- src/java/io/bazel/rulesscala/specs2/BUILD | 2 +- .../rulesscala/specs2/Specs2RunnerBuilder.scala | 6 +++--- src/java/io/bazel/rulesscala/specs2/package.scala | 2 +- .../test_discovery/DiscoveredTestSuite.scala | 4 ++-- .../test_discovery/FilteredRunnerBuilder.scala | 6 +++--- .../io/bazel/rulesscala/worker/GenericWorker.java | 2 +- src/java/io/bazel/rulesscala/worker/Processor.java | 2 +- src/scala/io/bazel/rules_scala/jmh_support/BUILD | 2 +- .../rules_scala/jmh_support/BenchmarkGenerator.scala | 2 +- src/scala/io/bazel/rules_scala/tut_support/BUILD | 2 +- .../bazel/rules_scala/tut_support/TutCompiler.scala | 2 +- src/scala/scripts/BUILD | 12 ++++++------ src/scala/scripts/ScalaPBGenerator.scala | 6 +++--- src/scala/scripts/TwitterScroogeGenerator.scala | 6 +++--- test/gen_src/BUILD | 2 +- test/gen_src/SrcGenerator.scala | 2 +- third_party/dependency_analyzer/src/main/BUILD | 8 ++++---- .../dependencyanalyzer/DependencyAnalyzer.scala | 2 +- .../DependencyAnalyzerSettings.scala | 2 +- .../HighLevelCrawlUsedJarFinder.scala | 2 +- .../dependencyanalyzer/OptionsParser.scala | 2 +- .../src/main/resources/scalac-plugin.xml | 2 +- third_party/dependency_analyzer/src/test/BUILD | 4 ++-- .../dependencyanalyzer/StrictDepsTest.scala | 4 ++-- .../UnusedDependencyCheckerTest.scala | 4 ++-- third_party/utils/src/test/BUILD | 2 +- .../test/io/bazel/rulesscala/utils/TestUtil.scala | 2 +- twitter_scrooge/twitter_scrooge.bzl | 2 +- 50 files changed, 88 insertions(+), 88 deletions(-) diff --git a/scala/private/common_attributes.bzl b/scala/private/common_attributes.bzl index bd6c3fc3c..e783f2f82 100644 --- a/scala/private/common_attributes.bzl +++ b/scala/private/common_attributes.bzl @@ -68,7 +68,7 @@ common_attrs.update({ ), "unused_dependency_checker_ignored_targets": attr.label_list(default = []), "_code_coverage_instrumentation_worker": attr.label( - default = "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/coverage/instrumenter", + default = "@io_bazel_rules_scala//src/java/io/bazel/rules_scala/coverage/instrumenter", allow_files = True, executable = True, cfg = "host", @@ -100,13 +100,13 @@ implicit_deps = { ), "_scalac": attr.label( default = Label( - "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac", + "@io_bazel_rules_scala//src/java/io/bazel/rules_scala/scalac", ), ), "_exe": attr.label( executable = True, cfg = "host", - default = Label("@io_bazel_rules_scala//src/java/io/bazel/rulesscala/exe:exe"), + default = Label("@io_bazel_rules_scala//src/java/io/bazel/rules_scala/exe:exe"), ), } diff --git a/scala/private/rules/scala_junit_test.bzl b/scala/private/rules/scala_junit_test.bzl index b98f8d9c3..63eecf1b2 100644 --- a/scala/private/rules/scala_junit_test.bzl +++ b/scala/private/rules/scala_junit_test.bzl @@ -56,11 +56,11 @@ _scala_junit_test_attrs = { "suffixes": attr.string_list(default = []), "suite_label": attr.label( default = Label( - "//src/java/io/bazel/rulesscala/test_discovery:test_discovery", + "//src/java/io/bazel/rules_scala/test_discovery:test_discovery", ), ), "suite_class": attr.string( - default = "io.bazel.rulesscala.test_discovery.DiscoveredTestSuite", + default = "io.bazel.rules_scala.test_discovery.DiscoveredTestSuite", ), "print_discovered_classes": attr.bool( default = False, diff --git a/scala/private/rules/scala_test.bzl b/scala/private/rules/scala_test.bzl index d9d42ead9..694e65c5d 100644 --- a/scala/private/rules/scala_test.bzl +++ b/scala/private/rules/scala_test.bzl @@ -50,7 +50,7 @@ def _scala_test_impl(ctx): _scala_test_attrs = { "main_class": attr.string( - default = "io.bazel.rulesscala.scala_test.Runner", + default = "io.bazel.rules_scala.scala_test.Runner", ), "colors": attr.bool(default = True), "full_stacktraces": attr.bool(default = True), @@ -62,7 +62,7 @@ _scala_test_attrs = { ), "_scalatest_runner": attr.label( cfg = "host", - default = Label("//src/java/io/bazel/rulesscala/scala_test:runner"), + default = Label("//src/java/io/bazel/rules_scala/scala_test:runner"), ), "_scalatest_reporter": attr.label( default = Label("//scala/support:test_reporter"), diff --git a/scala/scala.bzl b/scala/scala.bzl index fb4a9eeaf..9c7fd2bac 100644 --- a/scala/scala.bzl +++ b/scala/scala.bzl @@ -42,9 +42,9 @@ def scala_specs2_junit_test(name, **kwargs): unused_dependency_checker_ignored_targets = _specs2_junit_dependencies() + kwargs.pop("unused_dependency_checker_ignored_targets", []), suite_label = Label( - "//src/java/io/bazel/rulesscala/specs2:specs2_test_discovery", + "//src/java/io/bazel/rules_scala/specs2:specs2_test_discovery", ), - suite_class = "io.bazel.rulesscala.specs2.Specs2DiscoveredTestSuite", + suite_class = "io.bazel.rules_scala.specs2.Specs2DiscoveredTestSuite", **kwargs ) diff --git a/scala/scalafmt/BUILD b/scala/scalafmt/BUILD index 0be9c98a4..183accec2 100644 --- a/scala/scalafmt/BUILD +++ b/scala/scalafmt/BUILD @@ -18,7 +18,7 @@ scala_binary( main_class = "io.bazel.rules_scala.scalafmt.ScalafmtRunner", visibility = ["//visibility:public"], deps = [ - "//src/java/io/bazel/rulesscala/worker", + "//src/java/io/bazel/rules_scala/worker", "@com_geirsson_metaconfig_core_2_11", "@org_scalameta_parsers_2_11", "@org_scalameta_scalafmt_core_2_11", diff --git a/scala/scalafmt/scalafmt/ScalafmtRunner.scala b/scala/scalafmt/scalafmt/ScalafmtRunner.scala index 5a4a870f1..bade09927 100644 --- a/scala/scalafmt/scalafmt/ScalafmtRunner.scala +++ b/scala/scalafmt/scalafmt/ScalafmtRunner.scala @@ -1,6 +1,6 @@ package io.bazel.rules_scala.scalafmt -import io.bazel.rulesscala.worker.{GenericWorker, Processor}; +import io.bazel.rules_scala.worker.{GenericWorker, Processor}; import java.io.File import java.nio.file.Files import org.scalafmt.Scalafmt diff --git a/scala_proto/scala_proto_toolchain.bzl b/scala_proto/scala_proto_toolchain.bzl index a733a2fbf..39f373387 100644 --- a/scala_proto/scala_proto_toolchain.bzl +++ b/scala_proto/scala_proto_toolchain.bzl @@ -38,7 +38,7 @@ scala_proto_toolchain = rule( ), "scalac": attr.label( default = Label( - "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac", + "@io_bazel_rules_scala//src/java/io/bazel/rules_scala/scalac", ), ), }, diff --git a/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD b/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD index a9d82ac7f..9a2ac05fa 100644 --- a/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD +++ b/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD @@ -1,19 +1,19 @@ java_binary( name = "instrumenter", srcs = [ - "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/coverage/instrumenter:instrumenter_files", + "@io_bazel_rules_scala//src/java/io/bazel/rules_scala/coverage/instrumenter:instrumenter_files", ], javacopts = [ "-source 1.8", "-target 1.8", ], - main_class = "io.bazel.rulesscala.coverage.instrumenter.JacocoInstrumenter", + main_class = "io.bazel.rules_scala.coverage.instrumenter.JacocoInstrumenter", visibility = ["//visibility:public"], deps = [ "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto", "@bazel_tools//tools/jdk:JacocoCoverage", - "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar", - "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker", + "@io_bazel_rules_scala//src/java/io/bazel/rules_scala/jar", + "@io_bazel_rules_scala//src/java/io/bazel/rules_scala/worker", ], ) diff --git a/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java b/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java index 86c450b63..905f76d5c 100644 --- a/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java +++ b/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java @@ -1,8 +1,8 @@ -package io.bazel.rulesscala.coverage.instrumenter; +package io.bazel.rules_scala.coverage.instrumenter; -import io.bazel.rulesscala.jar.JarCreator; -import io.bazel.rulesscala.worker.GenericWorker; -import io.bazel.rulesscala.worker.Processor; +import io.bazel.rules_scala.jar.JarCreator; +import io.bazel.rules_scala.worker.GenericWorker; +import io.bazel.rules_scala.worker.Processor; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/src/java/io/bazel/rulesscala/exe/BUILD b/src/java/io/bazel/rulesscala/exe/BUILD index 0a36ca645..26763fe5d 100644 --- a/src/java/io/bazel/rulesscala/exe/BUILD +++ b/src/java/io/bazel/rulesscala/exe/BUILD @@ -16,7 +16,7 @@ java_binary( data = [ "@bazel_tools//tools/launcher", ], - main_class = "io.bazel.rulesscala.exe.LauncherFileWriter", + main_class = "io.bazel.rules_scala.exe.LauncherFileWriter", visibility = ["//visibility:public"], runtime_deps = [ ":exe-lib", diff --git a/src/java/io/bazel/rulesscala/exe/LaunchInfo.java b/src/java/io/bazel/rulesscala/exe/LaunchInfo.java index 1c4f76d40..7784e3db6 100644 --- a/src/java/io/bazel/rulesscala/exe/LaunchInfo.java +++ b/src/java/io/bazel/rulesscala/exe/LaunchInfo.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.bazel.rulesscala.exe; +package io.bazel.rules_scala.exe; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java b/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java index 15d1c1326..b53055df6 100644 --- a/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java +++ b/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java @@ -1,4 +1,4 @@ -package io.bazel.rulesscala.exe; +package io.bazel.rules_scala.exe; import com.google.common.base.Preconditions; import com.google.common.io.ByteStreams; diff --git a/src/java/io/bazel/rulesscala/io_utils/DeleteRecursively.java b/src/java/io/bazel/rulesscala/io_utils/DeleteRecursively.java index a9e4bafd3..7348d5ecf 100644 --- a/src/java/io/bazel/rulesscala/io_utils/DeleteRecursively.java +++ b/src/java/io/bazel/rulesscala/io_utils/DeleteRecursively.java @@ -1,4 +1,4 @@ -package io.bazel.rulesscala.io_utils; +package io.bazel.rules_scala.io_utils; import java.io.IOException; import java.nio.file.*; diff --git a/src/java/io/bazel/rulesscala/jar/BUILD b/src/java/io/bazel/rulesscala/jar/BUILD index 173484d19..cbd4b3aef 100644 --- a/src/java/io/bazel/rulesscala/jar/BUILD +++ b/src/java/io/bazel/rulesscala/jar/BUILD @@ -9,7 +9,7 @@ java_library( java_binary( name = "binary", - main_class = "io.bazel.rulesscala.jar.JarCreator", + main_class = "io.bazel.rules_scala.jar.JarCreator", visibility = ["//visibility:public"], runtime_deps = [ ":jar", diff --git a/src/java/io/bazel/rulesscala/jar/JarCreator.java b/src/java/io/bazel/rulesscala/jar/JarCreator.java index bfae66ee7..82106376f 100644 --- a/src/java/io/bazel/rulesscala/jar/JarCreator.java +++ b/src/java/io/bazel/rulesscala/jar/JarCreator.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.bazel.rulesscala.jar; +package io.bazel.rules_scala.jar; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; diff --git a/src/java/io/bazel/rulesscala/jar/JarHelper.java b/src/java/io/bazel/rulesscala/jar/JarHelper.java index bc0da857d..426214eef 100644 --- a/src/java/io/bazel/rulesscala/jar/JarHelper.java +++ b/src/java/io/bazel/rulesscala/jar/JarHelper.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.bazel.rulesscala.jar; +package io.bazel.rules_scala.jar; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/java/io/bazel/rulesscala/scala_test/Runner.java b/src/java/io/bazel/rulesscala/scala_test/Runner.java index d786acd60..28b540b11 100644 --- a/src/java/io/bazel/rulesscala/scala_test/Runner.java +++ b/src/java/io/bazel/rulesscala/scala_test/Runner.java @@ -1,4 +1,4 @@ -package io.bazel.rulesscala.scala_test; +package io.bazel.rules_scala.scala_test; import com.google.devtools.build.runfiles.Runfiles; import java.io.IOException; diff --git a/src/java/io/bazel/rulesscala/scalac/BUILD b/src/java/io/bazel/rulesscala/scalac/BUILD index ec7f89795..440528851 100644 --- a/src/java/io/bazel/rulesscala/scalac/BUILD +++ b/src/java/io/bazel/rulesscala/scalac/BUILD @@ -10,19 +10,19 @@ _export_scalac_repositories_from_toolchain_to_jvm( java_binary( name = "scalac", srcs = [ - "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac:scalac_files", + "@io_bazel_rules_scala//src/java/io/bazel/rules_scala/scalac:scalac_files", ], javacopts = [ "-source 1.8", "-target 1.8", ], - main_class = "io.bazel.rulesscala.scalac.ScalaCInvoker", + main_class = "io.bazel.rules_scala.scalac.ScalaCInvoker", visibility = ["//visibility:public"], deps = [ ":exported_scalac_repositories_from_toolchain_to_jvm", "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto", - "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar", - "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker", + "@io_bazel_rules_scala//src/java/io/bazel/rules_scala/jar", + "@io_bazel_rules_scala//src/java/io/bazel/rules_scala/worker", "@scalac_rules_commons_io//jar", ], ) diff --git a/src/java/io/bazel/rulesscala/scalac/CompileOptions.java b/src/java/io/bazel/rulesscala/scalac/CompileOptions.java index 5f3a84885..83569ccc8 100644 --- a/src/java/io/bazel/rulesscala/scalac/CompileOptions.java +++ b/src/java/io/bazel/rulesscala/scalac/CompileOptions.java @@ -1,4 +1,4 @@ -package io.bazel.rulesscala.scalac; +package io.bazel.rules_scala.scalac; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/java/io/bazel/rulesscala/scalac/Resource.java b/src/java/io/bazel/rulesscala/scalac/Resource.java index 6c0b68cc4..745d64c3d 100644 --- a/src/java/io/bazel/rulesscala/scalac/Resource.java +++ b/src/java/io/bazel/rulesscala/scalac/Resource.java @@ -1,4 +1,4 @@ -package io.bazel.rulesscala.scalac; +package io.bazel.rules_scala.scalac; public class Resource { public final String target; diff --git a/src/java/io/bazel/rulesscala/scalac/ScalaCInvoker.java b/src/java/io/bazel/rulesscala/scalac/ScalaCInvoker.java index ab60f95f0..0bbb7f6c7 100644 --- a/src/java/io/bazel/rulesscala/scalac/ScalaCInvoker.java +++ b/src/java/io/bazel/rulesscala/scalac/ScalaCInvoker.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.bazel.rulesscala.scalac; +package io.bazel.rules_scala.scalac; -import io.bazel.rulesscala.worker.GenericWorker; +import io.bazel.rules_scala.worker.GenericWorker; import java.io.PrintStream; import scala.Console$; diff --git a/src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java b/src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java index 31a33a554..a22a72fb8 100644 --- a/src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java +++ b/src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java @@ -1,8 +1,8 @@ -package io.bazel.rulesscala.scalac; +package io.bazel.rules_scala.scalac; -import io.bazel.rulesscala.jar.JarCreator; -import io.bazel.rulesscala.worker.GenericWorker; -import io.bazel.rulesscala.worker.Processor; +import io.bazel.rules_scala.jar.JarCreator; +import io.bazel.rules_scala.worker.GenericWorker; +import io.bazel.rules_scala.worker.Processor; import java.io.*; import java.lang.reflect.Field; import java.nio.file.FileSystems; diff --git a/src/java/io/bazel/rulesscala/specs2/BUILD b/src/java/io/bazel/rulesscala/specs2/BUILD index d68cf4a57..0545cf5d6 100644 --- a/src/java/io/bazel/rulesscala/specs2/BUILD +++ b/src/java/io/bazel/rulesscala/specs2/BUILD @@ -13,6 +13,6 @@ scala_library( "//external:io_bazel_rules_scala/dependency/scala/scala_xml", "//external:io_bazel_rules_scala/dependency/specs2/specs2", "//external:io_bazel_rules_scala/dependency/specs2/specs2_junit", - "//src/java/io/bazel/rulesscala/test_discovery", + "//src/java/io/bazel/rules_scala/test_discovery", ], ) diff --git a/src/java/io/bazel/rulesscala/specs2/Specs2RunnerBuilder.scala b/src/java/io/bazel/rulesscala/specs2/Specs2RunnerBuilder.scala index c26c63a13..22bfda13e 100644 --- a/src/java/io/bazel/rulesscala/specs2/Specs2RunnerBuilder.scala +++ b/src/java/io/bazel/rulesscala/specs2/Specs2RunnerBuilder.scala @@ -1,10 +1,10 @@ -package io.bazel.rulesscala.specs2 +package io.bazel.rules_scala.specs2 import java.util import java.util.regex.Pattern -import io.bazel.rulesscala.test_discovery.FilteredRunnerBuilder.FilteringRunnerBuilder -import io.bazel.rulesscala.test_discovery._ +import io.bazel.rules_scala.test_discovery.FilteredRunnerBuilder.FilteringRunnerBuilder +import io.bazel.rules_scala.test_discovery._ import org.junit.runner.notification.RunNotifier import org.junit.runner.{Description, RunWith, Runner} import org.junit.runners.Suite diff --git a/src/java/io/bazel/rulesscala/specs2/package.scala b/src/java/io/bazel/rulesscala/specs2/package.scala index 030842a3b..fc472e3ef 100644 --- a/src/java/io/bazel/rulesscala/specs2/package.scala +++ b/src/java/io/bazel/rulesscala/specs2/package.scala @@ -1,4 +1,4 @@ -package io.bazel.rulesscala +package io.bazel.rules_scala import org.junit.runner.Description import org.specs2.concurrent.ExecutionEnv diff --git a/src/java/io/bazel/rulesscala/test_discovery/DiscoveredTestSuite.scala b/src/java/io/bazel/rulesscala/test_discovery/DiscoveredTestSuite.scala index 579f11e06..f0013d879 100644 --- a/src/java/io/bazel/rulesscala/test_discovery/DiscoveredTestSuite.scala +++ b/src/java/io/bazel/rulesscala/test_discovery/DiscoveredTestSuite.scala @@ -1,4 +1,4 @@ -package io.bazel.rulesscala.test_discovery +package io.bazel.rules_scala.test_discovery import java.io.File import java.io.FileInputStream @@ -43,7 +43,7 @@ class PrefixSuffixTestDiscoveringSuite(testClass: Class[Any], builder: RunnerBui object PrefixSuffixTestDiscoveringSuite { - private[rulesscala] def discoverClasses(): Array[Class[_]] = { + private[rules_scala] def discoverClasses(): Array[Class[_]] = { val archives = archivesPath.split(',') val classes = archives.flatMap(discoverClassesIn) diff --git a/src/java/io/bazel/rulesscala/test_discovery/FilteredRunnerBuilder.scala b/src/java/io/bazel/rulesscala/test_discovery/FilteredRunnerBuilder.scala index df9df7c5a..fddadb74b 100644 --- a/src/java/io/bazel/rulesscala/test_discovery/FilteredRunnerBuilder.scala +++ b/src/java/io/bazel/rulesscala/test_discovery/FilteredRunnerBuilder.scala @@ -1,10 +1,10 @@ -package io.bazel.rulesscala.test_discovery +package io.bazel.rules_scala.test_discovery import java.lang.annotation.Annotation import java.util import java.util.regex.Pattern -import io.bazel.rulesscala.test_discovery.FilteredRunnerBuilder.FilteringRunnerBuilder +import io.bazel.rules_scala.test_discovery.FilteredRunnerBuilder.FilteringRunnerBuilder import org.junit.Test import org.junit.runner.Runner import org.junit.runners.BlockJUnit4ClassRunner @@ -28,7 +28,7 @@ class FilteredRunnerBuilder(builder: RunnerBuilder, filteringRunnerBuilder: Filt } } -private[rulesscala] class FilteredTestClass(testClass: Class[_], pattern: Pattern) extends TestClass(testClass) { +private[rules_scala] class FilteredTestClass(testClass: Class[_], pattern: Pattern) extends TestClass(testClass) { override def getAnnotatedMethods(aClass: Class[_ <: Annotation]): util.List[FrameworkMethod] = { val methods = super.getAnnotatedMethods(aClass) if (aClass == classOf[Test]) methods.filter(method => methodMatchesPattern(method, pattern)) diff --git a/src/java/io/bazel/rulesscala/worker/GenericWorker.java b/src/java/io/bazel/rulesscala/worker/GenericWorker.java index d26bed200..abb1b4388 100644 --- a/src/java/io/bazel/rulesscala/worker/GenericWorker.java +++ b/src/java/io/bazel/rulesscala/worker/GenericWorker.java @@ -1,4 +1,4 @@ -package io.bazel.rulesscala.worker; +package io.bazel.rules_scala.worker; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/src/java/io/bazel/rulesscala/worker/Processor.java b/src/java/io/bazel/rulesscala/worker/Processor.java index 126bcb666..c6511cb34 100644 --- a/src/java/io/bazel/rulesscala/worker/Processor.java +++ b/src/java/io/bazel/rulesscala/worker/Processor.java @@ -1,4 +1,4 @@ -package io.bazel.rulesscala.worker; +package io.bazel.rules_scala.worker; import java.util.List; diff --git a/src/scala/io/bazel/rules_scala/jmh_support/BUILD b/src/scala/io/bazel/rules_scala/jmh_support/BUILD index 087d4ba62..e1f6c5ba4 100644 --- a/src/scala/io/bazel/rules_scala/jmh_support/BUILD +++ b/src/scala/io/bazel/rules_scala/jmh_support/BUILD @@ -11,7 +11,7 @@ scala_library( "//external:io_bazel_rules_scala/dependency/jmh/jmh_core", "//external:io_bazel_rules_scala/dependency/jmh/jmh_generator_asm", "//external:io_bazel_rules_scala/dependency/jmh/jmh_generator_reflection", - "//src/java/io/bazel/rulesscala/jar", + "//src/java/io/bazel/rules_scala/jar", ], ) diff --git a/src/scala/io/bazel/rules_scala/jmh_support/BenchmarkGenerator.scala b/src/scala/io/bazel/rules_scala/jmh_support/BenchmarkGenerator.scala index d367ff424..fa6cde782 100644 --- a/src/scala/io/bazel/rules_scala/jmh_support/BenchmarkGenerator.scala +++ b/src/scala/io/bazel/rules_scala/jmh_support/BenchmarkGenerator.scala @@ -14,7 +14,7 @@ import java.net.URI import scala.collection.JavaConverters._ import java.nio.file.{FileSystems, Files, Path, Paths} -import io.bazel.rulesscala.jar.JarCreator +import io.bazel.rules_scala.jar.JarCreator /** diff --git a/src/scala/io/bazel/rules_scala/tut_support/BUILD b/src/scala/io/bazel/rules_scala/tut_support/BUILD index 5f2ae3d93..04ee767af 100644 --- a/src/scala/io/bazel/rules_scala/tut_support/BUILD +++ b/src/scala/io/bazel/rules_scala/tut_support/BUILD @@ -7,7 +7,7 @@ scala_library( deps = [ "//external:io_bazel_rules_scala/dependency/scala/scala_compiler", "//external:io_bazel_rules_scala/dependency/tut/tut_core", - "//src/java/io/bazel/rulesscala/io_utils", + "//src/java/io/bazel/rules_scala/io_utils", ], ) diff --git a/src/scala/io/bazel/rules_scala/tut_support/TutCompiler.scala b/src/scala/io/bazel/rules_scala/tut_support/TutCompiler.scala index a6e26f78f..cc1910e52 100644 --- a/src/scala/io/bazel/rules_scala/tut_support/TutCompiler.scala +++ b/src/scala/io/bazel/rules_scala/tut_support/TutCompiler.scala @@ -1,6 +1,6 @@ package io.bazel.rules_scala.tut_support -import io.bazel.rulesscala.io_utils.DeleteRecursively +import io.bazel.rules_scala.io_utils.DeleteRecursively import java.io.File import java.nio.file.{ Files, Paths } import tut.TutMain diff --git a/src/scala/scripts/BUILD b/src/scala/scripts/BUILD index 01d989ca7..7c5f836f8 100644 --- a/src/scala/scripts/BUILD +++ b/src/scala/scripts/BUILD @@ -6,9 +6,9 @@ scala_library( visibility = ["//visibility:public"], deps = [ "//external:io_bazel_rules_scala/dependency/thrift/scrooge_generator", - "//src/java/io/bazel/rulesscala/io_utils", - "//src/java/io/bazel/rulesscala/jar", - "//src/java/io/bazel/rulesscala/worker", + "//src/java/io/bazel/rules_scala/io_utils", + "//src/java/io/bazel/rules_scala/jar", + "//src/java/io/bazel/rules_scala/worker", "//src/scala/io/bazel/rules_scala/scrooge_support:compiler", ], ) @@ -40,9 +40,9 @@ scala_library( "//external:io_bazel_rules_scala/dependency/proto/protoc_bridge", "//external:io_bazel_rules_scala/dependency/proto/scalapb_plugin", "//external:io_bazel_rules_scala/dependency/proto/scalapbc", - "//src/java/io/bazel/rulesscala/io_utils", - "//src/java/io/bazel/rulesscala/jar", - "//src/java/io/bazel/rulesscala/worker", + "//src/java/io/bazel/rules_scala/io_utils", + "//src/java/io/bazel/rules_scala/jar", + "//src/java/io/bazel/rules_scala/worker", ], ) diff --git a/src/scala/scripts/ScalaPBGenerator.scala b/src/scala/scripts/ScalaPBGenerator.scala index 9ed457d09..08078afb5 100644 --- a/src/scala/scripts/ScalaPBGenerator.scala +++ b/src/scala/scripts/ScalaPBGenerator.scala @@ -3,9 +3,9 @@ package scripts import java.io.PrintStream import java.nio.file.{Path, FileAlreadyExistsException} -import io.bazel.rulesscala.io_utils.DeleteRecursively -import io.bazel.rulesscala.jar.JarCreator -import io.bazel.rulesscala.worker.{GenericWorker, Processor} +import io.bazel.rules_scala.io_utils.DeleteRecursively +import io.bazel.rules_scala.jar.JarCreator +import io.bazel.rules_scala.worker.{GenericWorker, Processor} import protocbridge.{ProtocBridge, ProtocCodeGenerator} import scala.collection.JavaConverters._ import scalapb.ScalaPbCodeGenerator diff --git a/src/scala/scripts/TwitterScroogeGenerator.scala b/src/scala/scripts/TwitterScroogeGenerator.scala index 5b1f01a30..cbfe54223 100644 --- a/src/scala/scripts/TwitterScroogeGenerator.scala +++ b/src/scala/scripts/TwitterScroogeGenerator.scala @@ -2,12 +2,12 @@ package scripts import io.bazel.rules_scala.scrooge_support.{ Compiler, CompilerDefaults } import com.twitter.scrooge.backend.WithFinagle -import io.bazel.rulesscala.jar.JarCreator -import io.bazel.rulesscala.io_utils.DeleteRecursively +import io.bazel.rules_scala.jar.JarCreator +import io.bazel.rules_scala.io_utils.DeleteRecursively import java.io.{ File, PrintStream } import java.nio.file.{ Files, Path, Paths } import scala.collection.mutable.Buffer -import io.bazel.rulesscala.worker.{ GenericWorker, Processor } +import io.bazel.rules_scala.worker.{ GenericWorker, Processor } import scala.io.Source /** diff --git a/test/gen_src/BUILD b/test/gen_src/BUILD index 72d25ea27..7bcc7fc38 100644 --- a/test/gen_src/BUILD +++ b/test/gen_src/BUILD @@ -7,7 +7,7 @@ load( scala_binary( name = "src_generator", srcs = ["SrcGenerator.scala"], - main_class = "build.bazel.rulesscala.test.srcgen.SrcGenerator", + main_class = "build.bazel.rules_scala.test.srcgen.SrcGenerator", ) genrule( diff --git a/test/gen_src/SrcGenerator.scala b/test/gen_src/SrcGenerator.scala index a97a699da..31ee3dc24 100644 --- a/test/gen_src/SrcGenerator.scala +++ b/test/gen_src/SrcGenerator.scala @@ -1,4 +1,4 @@ -package build.bazel.rulesscala.test.srcgen +package build.bazel.rules_scala.test.srcgen object SrcGenerator { def main(args: Array[String]): Unit = { diff --git a/third_party/dependency_analyzer/src/main/BUILD b/third_party/dependency_analyzer/src/main/BUILD index a5da0f019..ff1468d8a 100644 --- a/third_party/dependency_analyzer/src/main/BUILD +++ b/third_party/dependency_analyzer/src/main/BUILD @@ -5,10 +5,10 @@ load("//scala:scala.bzl", "scala_library_for_plugin_bootstrapping") scala_library_for_plugin_bootstrapping( name = "dependency_analyzer", srcs = [ - "io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala", - "io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala", - "io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala", - "io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala", + "io/bazel/rules_scala/dependencyanalyzer/DependencyAnalyzer.scala", + "io/bazel/rules_scala/dependencyanalyzer/DependencyAnalyzerSettings.scala", + "io/bazel/rules_scala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala", + "io/bazel/rules_scala/dependencyanalyzer/OptionsParser.scala", ], resources = ["resources/scalac-plugin.xml"], visibility = ["//visibility:public"], diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala index a74455cdb..d33cdecc5 100644 --- a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala +++ b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala @@ -1,4 +1,4 @@ -package third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer +package third_party.dependency_analyzer.src.main.io.bazel.rules_scala.dependencyanalyzer import scala.reflect.io.AbstractFile import scala.tools.nsc.plugins.Plugin diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala index f6f87ca33..271838739 100644 --- a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala +++ b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala @@ -1,4 +1,4 @@ -package third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer +package third_party.dependency_analyzer.src.main.io.bazel.rules_scala.dependencyanalyzer object AnalyzerMode { case object Error extends AnalyzerMode diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala index cbb20c550..8becf2ad9 100644 --- a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala +++ b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala @@ -1,4 +1,4 @@ -package third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer +package third_party.dependency_analyzer.src.main.io.bazel.rules_scala.dependencyanalyzer import scala.reflect.io.AbstractFile import scala.tools.nsc.Global diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala index f36c93ca1..1e085117a 100644 --- a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala +++ b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala @@ -1,4 +1,4 @@ -package third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer +package third_party.dependency_analyzer.src.main.io.bazel.rules_scala.dependencyanalyzer import scala.collection.mutable diff --git a/third_party/dependency_analyzer/src/main/resources/scalac-plugin.xml b/third_party/dependency_analyzer/src/main/resources/scalac-plugin.xml index f18ec1cc2..7b97103dc 100644 --- a/third_party/dependency_analyzer/src/main/resources/scalac-plugin.xml +++ b/third_party/dependency_analyzer/src/main/resources/scalac-plugin.xml @@ -1,4 +1,4 @@ dependency-analyzer - third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer.DependencyAnalyzer + third_party.dependency_analyzer.src.main.io.bazel.rules_scala.dependencyanalyzer.DependencyAnalyzer \ No newline at end of file diff --git a/third_party/dependency_analyzer/src/test/BUILD b/third_party/dependency_analyzer/src/test/BUILD index 6428762b4..366bd6722 100644 --- a/third_party/dependency_analyzer/src/test/BUILD +++ b/third_party/dependency_analyzer/src/test/BUILD @@ -6,7 +6,7 @@ scala_test( name = "strict_deps_test", size = "small", srcs = [ - "io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala", + "io/bazel/rules_scala/dependencyanalyzer/StrictDepsTest.scala", ], jvm_flags = [ "-Dplugin.jar.location=$(location //third_party/dependency_analyzer/src/main:dependency_analyzer)", @@ -30,7 +30,7 @@ scala_test( name = "unused_dependency_checker_test", size = "small", srcs = [ - "io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala", + "io/bazel/rules_scala/dependencyanalyzer/UnusedDependencyCheckerTest.scala", ], jvm_flags = [ "-Dplugin.jar.location=$(location //third_party/dependency_analyzer/src/main:dependency_analyzer)", diff --git a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala index fdbcc727f..6160e0b89 100644 --- a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala +++ b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala @@ -1,8 +1,8 @@ -package third_party.dependency_analyzer.src.test.io.bazel.rulesscala.dependencyanalyzer +package third_party.dependency_analyzer.src.test.io.bazel.rules_scala.dependencyanalyzer import org.scalatest._ import java.nio.file.Paths -import third_party.utils.src.test.io.bazel.rulesscala.utils.TestUtil._ +import third_party.utils.src.test.io.bazel.rules_scala.utils.TestUtil._ class StrictDepsTest extends FunSuite { val pluginName = "dependency_analyzer" diff --git a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala index 74b4dd2e4..08a7fd401 100644 --- a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala +++ b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala @@ -1,8 +1,8 @@ -package third_party.dependency_analyzer.src.test.io.bazel.rulesscala.dependencyanalyzer +package third_party.dependency_analyzer.src.test.io.bazel.rules_scala.dependencyanalyzer import java.nio.file.Paths import org.scalatest._ -import third_party.utils.src.test.io.bazel.rulesscala.utils.TestUtil._ +import third_party.utils.src.test.io.bazel.rules_scala.utils.TestUtil._ class UnusedDependencyCheckerTest extends FunSuite { def compileWithUnusedDependencyChecker(code: String, withDirect: List[(String, String)] = Nil): List[String] = { diff --git a/third_party/utils/src/test/BUILD b/third_party/utils/src/test/BUILD index 2dbce6ac2..aab05aee2 100644 --- a/third_party/utils/src/test/BUILD +++ b/third_party/utils/src/test/BUILD @@ -5,7 +5,7 @@ load("//scala:scala.bzl", "scala_library") scala_library( name = "test_util", srcs = [ - "io/bazel/rulesscala/utils/TestUtil.scala", + "io/bazel/rules_scala/utils/TestUtil.scala", ], visibility = ["//visibility:public"], deps = [ diff --git a/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala b/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala index a15f6a5c8..b3b9575dd 100644 --- a/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala +++ b/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala @@ -1,4 +1,4 @@ -package third_party.utils.src.test.io.bazel.rulesscala.utils +package third_party.utils.src.test.io.bazel.rules_scala.utils import java.nio.file.Paths diff --git a/twitter_scrooge/twitter_scrooge.bzl b/twitter_scrooge/twitter_scrooge.bzl index a0217d668..c667f1a08 100644 --- a/twitter_scrooge/twitter_scrooge.bzl +++ b/twitter_scrooge/twitter_scrooge.bzl @@ -339,7 +339,7 @@ scrooge_aspect = aspect( ), "_scalac": attr.label( default = Label( - "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac", + "@io_bazel_rules_scala//src/java/io/bazel/rules_scala/scalac", ), ), "_implicit_compile_deps": attr.label_list( From b8f8aab9ee6533adefefa60365608fe8d6078006 Mon Sep 17 00:00:00 2001 From: Andy Scott Date: Tue, 28 Jan 2020 18:04:31 -0800 Subject: [PATCH 2/5] move the files --- .../bazel/{rulesscala => rules_scala}/coverage/instrumenter/BUILD | 0 .../coverage/instrumenter/JacocoInstrumenter.java | 0 src/java/io/bazel/{rulesscala => rules_scala}/exe/BUILD | 0 src/java/io/bazel/{rulesscala => rules_scala}/exe/LaunchInfo.java | 0 .../bazel/{rulesscala => rules_scala}/exe/LauncherFileWriter.java | 0 src/java/io/bazel/{rulesscala => rules_scala}/io_utils/BUILD | 0 .../{rulesscala => rules_scala}/io_utils/DeleteRecursively.java | 0 src/java/io/bazel/{rulesscala => rules_scala}/jar/BUILD | 0 src/java/io/bazel/{rulesscala => rules_scala}/jar/JarCreator.java | 0 src/java/io/bazel/{rulesscala => rules_scala}/jar/JarHelper.java | 0 src/java/io/bazel/{rulesscala => rules_scala}/scala_test/BUILD | 0 .../io/bazel/{rulesscala => rules_scala}/scala_test/Runner.java | 0 src/java/io/bazel/{rulesscala => rules_scala}/scalac/BUILD | 0 .../bazel/{rulesscala => rules_scala}/scalac/CompileOptions.java | 0 .../io/bazel/{rulesscala => rules_scala}/scalac/Resource.java | 0 .../bazel/{rulesscala => rules_scala}/scalac/ScalaCInvoker.java | 0 .../bazel/{rulesscala => rules_scala}/scalac/ScalacProcessor.java | 0 .../{rulesscala => rules_scala}/scalac/jvm_export_toolchain.bzl | 0 src/java/io/bazel/{rulesscala => rules_scala}/specs2/BUILD | 0 .../{rulesscala => rules_scala}/specs2/Specs2RunnerBuilder.scala | 0 .../io/bazel/{rulesscala => rules_scala}/specs2/package.scala | 0 .../io/bazel/{rulesscala => rules_scala}/test_discovery/BUILD | 0 .../test_discovery/DiscoveredTestSuite.scala | 0 .../test_discovery/FilteredRunnerBuilder.scala | 0 src/java/io/bazel/{rulesscala => rules_scala}/worker/BUILD | 0 .../bazel/{rulesscala => rules_scala}/worker/GenericWorker.java | 0 .../io/bazel/{rulesscala => rules_scala}/worker/Processor.java | 0 .../rulesscala/dependencyanalyzer/DependencyAnalyzer.scala | 0 .../dependencyanalyzer/DependencyAnalyzerSettings.scala | 0 .../dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala | 0 .../rulesscala/dependencyanalyzer/OptionsParser.scala | 0 31 files changed, 0 insertions(+), 0 deletions(-) rename src/java/io/bazel/{rulesscala => rules_scala}/coverage/instrumenter/BUILD (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/coverage/instrumenter/JacocoInstrumenter.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/exe/BUILD (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/exe/LaunchInfo.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/exe/LauncherFileWriter.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/io_utils/BUILD (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/io_utils/DeleteRecursively.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/jar/BUILD (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/jar/JarCreator.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/jar/JarHelper.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/scala_test/BUILD (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/scala_test/Runner.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/scalac/BUILD (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/scalac/CompileOptions.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/scalac/Resource.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/scalac/ScalaCInvoker.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/scalac/ScalacProcessor.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/scalac/jvm_export_toolchain.bzl (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/specs2/BUILD (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/specs2/Specs2RunnerBuilder.scala (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/specs2/package.scala (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/test_discovery/BUILD (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/test_discovery/DiscoveredTestSuite.scala (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/test_discovery/FilteredRunnerBuilder.scala (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/worker/BUILD (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/worker/GenericWorker.java (100%) rename src/java/io/bazel/{rulesscala => rules_scala}/worker/Processor.java (100%) rename third_party/dependency_analyzer/src/main/io/bazel/{ => rules_scala}/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala (100%) rename third_party/dependency_analyzer/src/main/io/bazel/{ => rules_scala}/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala (100%) rename third_party/dependency_analyzer/src/main/io/bazel/{ => rules_scala}/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala (100%) rename third_party/dependency_analyzer/src/main/io/bazel/{ => rules_scala}/rulesscala/dependencyanalyzer/OptionsParser.scala (100%) diff --git a/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD b/src/java/io/bazel/rules_scala/coverage/instrumenter/BUILD similarity index 100% rename from src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD rename to src/java/io/bazel/rules_scala/coverage/instrumenter/BUILD diff --git a/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java b/src/java/io/bazel/rules_scala/coverage/instrumenter/JacocoInstrumenter.java similarity index 100% rename from src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java rename to src/java/io/bazel/rules_scala/coverage/instrumenter/JacocoInstrumenter.java diff --git a/src/java/io/bazel/rulesscala/exe/BUILD b/src/java/io/bazel/rules_scala/exe/BUILD similarity index 100% rename from src/java/io/bazel/rulesscala/exe/BUILD rename to src/java/io/bazel/rules_scala/exe/BUILD diff --git a/src/java/io/bazel/rulesscala/exe/LaunchInfo.java b/src/java/io/bazel/rules_scala/exe/LaunchInfo.java similarity index 100% rename from src/java/io/bazel/rulesscala/exe/LaunchInfo.java rename to src/java/io/bazel/rules_scala/exe/LaunchInfo.java diff --git a/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java b/src/java/io/bazel/rules_scala/exe/LauncherFileWriter.java similarity index 100% rename from src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java rename to src/java/io/bazel/rules_scala/exe/LauncherFileWriter.java diff --git a/src/java/io/bazel/rulesscala/io_utils/BUILD b/src/java/io/bazel/rules_scala/io_utils/BUILD similarity index 100% rename from src/java/io/bazel/rulesscala/io_utils/BUILD rename to src/java/io/bazel/rules_scala/io_utils/BUILD diff --git a/src/java/io/bazel/rulesscala/io_utils/DeleteRecursively.java b/src/java/io/bazel/rules_scala/io_utils/DeleteRecursively.java similarity index 100% rename from src/java/io/bazel/rulesscala/io_utils/DeleteRecursively.java rename to src/java/io/bazel/rules_scala/io_utils/DeleteRecursively.java diff --git a/src/java/io/bazel/rulesscala/jar/BUILD b/src/java/io/bazel/rules_scala/jar/BUILD similarity index 100% rename from src/java/io/bazel/rulesscala/jar/BUILD rename to src/java/io/bazel/rules_scala/jar/BUILD diff --git a/src/java/io/bazel/rulesscala/jar/JarCreator.java b/src/java/io/bazel/rules_scala/jar/JarCreator.java similarity index 100% rename from src/java/io/bazel/rulesscala/jar/JarCreator.java rename to src/java/io/bazel/rules_scala/jar/JarCreator.java diff --git a/src/java/io/bazel/rulesscala/jar/JarHelper.java b/src/java/io/bazel/rules_scala/jar/JarHelper.java similarity index 100% rename from src/java/io/bazel/rulesscala/jar/JarHelper.java rename to src/java/io/bazel/rules_scala/jar/JarHelper.java diff --git a/src/java/io/bazel/rulesscala/scala_test/BUILD b/src/java/io/bazel/rules_scala/scala_test/BUILD similarity index 100% rename from src/java/io/bazel/rulesscala/scala_test/BUILD rename to src/java/io/bazel/rules_scala/scala_test/BUILD diff --git a/src/java/io/bazel/rulesscala/scala_test/Runner.java b/src/java/io/bazel/rules_scala/scala_test/Runner.java similarity index 100% rename from src/java/io/bazel/rulesscala/scala_test/Runner.java rename to src/java/io/bazel/rules_scala/scala_test/Runner.java diff --git a/src/java/io/bazel/rulesscala/scalac/BUILD b/src/java/io/bazel/rules_scala/scalac/BUILD similarity index 100% rename from src/java/io/bazel/rulesscala/scalac/BUILD rename to src/java/io/bazel/rules_scala/scalac/BUILD diff --git a/src/java/io/bazel/rulesscala/scalac/CompileOptions.java b/src/java/io/bazel/rules_scala/scalac/CompileOptions.java similarity index 100% rename from src/java/io/bazel/rulesscala/scalac/CompileOptions.java rename to src/java/io/bazel/rules_scala/scalac/CompileOptions.java diff --git a/src/java/io/bazel/rulesscala/scalac/Resource.java b/src/java/io/bazel/rules_scala/scalac/Resource.java similarity index 100% rename from src/java/io/bazel/rulesscala/scalac/Resource.java rename to src/java/io/bazel/rules_scala/scalac/Resource.java diff --git a/src/java/io/bazel/rulesscala/scalac/ScalaCInvoker.java b/src/java/io/bazel/rules_scala/scalac/ScalaCInvoker.java similarity index 100% rename from src/java/io/bazel/rulesscala/scalac/ScalaCInvoker.java rename to src/java/io/bazel/rules_scala/scalac/ScalaCInvoker.java diff --git a/src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java b/src/java/io/bazel/rules_scala/scalac/ScalacProcessor.java similarity index 100% rename from src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java rename to src/java/io/bazel/rules_scala/scalac/ScalacProcessor.java diff --git a/src/java/io/bazel/rulesscala/scalac/jvm_export_toolchain.bzl b/src/java/io/bazel/rules_scala/scalac/jvm_export_toolchain.bzl similarity index 100% rename from src/java/io/bazel/rulesscala/scalac/jvm_export_toolchain.bzl rename to src/java/io/bazel/rules_scala/scalac/jvm_export_toolchain.bzl diff --git a/src/java/io/bazel/rulesscala/specs2/BUILD b/src/java/io/bazel/rules_scala/specs2/BUILD similarity index 100% rename from src/java/io/bazel/rulesscala/specs2/BUILD rename to src/java/io/bazel/rules_scala/specs2/BUILD diff --git a/src/java/io/bazel/rulesscala/specs2/Specs2RunnerBuilder.scala b/src/java/io/bazel/rules_scala/specs2/Specs2RunnerBuilder.scala similarity index 100% rename from src/java/io/bazel/rulesscala/specs2/Specs2RunnerBuilder.scala rename to src/java/io/bazel/rules_scala/specs2/Specs2RunnerBuilder.scala diff --git a/src/java/io/bazel/rulesscala/specs2/package.scala b/src/java/io/bazel/rules_scala/specs2/package.scala similarity index 100% rename from src/java/io/bazel/rulesscala/specs2/package.scala rename to src/java/io/bazel/rules_scala/specs2/package.scala diff --git a/src/java/io/bazel/rulesscala/test_discovery/BUILD b/src/java/io/bazel/rules_scala/test_discovery/BUILD similarity index 100% rename from src/java/io/bazel/rulesscala/test_discovery/BUILD rename to src/java/io/bazel/rules_scala/test_discovery/BUILD diff --git a/src/java/io/bazel/rulesscala/test_discovery/DiscoveredTestSuite.scala b/src/java/io/bazel/rules_scala/test_discovery/DiscoveredTestSuite.scala similarity index 100% rename from src/java/io/bazel/rulesscala/test_discovery/DiscoveredTestSuite.scala rename to src/java/io/bazel/rules_scala/test_discovery/DiscoveredTestSuite.scala diff --git a/src/java/io/bazel/rulesscala/test_discovery/FilteredRunnerBuilder.scala b/src/java/io/bazel/rules_scala/test_discovery/FilteredRunnerBuilder.scala similarity index 100% rename from src/java/io/bazel/rulesscala/test_discovery/FilteredRunnerBuilder.scala rename to src/java/io/bazel/rules_scala/test_discovery/FilteredRunnerBuilder.scala diff --git a/src/java/io/bazel/rulesscala/worker/BUILD b/src/java/io/bazel/rules_scala/worker/BUILD similarity index 100% rename from src/java/io/bazel/rulesscala/worker/BUILD rename to src/java/io/bazel/rules_scala/worker/BUILD diff --git a/src/java/io/bazel/rulesscala/worker/GenericWorker.java b/src/java/io/bazel/rules_scala/worker/GenericWorker.java similarity index 100% rename from src/java/io/bazel/rulesscala/worker/GenericWorker.java rename to src/java/io/bazel/rules_scala/worker/GenericWorker.java diff --git a/src/java/io/bazel/rulesscala/worker/Processor.java b/src/java/io/bazel/rules_scala/worker/Processor.java similarity index 100% rename from src/java/io/bazel/rulesscala/worker/Processor.java rename to src/java/io/bazel/rules_scala/worker/Processor.java diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala b/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala similarity index 100% rename from third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala rename to third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala b/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala similarity index 100% rename from third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala rename to third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala b/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala similarity index 100% rename from third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala rename to third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala b/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/OptionsParser.scala similarity index 100% rename from third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala rename to third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/OptionsParser.scala From 504418b99419c40c0c1a43cce804d4502777ca6d Mon Sep 17 00:00:00 2001 From: Andy Scott Date: Tue, 28 Jan 2020 19:42:30 -0800 Subject: [PATCH 3/5] whoops --- .../{rulesscala => }/dependencyanalyzer/DependencyAnalyzer.scala | 0 .../dependencyanalyzer/DependencyAnalyzerSettings.scala | 0 .../dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala | 0 .../{rulesscala => }/dependencyanalyzer/OptionsParser.scala | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename third_party/dependency_analyzer/src/main/io/bazel/rules_scala/{rulesscala => }/dependencyanalyzer/DependencyAnalyzer.scala (100%) rename third_party/dependency_analyzer/src/main/io/bazel/rules_scala/{rulesscala => }/dependencyanalyzer/DependencyAnalyzerSettings.scala (100%) rename third_party/dependency_analyzer/src/main/io/bazel/rules_scala/{rulesscala => }/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala (100%) rename third_party/dependency_analyzer/src/main/io/bazel/rules_scala/{rulesscala => }/dependencyanalyzer/OptionsParser.scala (100%) diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala b/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/dependencyanalyzer/DependencyAnalyzer.scala similarity index 100% rename from third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala rename to third_party/dependency_analyzer/src/main/io/bazel/rules_scala/dependencyanalyzer/DependencyAnalyzer.scala diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala b/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/dependencyanalyzer/DependencyAnalyzerSettings.scala similarity index 100% rename from third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala rename to third_party/dependency_analyzer/src/main/io/bazel/rules_scala/dependencyanalyzer/DependencyAnalyzerSettings.scala diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala b/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala similarity index 100% rename from third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala rename to third_party/dependency_analyzer/src/main/io/bazel/rules_scala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/OptionsParser.scala b/third_party/dependency_analyzer/src/main/io/bazel/rules_scala/dependencyanalyzer/OptionsParser.scala similarity index 100% rename from third_party/dependency_analyzer/src/main/io/bazel/rules_scala/rulesscala/dependencyanalyzer/OptionsParser.scala rename to third_party/dependency_analyzer/src/main/io/bazel/rules_scala/dependencyanalyzer/OptionsParser.scala From f4d6c96fb047135d6eb2556eeb1bec99799939ea Mon Sep 17 00:00:00 2001 From: Andy Scott Date: Tue, 28 Jan 2020 21:16:09 -0800 Subject: [PATCH 4/5] forgot a file --- .../io/bazel/{rulesscala => rules_scala}/utils/TestUtil.scala | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename third_party/utils/src/test/io/bazel/{rulesscala => rules_scala}/utils/TestUtil.scala (100%) diff --git a/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala b/third_party/utils/src/test/io/bazel/rules_scala/utils/TestUtil.scala similarity index 100% rename from third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala rename to third_party/utils/src/test/io/bazel/rules_scala/utils/TestUtil.scala From 22b2e4893128a919574aa008fcf21daf341ec27f Mon Sep 17 00:00:00 2001 From: Andy Scott Date: Tue, 28 Jan 2020 21:16:48 -0800 Subject: [PATCH 5/5] two more --- .../dependencyanalyzer/StrictDepsTest.scala | 0 .../dependencyanalyzer/UnusedDependencyCheckerTest.scala | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename third_party/dependency_analyzer/src/test/io/bazel/{rulesscala => rules_scala}/dependencyanalyzer/StrictDepsTest.scala (100%) rename third_party/dependency_analyzer/src/test/io/bazel/{rulesscala => rules_scala}/dependencyanalyzer/UnusedDependencyCheckerTest.scala (100%) diff --git a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala b/third_party/dependency_analyzer/src/test/io/bazel/rules_scala/dependencyanalyzer/StrictDepsTest.scala similarity index 100% rename from third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala rename to third_party/dependency_analyzer/src/test/io/bazel/rules_scala/dependencyanalyzer/StrictDepsTest.scala diff --git a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala b/third_party/dependency_analyzer/src/test/io/bazel/rules_scala/dependencyanalyzer/UnusedDependencyCheckerTest.scala similarity index 100% rename from third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala rename to third_party/dependency_analyzer/src/test/io/bazel/rules_scala/dependencyanalyzer/UnusedDependencyCheckerTest.scala