Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename everything rulesscala to rules_scala #970

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scala/private/common_attributes.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"),
),
}

Expand Down
4 changes: 2 additions & 2 deletions scala/private/rules/scala_junit_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions scala/private/rules/scala_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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"),
Expand Down
4 changes: 2 additions & 2 deletions scala/scala.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion scala/scalafmt/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion scala/scalafmt/scalafmt/ScalafmtRunner.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scala_proto/scala_proto_toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
),
),
},
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
],
)

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.bazel.rulesscala.scalac;
package io.bazel.rules_scala.scalac;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.bazel.rulesscala.scalac;
package io.bazel.rules_scala.scalac;

public class Resource {
public final String target;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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$;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.bazel.rulesscala
package io.bazel.rules_scala

import org.junit.runner.Description
import org.specs2.concurrent.ExecutionEnv
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.bazel.rulesscala.worker;
package io.bazel.rules_scala.worker;

import static java.nio.charset.StandardCharsets.UTF_8;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.bazel.rulesscala.worker;
package io.bazel.rules_scala.worker;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion src/scala/io/bazel/rules_scala/jmh_support/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


/**
Expand Down
2 changes: 1 addition & 1 deletion src/scala/io/bazel/rules_scala/tut_support/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/scala/scripts/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Expand Down Expand Up @@ -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",
],
)

Expand Down
Loading