From c314492bd408203cf9153d8aefb89de3305abb2e Mon Sep 17 00:00:00 2001 From: Bor Kae Hwang Date: Thu, 24 Oct 2019 10:29:06 -0600 Subject: [PATCH] u --- scala/private/phases/phases.bzl | 39 ++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/scala/private/phases/phases.bzl b/scala/private/phases/phases.bzl index 9781df40f..e18387ef6 100644 --- a/scala/private/phases/phases.bzl +++ b/scala/private/phases/phases.bzl @@ -1,50 +1,50 @@ load( "@io_bazel_rules_scala//scala/private:phases/api.bzl", - _run_phases = "run_phases", _extras_phases = "extras_phases", + _run_phases = "run_phases", ) load( "@io_bazel_rules_scala//scala/private:phases/phase_write_executable.bzl", - _phase_test_write_executable = "phase_test_write_executable", - _phase_repl_write_executable = "phase_repl_write_executable", - _phase_junit_test_write_executable = "phase_junit_test_write_executable", _phase_common_write_executable = "phase_common_write_executable", + _phase_junit_test_write_executable = "phase_junit_test_write_executable", + _phase_repl_write_executable = "phase_repl_write_executable", + _phase_test_write_executable = "phase_test_write_executable", ) load( "@io_bazel_rules_scala//scala/private:phases/phase_java_wrapper.bzl", - _phase_repl_java_wrapper = "phase_repl_java_wrapper", _phase_common_java_wrapper = "phase_common_java_wrapper", + _phase_repl_java_wrapper = "phase_repl_java_wrapper", ) load( "@io_bazel_rules_scala//scala/private:phases/phase_collect_jars.bzl", - _phase_test_collect_jars = "phase_test_collect_jars", - _phase_repl_collect_jars = "phase_repl_collect_jars", - _phase_macro_library_collect_jars = "phase_macro_library_collect_jars", + _phase_common_collect_jars = "phase_common_collect_jars", _phase_junit_test_collect_jars = "phase_junit_test_collect_jars", _phase_library_for_plugin_bootstrapping_collect_jars = "phase_library_for_plugin_bootstrapping_collect_jars", - _phase_common_collect_jars = "phase_common_collect_jars", + _phase_macro_library_collect_jars = "phase_macro_library_collect_jars", + _phase_repl_collect_jars = "phase_repl_collect_jars", + _phase_test_collect_jars = "phase_test_collect_jars", ) load( "@io_bazel_rules_scala//scala/private:phases/phase_compile.bzl", _phase_binary_compile = "phase_binary_compile", + _phase_common_compile = "phase_common_compile", + _phase_junit_test_compile = "phase_junit_test_compile", _phase_library_compile = "phase_library_compile", _phase_library_for_plugin_bootstrapping_compile = "phase_library_for_plugin_bootstrapping_compile", _phase_macro_library_compile = "phase_macro_library_compile", - _phase_junit_test_compile = "phase_junit_test_compile", _phase_repl_compile = "phase_repl_compile", _phase_test_compile = "phase_test_compile", - _phase_common_compile = "phase_common_compile", ) load( "@io_bazel_rules_scala//scala/private:phases/phase_scala_provider.bzl", - _phase_library_scala_provider = "phase_library_scala_provider", _phase_common_scala_provider = "phase_common_scala_provider", + _phase_library_scala_provider = "phase_library_scala_provider", ) load( "@io_bazel_rules_scala//scala/private:phases/phase_runfiles.bzl", + _phase_common_runfiles = "phase_common_runfiles", _phase_library_runfiles = "phase_library_runfiles", _phase_test_runfiles = "phase_test_runfiles", - _phase_common_runfiles = "phase_common_runfiles", ) load( "@io_bazel_rules_scala//scala/private:phases/phase_coda.bzl", @@ -66,27 +66,36 @@ load("@io_bazel_rules_scala//scala/private:phases/phase_coverage_runfiles.bzl", # API run_phases = _run_phases extras_phases = _extras_phases + # init phase_common_init = _phase_common_init phase_library_init = _phase_library_init + # unused_deps_checker phase_unused_deps_checker = _phase_unused_deps_checker + # declare_executable phase_declare_executable = _phase_declare_executable + # merge_jars phase_merge_jars = _phase_merge_jars + # jvm_flags phase_jvm_flags = _phase_jvm_flags + # coverage_runfiles phase_coverage_runfiles = _phase_coverage_runfiles + # write_executable phase_test_write_executable = _phase_test_write_executable phase_repl_write_executable = _phase_repl_write_executable phase_junit_test_write_executable = _phase_junit_test_write_executable phase_common_write_executable = _phase_common_write_executable + # java_wrapper phase_repl_java_wrapper = _phase_repl_java_wrapper phase_common_java_wrapper = _phase_common_java_wrapper + # collect_jars phase_test_collect_jars = _phase_test_collect_jars phase_repl_collect_jars = _phase_repl_collect_jars @@ -94,6 +103,7 @@ phase_macro_library_collect_jars = _phase_macro_library_collect_jars phase_junit_test_collect_jars = _phase_junit_test_collect_jars phase_library_for_plugin_bootstrapping_collect_jars = _phase_library_for_plugin_bootstrapping_collect_jars phase_common_collect_jars = _phase_common_collect_jars + # phase_compile phase_binary_compile = _phase_binary_compile phase_library_compile = _phase_library_compile @@ -103,13 +113,16 @@ phase_junit_test_compile = _phase_junit_test_compile phase_repl_compile = _phase_repl_compile phase_test_compile = _phase_test_compile phase_common_compile = _phase_common_compile + # scala_provider phase_library_scala_provider = _phase_library_scala_provider phase_common_scala_provider = _phase_common_scala_provider + # phase_runfiles phase_library_runfiles = _phase_library_runfiles phase_test_runfiles = _phase_test_runfiles phase_common_runfiles = _phase_common_runfiles + # coda phase_binary_coda = _phase_binary_coda phase_library_coda = _phase_library_coda