Rebase fixes.

pantsbuild · May 10, 2018 · 877184e · 877184e
1 parent cdf9f70
commit 877184e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/src/python/pants/backend/jvm/tasks/jvm_compile/javac/BUILD b/src/python/pants/backend/jvm/tasks/jvm_compile/javac/BUILD
@@ -9,9 +9,6 @@ python_library(
     'src/python/pants/backend/jvm/subsystems:jvm_platform',
     'src/python/pants/backend/jvm/subsystems:shader',
     'src/python/pants/backend/jvm/targets:java',
-    'src/python/pants/backend/jvm/tasks/jvm_compile:analysis',
-    'src/python/pants/backend/jvm/tasks/jvm_compile:analysis_parser',
-    'src/python/pants/backend/jvm/tasks/jvm_compile:analysis_tools',
     'src/python/pants/backend/jvm/tasks/jvm_compile:jvm_compile',
     'src/python/pants/base:exceptions',
     'src/python/pants/base:hash_utils',

diff --git a/src/python/pants/backend/jvm/tasks/jvm_compile/javac/javac_compile.py b/src/python/pants/backend/jvm/tasks/jvm_compile/javac/javac_compile.py
@@ -115,7 +115,7 @@ def execute(self):
       return super(JavacCompile, self).execute()
 
   def compile(self, args, classpath, sources, classes_output_dir, upstream_analysis, analysis_file,
-              log_file, zinc_args_file, settings, fatal_warnings, zinc_file_manager,
+              zinc_args_file, settings, fatal_warnings, zinc_file_manager,
               javac_plugin_map, scalac_plugin_map):
     try:
       distribution = JvmPlatform.preferred_jvm_distribution([settings], strict=True)

diff --git a/src/python/pants/backend/jvm/tasks/jvm_compile/zinc/BUILD b/src/python/pants/backend/jvm/tasks/jvm_compile/zinc/BUILD
@@ -5,8 +5,8 @@ python_library(
   dependencies = [
     '3rdparty/python/twitter/commons:twitter.common.collections',
     '3rdparty/python:six',
-    'src/python/pants/backend/jvm/subsystems:compile_subsystem',
     'src/python/pants/backend/jvm/subsystems:java',
+    'src/python/pants/backend/jvm/subsystems:jvm_platform',
     'src/python/pants/backend/jvm/subsystems:scala_platform',
     'src/python/pants/backend/jvm/subsystems:shader',
     'src/python/pants/backend/jvm/subsystems:zinc',