introduce a jvm package above the java package

Summary: Closes #461 Test Plan: buck test
facebook · Oct 17, 2015 · 4c4a24a · 4c4a24a
1 parent ae4ed17
commit 4c4a24a
Show file tree

Hide file tree

Showing 752 changed files with 868 additions and 751 deletions.
diff --git a/build.xml b/build.xml
@@ -14,7 +14,7 @@
   <property name="tracing-api.src.dir" value="com/facebook/buck/event/api/" />
   <property name="tracing-api.classes.dir" value="${build.dir}/tracing-api/classes" />
   <property name="tracing-api.jar" value="${build.dir}/tracing-api/tracing-api.jar"/>
-  <property name="javac-tracing.src.dir" value="com/facebook/buck/java/tracing" />
+  <property name="javac-tracing.src.dir" value="com/facebook/buck/jvm/java/tracing" />
   <property name="javac-tracing.classes.dir" value="${build.dir}/javac-tracing/classes" />
   <property name="javac-tracing.jar" value="${build.dir}/javac-tracing/javac-tracing-compiler-plugin.jar" />
   <property name="buck.path_to_pex" value="${basedir}/src/com/facebook/buck/python/pex.py" />
@@ -180,7 +180,7 @@
   <target name="compile-testrunner" depends="checkversion">
     <mkdir dir="${testrunner.classes.dir}" />
     <javac srcdir="${src.dir}"
-           includes="com/facebook/buck/junit/**,src/com/facebook/buck/util/concurrent/MoreExecutors.java,com/facebook/buck/java/runner/**"
+           includes="com/facebook/buck/junit/**,src/com/facebook/buck/util/concurrent/MoreExecutors.java,com/facebook/buck/jvm/java/runner/**"
            destdir="${testrunner.classes.dir}"
            classpathref="junit"
            debug="on"
@@ -204,6 +204,8 @@
       <javac-params>
         <include name="${bootstrapper.src.dir}/**/*.java" />
         <include name="${javac-tracing.src.dir}/JavacPhaseTracer.java" />
+        <include name="com/facebook/buck/util/exportedfiles/Nullable.java" />
+        <include name="com/facebook/buck/util/exportedfiles/Preconditions.java" />
       </javac-params>
     </ecj>
     <jar destfile="${bootstrapper.jar}">
@@ -249,6 +251,8 @@
     <mkdir dir="${javac-tracing.classes.dir}" />
     <ecj destdir="${javac-tracing.classes.dir}" classpathref="javac-tracing.classpath">
       <javac-params>
+        <include name="com/facebook/buck/util/exportedfiles/Nullable.java" />
+        <include name="com/facebook/buck/util/exportedfiles/Preconditions.java" />
         <include name="${javac-tracing.src.dir}/TracingTaskListener.java" />
       </javac-params>
     </ecj>
@@ -258,7 +262,7 @@
 
     <!-- Put the tracing jar in resources so it can be dynamically loaded at runtime. See
      TranslatingJavacPhaseTracer -->
-    <copy file="${javac-tracing.jar}" todir="${classes.dir}/com/facebook/buck/java/tracing" />
+    <copy file="${javac-tracing.jar}" todir="${classes.dir}/com/facebook/buck/jvm/java/tracing" />
   </target>
 
   <path id="immutables-classpath">
@@ -536,10 +540,10 @@
       <zipfileset excludes="**/*SF **/*RSA" src="${third-party.dir}/java/jacoco/org.jacoco.report-0.7.5.201505241946.jar"/>
       <zipfileset excludes="**/*SF **/*RSA" src="${third-party.dir}/java/asm/asm-debug-all-5.0.3.jar"/>
       <fileset dir="${classes.dir}">
-          <include name="com/facebook/buck/java/coverage/ReportGenerator.class"/>
+          <include name="com/facebook/buck/jvm/java/coverage/ReportGenerator.class"/>
       </fileset>
       <manifest>
-        <attribute name="Main-Class" value="com.facebook.buck.java.coverage.ReportGenerator" />
+        <attribute name="Main-Class" value="com.facebook.buck.jvm.java.coverage.ReportGenerator" />
       </manifest>
     </jar>
   </target>
@@ -630,7 +634,7 @@
         which lives in the javac-tracing-compiler-plugin.jar, which is loaded dynamically at
         runtime. This test is run in the Buck build, which is capable of more isolated testing
         than the Ant build is. -->
-        <exclude name="com/facebook/buck/java/tracing/TracingTaskListenerCleanerTest.java" />
+        <exclude name="com/facebook/buck/jvm/java/tracing/TracingTaskListenerCleanerTest.java" />
       </javac-params>
     </ecj>
   </target>
@@ -667,11 +671,11 @@
       <!-- Java and android -->
       <batchtest fork="yes">
         <fileset dir="${test.dir}">
-          <include name="com/facebook/buck/java/**/*${test.class}.java" />
+          <include name="com/facebook/buck/jvm/java/**/*${test.class}.java" />
           <include name="com/facebook/buck/android/**/*${test.class}.java" />
           <include name="com/facebook/buck/dalvik/**/*${test.class}.java" />
 
-          <exclude name="com/facebook/buck/java/tracing/TracingTaskListenerCleanerTest.java" />
+          <exclude name="com/facebook/buck/jvm/java/tracing/TracingTaskListenerCleanerTest.java" />
           <exclude name="**/testdata/**" />
         </fileset>
       </batchtest>
@@ -705,7 +709,7 @@
           <include name="**/*${test.class}.java" />
 
           <exclude name="**/testdata/**" />
-          <exclude name="com/facebook/buck/java/**" />
+          <exclude name="com/facebook/buck/jvm/java/**" />
           <exclude name="com/facebook/buck/android/**" />
           <exclude name="com/facebook/buck/dalvik/**" />
           <exclude name="com/facebook/buck/apple/**" />

diff --git a/programs/BUCK b/programs/BUCK
@@ -52,7 +52,7 @@ BUCK_CORE_RESOURCES = {
     'path_to_python_test_main': '//src/com/facebook/buck/python:__test_main__.py',
     'path_to_pywatchman': '//third-party/py/pywatchman:pywatchman-archive',
     'path_to_sh_binary_template': '//src/com/facebook/buck/shell:sh_binary_template',
-    'report_generator_jar': '//src/com/facebook/buck/java/coverage:report-generator',
+    'report_generator_jar': '//src/com/facebook/buck/jvm/java/coverage:report-generator',
     'testrunner_classes': '//src/com/facebook/buck/junit:junit-bin-fixed',
 
     # TODO(#5448619): We currently don't have a great way of packaging up

diff --git a/src/com/facebook/buck/android/AaptPackageResources.java b/src/com/facebook/buck/android/AaptPackageResources.java
@@ -20,10 +20,10 @@
 import com.facebook.buck.android.AndroidBinary.PackageType;
 import com.facebook.buck.dalvik.EstimateLinearAllocStep;
 import com.facebook.buck.io.ProjectFilesystem;
-import com.facebook.buck.java.AccumulateClassNamesStep;
-import com.facebook.buck.java.HasJavaClassHashes;
-import com.facebook.buck.java.JavacOptions;
-import com.facebook.buck.java.JavacStep;
+import com.facebook.buck.jvm.java.AccumulateClassNamesStep;
+import com.facebook.buck.jvm.java.HasJavaClassHashes;
+import com.facebook.buck.jvm.java.JavacOptions;
+import com.facebook.buck.jvm.java.JavacStep;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.BuildTargets;
 import com.facebook.buck.rules.AbstractBuildRule;

diff --git a/src/com/facebook/buck/android/AbstractAndroidPackageableCollection.java b/src/com/facebook/buck/android/AbstractAndroidPackageableCollection.java
@@ -16,7 +16,7 @@
 
 package com.facebook.buck.android;
 
-import com.facebook.buck.java.JavaNativeLinkable;
+import com.facebook.buck.jvm.java.JavaNativeLinkable;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.rules.SourcePath;
 import com.facebook.buck.rules.coercer.BuildConfigFields;
@@ -133,13 +133,13 @@ public boolean hasResources() {
   ImmutableSet<SourcePath> getPathsToThirdPartyJars();
 
   /**
-   * {@link com.facebook.buck.java.JavaLibrary} rules whose output will be dexed and included in
+   * {@link com.facebook.buck.jvm.java.JavaLibrary} rules whose output will be dexed and included in
    * the package.
    */
   Set<BuildTarget> getJavaLibrariesToDex();
 
   /**
-   * See {@link com.facebook.buck.java.JavaLibrary#getClassNamesToHashes()}
+   * See {@link com.facebook.buck.jvm.java.JavaLibrary#getClassNamesToHashes()}
    */
   Supplier<Map<String, HashCode>> getClassNamesToHashesSupplier();
 }
diff --git a/src/com/facebook/buck/android/AndroidAar.java b/src/com/facebook/buck/android/AndroidAar.java
@@ -20,10 +20,10 @@
 import static com.facebook.buck.rules.BuildableProperties.Kind.PACKAGING;
 
 import com.facebook.buck.android.NdkCxxPlatforms.TargetCpuType;
-import com.facebook.buck.java.Classpaths;
-import com.facebook.buck.java.HasClasspathEntries;
-import com.facebook.buck.java.JarDirectoryStep;
-import com.facebook.buck.java.JavaLibrary;
+import com.facebook.buck.jvm.java.Classpaths;
+import com.facebook.buck.jvm.java.HasClasspathEntries;
+import com.facebook.buck.jvm.java.JarDirectoryStep;
+import com.facebook.buck.jvm.java.JavaLibrary;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.BuildTargets;
 import com.facebook.buck.rules.AbstractBuildRule;

diff --git a/src/com/facebook/buck/android/AndroidBinary.java b/src/com/facebook/buck/android/AndroidBinary.java
@@ -22,11 +22,11 @@
 import com.facebook.buck.android.FilterResourcesStep.ResourceFilter;
 import com.facebook.buck.android.ResourcesFilter.ResourceCompressionMode;
 import com.facebook.buck.io.ProjectFilesystem;
-import com.facebook.buck.java.AccumulateClassNamesStep;
-import com.facebook.buck.java.Classpaths;
-import com.facebook.buck.java.HasClasspathEntries;
-import com.facebook.buck.java.JavaLibrary;
-import com.facebook.buck.java.Keystore;
+import com.facebook.buck.jvm.java.AccumulateClassNamesStep;
+import com.facebook.buck.jvm.java.Classpaths;
+import com.facebook.buck.jvm.java.HasClasspathEntries;
+import com.facebook.buck.jvm.java.JavaLibrary;
+import com.facebook.buck.jvm.java.Keystore;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.BuildTargets;
 import com.facebook.buck.rules.keys.AbiRule;

diff --git a/src/com/facebook/buck/android/AndroidBinaryDescription.java b/src/com/facebook/buck/android/AndroidBinaryDescription.java
@@ -24,9 +24,9 @@
 import com.facebook.buck.android.NdkCxxPlatforms.TargetCpuType;
 import com.facebook.buck.android.ResourcesFilter.ResourceCompressionMode;
 import com.facebook.buck.dalvik.ZipSplitter.DexSplitStrategy;
-import com.facebook.buck.java.JavaLibrary;
-import com.facebook.buck.java.JavacOptions;
-import com.facebook.buck.java.Keystore;
+import com.facebook.buck.jvm.java.JavaLibrary;
+import com.facebook.buck.jvm.java.JavacOptions;
+import com.facebook.buck.jvm.java.Keystore;
 import com.facebook.buck.log.Logger;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.Flavor;

diff --git a/src/com/facebook/buck/android/AndroidBinaryGraphEnhancer.java b/src/com/facebook/buck/android/AndroidBinaryGraphEnhancer.java
@@ -21,9 +21,9 @@
 import com.facebook.buck.android.FilterResourcesStep.ResourceFilter;
 import com.facebook.buck.android.NdkCxxPlatforms.TargetCpuType;
 import com.facebook.buck.android.ResourcesFilter.ResourceCompressionMode;
-import com.facebook.buck.java.JavaLibrary;
-import com.facebook.buck.java.JavacOptions;
-import com.facebook.buck.java.Keystore;
+import com.facebook.buck.jvm.java.JavaLibrary;
+import com.facebook.buck.jvm.java.JavacOptions;
+import com.facebook.buck.jvm.java.Keystore;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.Flavor;
 import com.facebook.buck.model.HasBuildTarget;

diff --git a/src/com/facebook/buck/android/AndroidBuildConfigDescription.java b/src/com/facebook/buck/android/AndroidBuildConfigDescription.java
@@ -16,8 +16,8 @@
 
 package com.facebook.buck.android;
 
-import com.facebook.buck.java.CalculateAbi;
-import com.facebook.buck.java.JavacOptions;
+import com.facebook.buck.jvm.java.CalculateAbi;
+import com.facebook.buck.jvm.java.JavacOptions;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.Flavor;
 import com.facebook.buck.model.ImmutableFlavor;

diff --git a/src/com/facebook/buck/android/AndroidBuildConfigJavaLibrary.java b/src/com/facebook/buck/android/AndroidBuildConfigJavaLibrary.java
@@ -16,9 +16,9 @@
 
 package com.facebook.buck.android;
 
-import com.facebook.buck.java.DefaultJavaLibrary;
-import com.facebook.buck.java.JavaLibrary;
-import com.facebook.buck.java.JavacOptions;
+import com.facebook.buck.jvm.java.DefaultJavaLibrary;
+import com.facebook.buck.jvm.java.JavaLibrary;
+import com.facebook.buck.jvm.java.JavacOptions;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.rules.BuildRule;
 import com.facebook.buck.rules.BuildRuleParams;

diff --git a/src/com/facebook/buck/android/AndroidInstrumentationApk.java b/src/com/facebook/buck/android/AndroidInstrumentationApk.java
@@ -16,7 +16,7 @@
 
 package com.facebook.buck.android;
 
-import com.facebook.buck.java.JavaLibrary;
+import com.facebook.buck.jvm.java.JavaLibrary;
 import com.facebook.buck.rules.BuildRuleParams;
 import com.facebook.buck.rules.SourcePath;
 import com.facebook.buck.rules.SourcePathResolver;

diff --git a/src/com/facebook/buck/android/AndroidInstrumentationApkDescription.java b/src/com/facebook/buck/android/AndroidInstrumentationApkDescription.java
@@ -21,9 +21,9 @@
 import com.facebook.buck.android.AndroidBinary.ExopackageMode;
 import com.facebook.buck.android.AndroidBinary.PackageType;
 import com.facebook.buck.android.ResourcesFilter.ResourceCompressionMode;
-import com.facebook.buck.java.Classpaths;
-import com.facebook.buck.java.JavaLibrary;
-import com.facebook.buck.java.JavacOptions;
+import com.facebook.buck.jvm.java.Classpaths;
+import com.facebook.buck.jvm.java.JavaLibrary;
+import com.facebook.buck.jvm.java.JavacOptions;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.HasBuildTarget;
 import com.facebook.buck.rules.BuildRule;

diff --git a/src/com/facebook/buck/android/AndroidLibrary.java b/src/com/facebook/buck/android/AndroidLibrary.java
@@ -19,8 +19,8 @@
 import static com.facebook.buck.rules.BuildableProperties.Kind.ANDROID;
 import static com.facebook.buck.rules.BuildableProperties.Kind.LIBRARY;
 
-import com.facebook.buck.java.DefaultJavaLibrary;
-import com.facebook.buck.java.JavacOptions;
+import com.facebook.buck.jvm.java.DefaultJavaLibrary;
+import com.facebook.buck.jvm.java.JavacOptions;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.rules.AddToRuleKey;
 import com.facebook.buck.rules.BuildRule;

diff --git a/src/com/facebook/buck/android/AndroidLibraryDescription.java b/src/com/facebook/buck/android/AndroidLibraryDescription.java
@@ -17,12 +17,12 @@
 package com.facebook.buck.android;
 
 import com.facebook.buck.android.AndroidLibraryGraphEnhancer.ResourceDependencyMode;
-import com.facebook.buck.java.AnnotationProcessingParams;
-import com.facebook.buck.java.CalculateAbi;
-import com.facebook.buck.java.JavaLibrary;
-import com.facebook.buck.java.JavaLibraryDescription;
-import com.facebook.buck.java.JavaSourceJar;
-import com.facebook.buck.java.JavacOptions;
+import com.facebook.buck.jvm.java.AnnotationProcessingParams;
+import com.facebook.buck.jvm.java.CalculateAbi;
+import com.facebook.buck.jvm.java.JavaLibrary;
+import com.facebook.buck.jvm.java.JavaLibraryDescription;
+import com.facebook.buck.jvm.java.JavaSourceJar;
+import com.facebook.buck.jvm.java.JavacOptions;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.Flavor;
 import com.facebook.buck.model.Flavored;

diff --git a/src/com/facebook/buck/android/AndroidLibraryGraphEnhancer.java b/src/com/facebook/buck/android/AndroidLibraryGraphEnhancer.java
@@ -16,9 +16,9 @@
 
 package com.facebook.buck.android;
 
-import com.facebook.buck.java.AnnotationProcessingParams;
-import com.facebook.buck.java.CalculateAbi;
-import com.facebook.buck.java.JavacOptions;
+import com.facebook.buck.jvm.java.AnnotationProcessingParams;
+import com.facebook.buck.jvm.java.CalculateAbi;
+import com.facebook.buck.jvm.java.JavacOptions;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.Flavor;
 import com.facebook.buck.model.ImmutableFlavor;

diff --git a/src/com/facebook/buck/android/AndroidNativeLibsPackageableGraphEnhancer.java b/src/com/facebook/buck/android/AndroidNativeLibsPackageableGraphEnhancer.java
@@ -17,7 +17,7 @@
 package com.facebook.buck.android;
 
 import com.facebook.buck.cxx.CxxPlatform;
-import com.facebook.buck.java.JavaNativeLinkable;
+import com.facebook.buck.jvm.java.JavaNativeLinkable;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.Flavor;
 import com.facebook.buck.model.ImmutableFlavor;

diff --git a/src/com/facebook/buck/android/AndroidPackageableCollector.java b/src/com/facebook/buck/android/AndroidPackageableCollector.java
@@ -17,8 +17,8 @@
 package com.facebook.buck.android;
 
 import com.facebook.buck.android.AndroidPackageableCollection.ResourceDetails;
-import com.facebook.buck.java.HasJavaClassHashes;
-import com.facebook.buck.java.JavaNativeLinkable;
+import com.facebook.buck.jvm.java.HasJavaClassHashes;
+import com.facebook.buck.jvm.java.JavaNativeLinkable;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.rules.BuildRule;
 import com.facebook.buck.rules.SourcePath;

diff --git a/src/com/facebook/buck/android/AndroidPrebuiltAar.java b/src/com/facebook/buck/android/AndroidPrebuiltAar.java
@@ -16,8 +16,8 @@
 
 package com.facebook.buck.android;
 
-import com.facebook.buck.java.JavacOptions;
-import com.facebook.buck.java.PrebuiltJar;
+import com.facebook.buck.jvm.java.JavacOptions;
+import com.facebook.buck.jvm.java.PrebuiltJar;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.rules.BuildRule;
 import com.facebook.buck.rules.BuildRuleParams;

diff --git a/src/com/facebook/buck/android/AndroidPrebuiltAarDescription.java b/src/com/facebook/buck/android/AndroidPrebuiltAarDescription.java
@@ -16,9 +16,9 @@
 
 package com.facebook.buck.android;
 
-import com.facebook.buck.java.CalculateAbi;
-import com.facebook.buck.java.JavacOptions;
-import com.facebook.buck.java.PrebuiltJar;
+import com.facebook.buck.jvm.java.CalculateAbi;
+import com.facebook.buck.jvm.java.JavacOptions;
+import com.facebook.buck.jvm.java.PrebuiltJar;
 import com.facebook.buck.model.BuildTarget;
 import com.facebook.buck.model.BuildTargets;
 import com.facebook.buck.model.Flavor;

diff --git a/src/com/facebook/buck/android/BUCK b/src/com/facebook/buck/android/BUCK
@@ -30,8 +30,8 @@ java_immutables_library(
   deps = [
     '//third-party/java/guava:guava',
     '//src/com/facebook/buck/cxx:platform',
-    '//src/com/facebook/buck/java:classhash',
-    '//src/com/facebook/buck/java:nativelinkable',
+    '//src/com/facebook/buck/jvm/java:classhash',
+    '//src/com/facebook/buck/jvm/java:nativelinkable',
     '//src/com/facebook/buck/model:model',
     '//src/com/facebook/buck/rules:build_rule',
     '//src/com/facebook/buck/util:exceptions',
@@ -126,13 +126,13 @@ java_immutables_library(
     '//src/com/facebook/buck/file:rules',
     '//src/com/facebook/buck/graph:graph',
     '//src/com/facebook/buck/io:io',
-    '//src/com/facebook/buck/java:classhash',
-    '//src/com/facebook/buck/java:nativelinkable',
-    '//src/com/facebook/buck/java:rules',
-    '//src/com/facebook/buck/java:steps',
-    '//src/com/facebook/buck/java:support',
-    '//src/com/facebook/buck/java/abi:protocol',
-    '//src/com/facebook/buck/java/classes:classes',
+    '//src/com/facebook/buck/jvm/java:classhash',
+    '//src/com/facebook/buck/jvm/java:nativelinkable',
+    '//src/com/facebook/buck/jvm/java:rules',
+    '//src/com/facebook/buck/jvm/java:steps',
+    '//src/com/facebook/buck/jvm/java:support',
+    '//src/com/facebook/buck/jvm/java/abi:protocol',
+    '//src/com/facebook/buck/jvm/java/classes:classes',
     '//src/com/facebook/buck/log:api',
     '//src/com/facebook/buck/model:model',
     '//src/com/facebook/buck/parser:rule_pattern',
@@ -276,8 +276,8 @@ java_immutables_library(
     '//src/com/facebook/buck/dalvik:dalvik',
     '//src/com/facebook/buck/event:event',
     '//src/com/facebook/buck/io:io',
-    '//src/com/facebook/buck/java:classhash',
-    '//src/com/facebook/buck/java/classes:classes',
+    '//src/com/facebook/buck/jvm/java:classhash',
+    '//src/com/facebook/buck/jvm/java/classes:classes',
     '//src/com/facebook/buck/log:api',
     '//src/com/facebook/buck/log:log',  # This should not be required.
     '//src/com/facebook/buck/model:model',

diff --git a/src/com/facebook/buck/android/ComputeExopackageDepsAbi.java b/src/com/facebook/buck/android/ComputeExopackageDepsAbi.java
@@ -18,7 +18,7 @@
 
 import com.facebook.buck.android.AndroidBinary.ExopackageMode;
 import com.facebook.buck.android.ComputeExopackageDepsAbi.BuildOutput;
-import com.facebook.buck.java.Keystore;
+import com.facebook.buck.jvm.java.Keystore;
 import com.facebook.buck.log.Logger;
 import com.facebook.buck.rules.AbstractBuildRule;
 import com.facebook.buck.rules.BuildContext;

diff --git a/src/com/facebook/buck/android/DexProducedFromJavaLibrary.java b/src/com/facebook/buck/android/DexProducedFromJavaLibrary.java
@@ -18,7 +18,7 @@
 
 import com.facebook.buck.android.DexProducedFromJavaLibrary.BuildOutput;
 import com.facebook.buck.dalvik.EstimateLinearAllocStep;
-import com.facebook.buck.java.JavaLibrary;
+import com.facebook.buck.jvm.java.JavaLibrary;
 import com.facebook.buck.model.BuildTargets;
 import com.facebook.buck.model.HasBuildTarget;
 import com.facebook.buck.rules.keys.AbiRule;