From 4c4a24a991ad94ae8a8f92c3d1df57513773f217 Mon Sep 17 00:00:00 2001 From: Julian Kelsey Date: Fri, 16 Oct 2015 10:13:33 -0700 Subject: [PATCH] introduce a jvm package above the java package Summary: Closes https://github.com/facebook/buck/pull/461 Test Plan: buck test --- build.xml | 22 ++++++----- programs/BUCK | 2 +- .../buck/android/AaptPackageResources.java | 8 ++-- .../AbstractAndroidPackageableCollection.java | 6 +-- src/com/facebook/buck/android/AndroidAar.java | 8 ++-- .../facebook/buck/android/AndroidBinary.java | 10 ++--- .../android/AndroidBinaryDescription.java | 6 +-- .../android/AndroidBinaryGraphEnhancer.java | 6 +-- .../AndroidBuildConfigDescription.java | 4 +- .../AndroidBuildConfigJavaLibrary.java | 6 +-- .../android/AndroidInstrumentationApk.java | 2 +- .../AndroidInstrumentationApkDescription.java | 6 +-- .../facebook/buck/android/AndroidLibrary.java | 4 +- .../android/AndroidLibraryDescription.java | 12 +++--- .../android/AndroidLibraryGraphEnhancer.java | 6 +-- ...oidNativeLibsPackageableGraphEnhancer.java | 2 +- .../android/AndroidPackageableCollector.java | 4 +- .../buck/android/AndroidPrebuiltAar.java | 4 +- .../AndroidPrebuiltAarDescription.java | 6 +-- src/com/facebook/buck/android/BUCK | 22 +++++------ .../android/ComputeExopackageDepsAbi.java | 2 +- .../android/DexProducedFromJavaLibrary.java | 2 +- .../facebook/buck/android/DummyRDotJava.java | 8 ++-- src/com/facebook/buck/android/GenAidl.java | 4 +- .../buck/android/HashInputJarsToDexStep.java | 6 +-- .../buck/android/PreDexedFilesSorter.java | 2 +- src/com/facebook/buck/android/RDotJava.java | 6 +-- .../buck/android/RobolectricTest.java | 6 +-- .../android/RobolectricTestDescription.java | 10 ++--- .../android/UnsortedAndroidResourceDeps.java | 4 +- src/com/facebook/buck/android/UnzipAar.java | 2 +- .../buck/cli/AuditClasspathCommand.java | 2 +- src/com/facebook/buck/cli/BUCK | 28 +++++++------- src/com/facebook/buck/cli/BuckConfig.java | 2 +- src/com/facebook/buck/cli/CleanCommand.java | 2 +- .../buck/cli/CommandRunnerParams.java | 2 +- src/com/facebook/buck/cli/Main.java | 4 +- .../buck/cli/MissingSymbolsHandler.java | 6 +-- src/com/facebook/buck/cli/ProjectCommand.java | 18 ++++----- src/com/facebook/buck/cli/PublishCommand.java | 4 +- src/com/facebook/buck/cli/TestRunning.java | 10 ++--- src/com/facebook/buck/cli/bootstrapper/BUCK | 2 +- src/com/facebook/buck/command/BUCK | 8 ++-- src/com/facebook/buck/command/Build.java | 2 +- .../facebook/buck/cxx/AbstractCxxLibrary.java | 2 +- src/com/facebook/buck/cxx/BUCK | 4 +- .../buck/cxx/CxxPrepareForLinkStep.java | 2 +- src/com/facebook/buck/dalvik/BUCK | 4 +- .../facebook/buck/dalvik/CanaryFactory.java | 4 +- .../dalvik/DalvikAwareOutputStreamHelper.java | 2 +- .../buck/dalvik/DalvikAwareZipSplitter.java | 10 ++--- .../buck/dalvik/DalvikStatsCache.java | 2 +- .../dalvik/DefaultZipOutputStreamHelper.java | 2 +- .../buck/dalvik/DefaultZipSplitter.java | 8 ++-- .../buck/dalvik/EstimateLinearAllocStep.java | 8 ++-- .../buck/dalvik/SecondaryDexHelper.java | 2 +- .../buck/dalvik/ZipOutputStreamHelper.java | 2 +- src/com/facebook/buck/event/listener/BUCK | 4 +- .../listener/ChromeTraceBuildListener.java | 4 +- src/com/facebook/buck/gwt/BUCK | 8 ++-- src/com/facebook/buck/gwt/GwtBinary.java | 2 +- .../buck/gwt/GwtBinaryDescription.java | 2 +- src/com/facebook/buck/junit/BUCK | 2 +- .../{ => jvm}/java/AbstractJavacOptions.java | 2 +- .../{ => jvm}/java/AbstractJavacVersion.java | 2 +- .../java/AccumulateClassNamesStep.java | 10 ++--- .../java/AnnotationProcessingEvent.java | 2 +- .../java/AnnotationProcessingParams.java | 2 +- src/com/facebook/buck/{ => jvm}/java/BUCK | 36 ++++++++++-------- .../java/BuildsAnnotationProcessor.java | 2 +- .../buck/{ => jvm}/java/BuiltInJavac.java | 4 +- .../buck/{ => jvm}/java/CalculateAbi.java | 2 +- .../buck/{ => jvm}/java/CalculateAbiStep.java | 4 +- .../buck/{ => jvm}/java/Classpaths.java | 2 +- .../{ => jvm}/java/CopyResourcesStep.java | 2 +- .../{ => jvm}/java/DefaultJavaLibrary.java | 2 +- .../java/DefaultJavaPackageFinder.java | 2 +- .../java/DiagnosticPrettyPrinter.java | 2 +- .../buck/{ => jvm}/java/ExternalJavac.java | 2 +- .../facebook/buck/{ => jvm}/java/FatJar.java | 21 ++-------- .../buck/{ => jvm}/java/FatJarMain.java | 6 ++- .../java/GenerateCodeCoverageReportStep.java | 2 +- .../buck/{ => jvm}/java/GwtModule.java | 2 +- .../{ => jvm}/java/HasClasspathEntries.java | 2 +- .../buck/{ => jvm}/java/HasJavaAbi.java | 2 +- .../{ => jvm}/java/HasJavaClassHashes.java | 2 +- .../{ => jvm}/java/HasMavenCoordinates.java | 2 +- .../buck/{ => jvm}/java/HasSources.java | 2 +- .../buck/{ => jvm}/java/JUnitStep.java | 4 +- .../buck/{ => jvm}/java/JarBackedJavac.java | 2 +- .../buck/{ => jvm}/java/JarDirectoryStep.java | 2 +- .../java/JarDirectoryStepHelper.java | 2 +- .../buck/{ => jvm}/java/JarFattener.java | 25 +++++++++--- .../buck/{ => jvm}/java/JavaBinary.java | 2 +- .../{ => jvm}/java/JavaBinaryDescription.java | 2 +- .../buck/{ => jvm}/java/JavaBuckConfig.java | 2 +- .../buck/{ => jvm}/java/JavaFileParser.java | 2 +- .../buck/{ => jvm}/java/JavaLibrary.java | 2 +- .../java/JavaLibraryClasspathProvider.java | 2 +- .../java/JavaLibraryDescription.java | 2 +- .../buck/{ => jvm}/java/JavaLibraryRules.java | 2 +- .../{ => jvm}/java/JavaNativeLinkable.java | 2 +- .../{ => jvm}/java/JavaPackageFinder.java | 2 +- .../buck/{ => jvm}/java/JavaSourceJar.java | 2 +- .../buck/{ => jvm}/java/JavaSymbolFinder.java | 2 +- .../buck/{ => jvm}/java/JavaTest.java | 6 +-- .../{ => jvm}/java/JavaTestDescription.java | 2 +- .../facebook/buck/{ => jvm}/java/Javac.java | 2 +- .../buck/{ => jvm}/java/JavacErrorParser.java | 2 +- .../buck/{ => jvm}/java/JavacStep.java | 7 +++- .../{ => jvm}/java/JavacToJarStepFactory.java | 2 +- .../java/JdkProvidedInMemoryJavac.java | 2 +- .../buck/{ => jvm}/java/Jsr199Javac.java | 10 ++++- .../buck/{ => jvm}/java/Keystore.java | 2 +- .../{ => jvm}/java/KeystoreDescription.java | 2 +- .../buck/{ => jvm}/java/MavenPublishable.java | 2 +- .../buck/{ => jvm}/java/MavenUberJar.java | 2 +- .../buck/{ => jvm}/java/PrebuiltJar.java | 2 +- .../java/PrebuiltJarDescription.java | 2 +- .../java/ResourcesRootPackageFinder.java | 2 +- .../buck/{ => jvm}/java/SrcRootsFinder.java | 2 +- .../buck/{ => jvm}/java/TestType.java | 2 +- .../java/TracingProcessorWrapper.java | 2 +- .../java/ZipEntryJavaFileObject.java | 2 +- .../{ => jvm}/java/abi/AbiWriterProtocol.java | 4 +- .../{ => jvm}/java/abi/AnnotationMirror.java | 2 +- .../java/abi/AnnotationValueMirror.java | 2 +- .../buck/{ => jvm}/java/abi/ApiStubber.java | 2 +- src/com/facebook/buck/{ => jvm}/java/abi/BUCK | 8 ++-- .../buck/{ => jvm}/java/abi/ClassMirror.java | 2 +- .../{ => jvm}/java/abi/DirectoryWalker.java | 2 +- .../buck/{ => jvm}/java/abi/EnumMirror.java | 2 +- .../buck/{ => jvm}/java/abi/FieldMirror.java | 2 +- .../buck/{ => jvm}/java/abi/FileAction.java | 2 +- .../buck/{ => jvm}/java/abi/MethodMirror.java | 2 +- .../buck/{ => jvm}/java/abi/StubJar.java | 2 +- .../buck/{ => jvm}/java/abi/Walker.java | 2 +- .../buck/{ => jvm}/java/abi/Walkers.java | 2 +- .../buck/{ => jvm}/java/abi/ZipWalker.java | 2 +- .../java/classes/AbstractFileLike.java | 2 +- .../facebook/buck/{ => jvm}/java/classes/BUCK | 2 +- .../java/classes/ClasspathTraversal.java | 2 +- .../java/classes/ClasspathTraverser.java | 2 +- .../classes/DefaultClasspathTraverser.java | 2 +- .../buck/{ => jvm}/java/classes/FileLike.java | 2 +- .../java/classes/FileLikeCharSource.java | 2 +- .../{ => jvm}/java/classes/FileLikes.java | 2 +- .../buck/{ => jvm}/java/coverage/BUCK | 4 +- .../java/coverage/ReportGenerator.java | 2 +- .../java/intellij/AbstractIjFolder.java | 2 +- .../java/intellij/AbstractIjLibrary.java | 2 +- .../java/intellij/AbstractIjModule.java | 2 +- .../AbstractIjModuleAndroidFacet.java | 2 +- .../buck/{ => jvm}/java/intellij/BUCK | 10 ++--- .../{ => jvm}/java/intellij/CompilerXml.java | 2 +- .../intellij/DefaultIjLibraryFactory.java | 4 +- .../intellij/ExportedDepsClosureResolver.java | 4 +- .../intellij/IjDependencyListBuilder.java | 2 +- .../java/intellij/IjLibraryFactory.java | 2 +- .../java/intellij/IjModuleFactory.java | 6 +-- .../java/intellij/IjModuleGraph.java | 2 +- .../{ => jvm}/java/intellij/IjProject.java | 8 ++-- .../java/intellij/IjProjectElement.java | 2 +- .../IjProjectTemplateDataPreparer.java | 4 +- .../java/intellij/IjProjectWriter.java | 2 +- .../java/intellij/IntellijConfig.java | 2 +- .../intellij/ParsingJavaPackageFinder.java | 8 ++-- .../buck/{ => jvm}/java/intellij/Project.java | 16 ++++---- .../java/intellij/SerializableAndroidAar.java | 2 +- .../intellij/SerializableDependentModule.java | 2 +- .../SerializableIntellijSettings.java | 2 +- .../java/intellij/SerializableModule.java | 2 +- .../buck/{ => jvm}/java/intellij/Util.java | 2 +- .../{ => jvm}/java/intellij/ij-library.st | 0 .../java/intellij/ij-module-index.st | 0 .../buck/{ => jvm}/java/intellij/ij-module.st | 0 .../facebook/buck/{ => jvm}/java/runner/BUCK | 6 +-- .../java/runner/FileClassPathRunner.java | 24 +++++++++++- .../facebook/buck/{ => jvm}/java/tracing/BUCK | 18 +++++---- .../java/tracing/JavacPhaseEvent.java | 2 +- .../java/tracing/JavacPhaseEventLogger.java | 2 +- .../java/tracing/JavacPhaseTracer.java | 10 +++-- .../java/tracing/TracingTaskListener.java | 9 +++-- .../tracing/TranslatingJavacPhaseTracer.java | 4 +- src/com/facebook/buck/maven/BUCK | 8 ++-- src/com/facebook/buck/maven/Pom.java | 4 +- src/com/facebook/buck/maven/Publisher.java | 2 +- src/com/facebook/buck/rules/BUCK | 8 ++-- src/com/facebook/buck/rules/BuildContext.java | 2 +- .../facebook/buck/rules/HasRuntimeDeps.java | 4 +- .../buck/rules/KnownBuildRuleTypes.java | 14 +++---- src/com/facebook/buck/rules/macros/BUCK | 4 +- .../rules/macros/ClasspathMacroExpander.java | 4 +- src/com/facebook/buck/step/BUCK | 2 +- .../facebook/buck/step/ExecutionContext.java | 2 +- src/com/facebook/buck/test/BUCK | 4 +- src/com/facebook/buck/test/result/type/BUCK | 2 +- src/com/facebook/buck/test/selectors/BUCK | 6 +-- src/com/facebook/buck/thrift/BUCK | 10 ++--- .../buck/thrift/ThriftJavaEnhancer.java | 8 ++-- src/com/facebook/buck/util/exportedfiles/BUCK | 13 +++++++ .../buck/util/exportedfiles/Nullable.java | 25 ++++++++++++ .../util/exportedfiles/Preconditions.java | 31 +++++++++++++++ src/com/facebook/buck/zip/BUCK | 4 +- .../buck/zip/SrcZipAwareFileBundler.java | 2 +- .../android/AaptPackageResourcesTest.java | 2 +- .../buck/android/AndroidBinaryBuilder.java | 2 +- .../android/AndroidBinaryDescriptionTest.java | 4 +- .../AndroidBinaryGraphEnhancerTest.java | 8 ++-- .../buck/android/AndroidBinaryTest.java | 8 ++-- .../AndroidBuildConfigJavaLibraryTest.java | 2 +- .../AndroidInstrumentationApkBuilder.java | 2 +- ...roidInstrumentationApkDescriptionTest.java | 4 +- .../AndroidInstrumentationApkTest.java | 8 ++-- .../buck/android/AndroidLibraryBuilder.java | 2 +- .../AndroidLibraryGraphEnhancerTest.java | 6 +-- .../buck/android/AndroidLibraryTest.java | 4 +- .../AndroidPackageableCollectorTest.java | 6 +-- .../android/AndroidPrebuiltAarBuilder.java | 2 +- .../android/ApkGenruleDescriptionTest.java | 2 +- .../facebook/buck/android/ApkGenruleTest.java | 8 ++-- test/com/facebook/buck/android/BUCK | 22 +++++------ ...JavaLibraryThatContainsClassFilesTest.java | 6 +-- .../buck/android/DexWithClassesTest.java | 4 +- .../buck/android/DummyRDotJavaTest.java | 2 +- .../buck/android/RobolectricTestBuilder.java | 2 +- .../buck/cli/AuditClasspathCommandTest.java | 6 +-- .../buck/cli/AuditInputCommandTest.java | 4 +- .../buck/cli/AuditOwnerCommandTest.java | 2 +- test/com/facebook/buck/cli/BUCK | 12 +++--- .../buck/cli/BuckQueryEnvironmentTest.java | 2 +- .../buck/cli/BuildCommandOptionsTest.java | 2 +- .../facebook/buck/cli/CleanCommandTest.java | 4 +- .../cli/CommandRunnerParamsForTesting.java | 4 +- .../cli/DefaultJavaPackageFinderTest.java | 2 +- .../buck/cli/ProjectCommandIntellijTest.java | 6 +-- .../buck/cli/ProjectCommandTests.java | 2 +- .../cli/PublishCommandIntegrationTest.java | 2 +- .../cli/ResourcesRootPackageFinderTest.java | 4 +- .../facebook/buck/cli/TargetsCommandTest.java | 12 +++--- .../facebook/buck/cli/TestRunningTest.java | 6 +-- test/com/facebook/buck/command/BUCK | 6 +-- test/com/facebook/buck/cxx/BUCK | 4 +- test/com/facebook/buck/dalvik/BUCK | 4 +- .../dalvik/EstimateLinearAllocStepTest.java | 2 +- test/com/facebook/buck/dalvik/firstorder/BUCK | 2 +- test/com/facebook/buck/event/BUCK | 4 +- test/com/facebook/buck/event/listener/BUCK | 6 +-- .../ChromeTraceBuildListenerTest.java | 4 +- .../java/AccumulateClassNamesStepTest.java | 2 +- .../java/AnnotationProcessingEventTest.java | 2 +- .../java/AnnotationProcessingParamsTest.java | 2 +- test/com/facebook/buck/{ => jvm}/java/BUCK | 32 ++++++++-------- ...dTargetSourcePathAsSrcIntegrationTest.java | 2 +- .../java/CachedTestIntegrationTest.java | 2 +- ...CachedTestRunReportingIntegrationTest.java | 2 +- .../{ => jvm}/java/CalculateAbiStepTest.java | 2 +- .../buck/{ => jvm}/java/CalculateAbiTest.java | 2 +- .../java/CleanClasspathIntegrationTest.java | 2 +- .../java/CompileSrcZipIntegrationTest.java | 2 +- .../CopyResourcesStepIntegrationTest.java | 2 +- ...CorrectlyParseFilepathIntegrationTest.java | 2 +- .../{ => jvm}/java/CopyResourcesStepTest.java | 2 +- .../DefaultJavaLibraryIntegrationTest.java | 2 +- .../java/DefaultJavaLibraryTest.java | 6 +-- .../java/DiagnosticPrettyPrinterTest.java | 2 +- .../java/EmptyTestIntegrationTest.java | 2 +- .../java/ExternalJavacEscaperTest.java | 2 +- .../java/ExternalJavacIntegrationTest.java | 2 +- .../{ => jvm}/java/ExternalJavacTest.java | 2 +- .../buck/{ => jvm}/java/FakeJavaLibrary.java | 2 +- .../{ => jvm}/java/FakeJavaPackageFinder.java | 2 +- .../GenerateCodeCoverageReportStepTest.java | 2 +- .../java/GenruleDepsIntegrationTest.java | 2 +- .../buck/{ => jvm}/java/JUnitStepTest.java | 4 +- .../{ => jvm}/java/JarDirectoryStepTest.java | 2 +- .../java/JavaBinaryDescriptionTest.java | 2 +- .../java/JavaBinaryIntegrationTest.java | 2 +- .../{ => jvm}/java/JavaBinaryRuleBuilder.java | 4 +- .../buck/{ => jvm}/java/JavaBinaryTest.java | 2 +- .../{ => jvm}/java/JavaBuckConfigTest.java | 4 +- .../java/JavaCompilationConstants.java | 2 +- .../{ => jvm}/java/JavaFileParserTest.java | 4 +- .../{ => jvm}/java/JavaLibraryBuilder.java | 4 +- .../java/JavaLibraryDescriptionTest.java | 4 +- .../{ => jvm}/java/JavaSourceJarTest.java | 2 +- .../java/JavaSymbolFinderIntegrationTest.java | 4 +- .../buck/{ => jvm}/java/JavaTestBuilder.java | 4 +- .../java/JavaTestDescriptionTest.java | 2 +- .../JavaTestGetClassNamesIntegrationTest.java | 2 +- .../java/JavaTestIntegrationTest.java | 2 +- .../buck/{ => jvm}/java/JavaTestRuleTest.java | 2 +- .../{ => jvm}/java/JavacErrorParserTest.java | 10 ++--- .../buck/{ => jvm}/java/JavacOptionsTest.java | 2 +- .../buck/{ => jvm}/java/JavacStepTest.java | 2 +- .../java/Jsr199JavacIntegrationTest.java | 2 +- .../buck/{ => jvm}/java/Jsr199JavacTest.java | 4 +- .../buck/{ => jvm}/java/KeystoreBuilder.java | 2 +- .../buck/{ => jvm}/java/KeystoreTest.java | 2 +- .../MissingSymbolsHandlerIntegrationTest.java | 4 +- .../{ => jvm}/java/PrebuiltJarBuilder.java | 2 +- .../java/PrebuiltJarIntegrationTest.java | 2 +- .../buck/{ => jvm}/java/PrebuiltJarTest.java | 2 +- .../java/ResourcesRootIntegrationTest.java | 2 +- .../java/SrcRootsFinderIntegrationTest.java | 2 +- .../buck/{ => jvm}/java/abi/AbiClass.java | 2 +- .../com/facebook/buck/{ => jvm}/java/abi/BUCK | 2 +- .../buck/{ => jvm}/java/abi/MirrorTest.java | 2 +- .../java/abi/StubJarIntegrationTest.java | 2 +- .../java/abi/testdata/sample/android.jar | Bin .../java/abi/testdata/sample/junit.jar | Bin .../java/abi/testdata/sample/unity.jar | Bin .../facebook/buck/{ => jvm}/java/classes/BUCK | 2 +- .../java/classes/ClasspathTraversalTest.java | 2 +- .../{ => jvm}/java/classes/FileLikesTest.java | 2 +- .../buck/{ => jvm}/java/intellij/BUCK | 14 +++---- .../intellij/DefaultIjLibraryFactoryTest.java | 6 +-- .../{ => jvm}/java/intellij/IjFolderTest.java | 2 +- .../java/intellij/IjModuleFactoryTest.java | 6 +-- .../java/intellij/IjModuleGraphTest.java | 10 ++--- .../{ => jvm}/java/intellij/IjModuleTest.java | 4 +- .../intellij/IjProjectDataPreparerTest.java | 12 +++--- .../ParsingJavaPackageFinderTest.java | 8 ++-- .../java/intellij/ProjectIntegrationTest.java | 2 +- .../{ => jvm}/java/intellij/ProjectTest.java | 16 ++++---- .../.buckconfig | 0 .../app/BUCK.fixture | 0 .../app/app.iml.expected | 0 .../app/keystore/debug.keystore | 0 .../app/keystore/debug.keystore.properties | 0 .../app/src/main/AndroidManifest.xml | 0 .../app/src/main/assets/app_asset_index.txt | 0 .../src/main/java/com/example/MyActivity.java | 0 .../main/res/drawable-hdpi/ic_launcher.png | 0 .../main/res/drawable-ldpi/ic_launcher.png | 0 .../main/res/drawable-mdpi/ic_launcher.png | 0 .../main/res/drawable-xhdpi/ic_launcher.png | 0 .../app/src/main/res/layout/main.xml | 0 .../app/src/main/res/values/strings.xml | 0 .../libA/BUCK.fixture | 0 .../libA/libA.iml.expected | 0 .../libA/src/main/AndroidManifest.xml | 0 .../libA/src/main/assets/libA_asset_index.txt | 0 .../src/main/java/com/example/ActivityA.java | 0 .../libA/src/main/res/layout/main.xml | 0 .../libA/src/main/res/values/strings.xml | 0 .../libB/BUCK.fixture | 0 .../libB/libB.iml.expected | 0 .../libB/src/main/AndroidManifest.xml | 0 .../src/main/java/com/example/ActivityB.java | 0 .../libB/src/main/res/layout/main.xml | 0 .../libB/src/main/res/values/strings.xml | 0 .../.buckconfig | 0 .../lib/BUCK.fixture | 0 .../lib/junit-4.11.jar | Bin .../src/BUCK.fixture | 0 .../test/BUCK.fixture | 0 .../test/module_test.iml.expected | 0 .../experimental_project1/.buckconfig | 0 .../library_libs_generated.xml.expected | 0 .../libraries/library_libs_guava.xml.expected | 0 .../library_libs_jsr305.xml.expected | 0 .../libraries/library_libs_junit.xml.expected | 0 ...ibrary_modules_dep1_generated.xml.expected | 0 .../.idea/modules.xml.expected | 0 .../.idea/modules/modules_dep1.iml.expected | 0 .../.idea/modules/modules_tip.iml.expected | 0 .../.idea/modules/project_root.iml.expected | 0 .../experimental_project1/libs/BUCK.fixture | 0 .../experimental_project1/libs/guava.jar | 0 .../experimental_project1/libs/jsr305.jar | 0 .../experimental_project1/libs/junit.jar | 0 .../modules/dep1/BUCK.fixture | 0 .../modules/dep1/src/Foo.java | 0 .../modules/tip/BUCK.fixture | 0 .../experimental_project_slice/.buckconfig | 0 .../.idea/modules.xml.expected | 0 .../.idea/modules/modules_dep1.iml.expected | 0 .../.idea/modules/modules_dep2.iml.expected | 0 .../.idea/modules/project_root.iml.expected | 0 .../modules/dep1/BUCK.fixture | 0 .../modules/dep1/src/Foo.java | 0 .../modules/dep2/BUCK.fixture | 0 .../modules/dep2/src/Foo.java | 0 .../intellij/testdata/project1/.buckconfig | 0 ...ck_out_gen_libs_generated_jar.xml.expected | 0 .../project1/.idea/modules.xml.expected | 0 .../intellij/testdata/project1/BUCK.fixture | 0 .../testdata/project1/libs/BUCK.fixture | 0 .../intellij/testdata/project1/libs/guava.jar | 0 .../testdata/project1/libs/jsr305.jar | 0 .../intellij/testdata/project1/libs/junit.jar | 0 .../project1/modules/dep1/BUCK.fixture | 0 .../dep1/module_modules_dep1.iml.expected | 0 .../project1/modules/dep1/src/Foo.java | 0 .../project1/modules/tip/BUCK.fixture | 0 .../tip/module_modules_tip.iml.expected | 0 .../testdata/project1/root.iml.expected | 0 .../intellij/testdata/project2/.buckconfig | 0 ...ck_out_gen_libs_generated_jar.xml.expected | 0 .../project2/.idea/modules.xml.expected | 0 .../intellij/testdata/project2/BUCK.fixture | 0 .../testdata/project2/libs/BUCK.fixture | 0 .../intellij/testdata/project2/libs/guava.jar | 0 .../testdata/project2/libs/jsr305.jar | 0 .../intellij/testdata/project2/libs/junit.jar | 0 .../project2/modules/dep1/BUCK.fixture | 0 .../project2/modules/dep1/ignore/BUCK.fixture | 0 .../dep1/module_modules_dep1.iml.expected | 0 .../project2/modules/dep1/src/Foo.java | 0 .../project2/modules/tip/BUCK.fixture | 0 .../tip/module_modules_tip.iml.expected | 0 .../testdata/project2/root.iml.expected | 0 .../testdata/project_r_001/.buckconfig | 0 .../project_r_001/.idea/modules.xml.expected | 0 .../apps/myapp/AndroidManifest.xml | 0 .../project_r_001/apps/myapp/BUCK.fixture | 0 .../project_r_001/apps/myapp/app.iml.expected | 0 .../project_r_001/apps/myapp/debug.keystore | Bin .../apps/myapp/debug.keystore.properties | 0 .../java/com/example/activity/BUCK.fixture | 0 .../com/example/activity/MyFirstActivity.java | 0 ...ule_java_com_example_activity.iml.expected | 0 .../project_r_001/res/AndroidManifest.xml | 0 .../res/com/example/activity/BUCK.fixture | 0 ...dule_res_com_example_activity.iml.expected | 0 .../com/example/activity/res/layout/main.xml | 0 .../example/activity/res/values/strings.xml | 0 .../testdata/project_r_002/.buckconfig | 0 .../apps/myapp/AndroidManifest.xml | 0 .../project_r_002/apps/myapp/BUCK.fixture | 0 .../project_r_002/apps/myapp/debug.keystore | Bin .../apps/myapp/debug.keystore.properties | 0 .../java/com/example/activity/BUCK.fixture | 0 .../com/example/activity/MyFirstActivity.java | 0 .../project_r_002/res/AndroidManifest.xml | 0 .../res/com/example/activity/BUCK.fixture | 0 .../com/example/activity/res/layout/main.xml | 0 .../example/activity/res/values/strings.xml | 0 .../testdata/project_slice/.buckconfig | 0 .../project_slice/.idea/modules.xml.expected | 0 .../testdata/project_slice/BUCK.fixture | 0 .../testdata/project_slice/libs/BUCK.fixture | 0 .../testdata/project_slice/libs/guava.jar | 0 .../testdata/project_slice/libs/jsr305.jar | 0 .../testdata/project_slice/libs/junit.jar | 0 .../project_slice/module_.iml.expected | 0 .../project_slice/modules/dep1/BUCK.fixture | 0 .../project_slice/modules/dep1/dep2/world.txt | 0 .../dep1/module_modules_dep1.iml.expected | 0 .../project_slice/modules/tip/BUCK.fixture | 0 .../testdata/project_slice/tests/BUCK.fixture | 0 .../.buckconfig | 0 .../.idea/modules.xml.expected | 0 .../BUCK.fixture | 0 .../module_.iml.expected | 0 .../modules/BUCK.fixture | 0 .../modules/dep1/BUCK.fixture | 0 .../modules/module_modules_dep1.iml.expected | 0 .../project_slice_with_tests/.buckconfig | 0 .../.idea/modules.xml.expected | 0 .../libs/BUCK.fixture | 0 .../project_slice_with_tests/libs/guava.jar | 0 .../project_slice_with_tests/libs/jsr305.jar | 0 .../project_slice_with_tests/libs/junit.jar | 0 .../modules/dep1/BUCK.fixture | 0 .../dep1/module_modules_dep1.iml.expected | 0 .../modules/tip/BUCK.fixture | 0 .../modules/tip/module_modules_tip.iml | 0 .../tests/BUCK.fixture | 0 .../tests/module_tests.iml.expected | 0 .../.buckconfig | 0 .../.idea/modules.xml.expected | 0 .../modules/dep1/BUCK.fixture | 0 .../dep1/module_modules_dep1.iml.expected | 0 .../modules/dep2/BUCK.fixture | 0 .../dep2/module_modules_dep2.iml.expected | 0 .../tests/BUCK.fixture | 0 .../tests/module_tests.iml.expected | 0 .../.buckconfig | 0 .../.idea/modules.xml.expected | 0 .../modules/dep1/BUCK.fixture | 0 .../dep1/module_modules_dep1.iml.expected | 0 .../tests/BUCK.fixture | 0 .../tests/module_tests_test1.iml.expected | 0 .../tests/test1/BUCK.fixture | 0 .../project_with_android_binary/.buckconfig | 0 .../.idea/compiler.xml.expected | 0 .../.idea/modules.xml.expected | 0 .../Debug_Buck_test.xml.expected | 0 .../apps/sample/AndroidManifest.xml | 0 .../apps/sample/BUCK.fixture | 0 .../sample/module_apps_sample.iml.expected | 0 .../java/com/sample/lib/BUCK.fixture | 0 .../java/com/sample/lib/Sample.java | 0 .../java/com/sample/lib/Sample2.java | 0 .../java/com/sample/lib/Sample3.java | 0 .../module_java_com_sample_lib.iml.expected | 0 .../keystores/BUCK.fixture | 0 .../keystores/debug.keystore | Bin .../keystores/debug.keystore.properties | 0 .../res/com/sample/asset_only/BUCK.fixture | 0 .../sample/asset_only/assets/asset_file.txt | 0 ...ule_res_com_sample_asset_only.iml.expected | 0 .../res/com/sample/base/BUCK.fixture | 0 .../com/sample/base/buck-assets/hilarity.txt | 0 .../module_res_com_sample_base.iml.expected | 0 .../base/res/drawable-hdpi/app_icon.png | Bin .../base/res/drawable-mdpi/app_icon.png | Bin .../base/res/drawable-xhdpi/app_icon.png | Bin .../com/sample/base/res/values-fr/strings.xml | 0 .../com/sample/base/res/values/strings.xml | 0 .../res/com/sample/title/BUCK.fixture | 0 .../module_res_com_sample_title.iml.expected | 0 .../com/sample/title/res/values/strings.xml | 0 .../res/com/sample/top/BUCK.fixture | 0 .../module_res_com_sample_top.iml.expected | 0 .../sample/top/res/drawable/tiny_black.png | Bin .../top/res/drawable/tiny_something.png | Bin .../sample/top/res/drawable/tiny_white.png | Bin .../com/sample/top/res/layout/top_layout.xml | 0 .../.buckconfig | 0 .../.idea/compiler.xml.expected | 0 .../.idea/modules.xml.expected | 0 .../Debug_Buck_test.xml.expected | 0 .../apps/sample/AndroidManifest.xml | 0 .../apps/sample/BUCK.fixture | 0 .../sample/module_apps_sample.iml.expected | 0 .../java/com/sample/lib/BUCK.fixture | 0 .../java/com/sample/lib/Sample.java | 0 .../java/com/sample/lib/Sample2.java | 0 .../java/com/sample/lib/Sample3.java | 0 .../module_java_com_sample_lib.iml.expected | 0 .../keystores/BUCK.fixture | 0 .../keystores/debug.keystore | Bin .../keystores/debug.keystore.properties | 0 .../res/com/sample/asset_only/BUCK.fixture | 0 .../sample/asset_only/assets/asset_file.txt | 0 ...ule_res_com_sample_asset_only.iml.expected | 0 .../res/com/sample/base/BUCK.fixture | 0 .../com/sample/base/buck-assets/hilarity.txt | 0 .../module_res_com_sample_base.iml.expected | 0 .../base/res/drawable-hdpi/app_icon.png | Bin .../base/res/drawable-mdpi/app_icon.png | Bin .../base/res/drawable-xhdpi/app_icon.png | Bin .../com/sample/base/res/values-fr/strings.xml | 0 .../com/sample/base/res/values/strings.xml | 0 .../res/com/sample/title/BUCK.fixture | 0 .../module_res_com_sample_title.iml.expected | 0 .../com/sample/title/res/values/strings.xml | 0 .../res/com/sample/top/BUCK.fixture | 0 .../module_res_com_sample_top.iml.expected | 0 .../sample/top/res/drawable/tiny_black.png | Bin .../top/res/drawable/tiny_something.png | Bin .../sample/top/res/drawable/tiny_white.png | Bin .../com/sample/top/res/layout/top_layout.xml | 0 .../.buckconfig | 0 ...ck_out_gen_libs_generated_jar.xml.expected | 0 .../.idea/modules.xml.expected | 0 .../BUCK.fixture | 0 .../libs/BUCK.fixture | 0 .../libs/guava.jar | 0 .../libs/jsr305.jar | 0 .../libs/junit.jar | 0 .../modules/dep1/BUCK.fixture | 0 .../dep1/module_modules_dep1.iml.expected | 0 .../modules/dep1/src/Foo.java | 0 .../modules/tip/BUCK.fixture | 0 .../tip/module_modules_tip.iml.expected | 0 .../root.iml | 0 .../root.iml.expected | 0 .../facebook/buck/{ => jvm}/java/runner/BUCK | 2 +- .../java/runner/FileClassPathRunnerTest.java | 2 +- .../{ => jvm}/java/testdata/abi/.buckconfig | 0 .../{ => jvm}/java/testdata/abi/.gitignore | 0 .../{ => jvm}/java/testdata/abi/BUCK.fixture | 0 .../bin/.no_srcs/metadata/ABI_KEY.expected | 0 .../BUCK.fixture | 0 .../LameGenfile.java | 0 .../LameTest.java | 0 .../hamcrest-core-1.3.jar | Bin .../hamcrest-library-1.3.jar | Bin .../junit-4.11.jar | Bin .../resource.base.txt | 0 .../java/testdata/cached_test/.buckconfig | 0 .../java/testdata/cached_test/BUCK.fixture | 0 .../java/testdata/cached_test/LameTest.java | 0 .../cached_test/hamcrest-core-1.3.jar | Bin .../cached_test/hamcrest-library-1.3.jar | Bin .../java/testdata/cached_test/junit-4.11.jar | Bin .../BUCK.fixture | 0 .../classpath_corruption_regression/Bar.java | 0 .../classpath_corruption_regression/Foo.java | 0 .../java/testdata/deadlock/.buckconfig | 0 .../java/testdata/deadlock/AllTests.java | 0 .../java/testdata/deadlock/BUCK.fixture | 0 .../testdata/deadlock/Junit4BlockTest.java | 0 .../java/testdata/deadlock/hamcrest.jar | Bin .../java/testdata/deadlock/junit.jar | Bin .../java/testdata/empty_test/BUCK.fixture | 0 .../export_directory_entries/.buckconfig | 0 .../export_directory_entries/BUCK.fixture | 0 .../some_directory/swag.txt | 0 .../some_directory/yolo.txt | 0 .../java/testdata/external_javac/.buckconfig | 0 .../java/testdata/external_javac/check_env.sh | 0 .../java/testdata/external_javac/error.sh | 0 .../java/com/example/BUCK.fixture | 0 .../java/com/example/Example.java | 0 .../java/testdata/external_javac/javac.sh | 0 .../external_javac_src_zip/.buckconfig | 0 .../external_javac_src_zip/BUCK.fixture | 0 .../testdata/external_javac_src_zip/Yin.java | 0 .../testdata/external_javac_src_zip/Zip.java | 0 .../testdata/external_javac_src_zip/javac.sh | 0 .../java/testdata/fat_jar/BUCK.fixture | 0 .../{ => jvm}/java/testdata/fat_jar/Dep.cpp | 0 .../{ => jvm}/java/testdata/fat_jar/Dep.h | 0 .../{ => jvm}/java/testdata/fat_jar/Lib.java | 0 .../java/testdata/fat_jar/LibExitCode.java | 0 .../java/testdata/fat_jar/LibOutput.java | 0 .../java/testdata/fat_jar/Native.cpp | 0 .../java/testdata/fat_jar/print_lib_path.py | 0 .../testdata/generated_resources/.buckconfig | 0 .../java/com/example/BUCK.fixture | 0 .../java/com/example/HelloWorld.java | 0 .../java/com/example/res/BUCK.fixture | 0 .../java/testdata/genrule_test/BUCK.fixture | 0 .../java/testdata/genrule_test/LameTest.java | 0 .../testdata/genrule_test/LibraryClass.java | 0 .../genrule_test/hamcrest-core-1.3.jar | Bin .../genrule_test/hamcrest-library-1.3.jar | Bin .../java/testdata/genrule_test/junit-4.11.jar | Bin .../testdata/genrule_test/resource.base.txt | 0 .../java/testdata/guava_no_deps/BUCK.fixture | 0 .../java/testdata/guava_no_deps/Bar.java | 0 .../java/testdata/guava_no_deps/Foo.java | 0 .../java_test_broken_test/BUCK.fixture | 0 .../java_test_broken_test/SimpleTest.java | 0 .../hamcrest-core-1.3.jar | Bin .../hamcrest-library-1.3.jar | Bin .../java_test_broken_test/junit-4.11.jar | Bin .../java_test_get_class_names/case1.jar | Bin .../java_test_get_class_names/case2.jar | Bin .../java_test_get_class_names/case2fail.jar | Bin .../java_test_get_class_names/default.jar | Bin .../BUCK.fixture | 0 .../SimpleTest.java | 0 .../hamcrest-core-1.3.jar | Bin .../hamcrest-library-1.3.jar | Bin .../junit-4.11.jar | Bin .../java/testdata/missing_test_deps/A.java | 0 .../testdata/missing_test_deps/BUCK.fixture | 0 .../testdata/missing_test_deps/hamcrest.jar | Bin .../java/testdata/missing_test_deps/junit.jar | Bin .../testdata/missing_test_deps/testng.jar | Bin .../java/testdata/prebuilt/BUCK.fixture | 0 .../java/testdata/prebuilt/junit.jar | Bin .../java/testdata/provided_deps/BUCK.fixture | 0 .../java/testdata/provided_deps/Example.java | 0 .../java/testdata/provided_deps/guava.jar | Bin .../java/testdata/provided_deps/junit.jar | Bin .../BUCK.fixture | 0 .../LibClass.java | 0 .../ResClass.java | 0 .../ResClass.java.new | 0 .../java/testdata/resources_root/.buckconfig | 0 .../java/com/example/BUCK.fixture | 0 .../java/com/example/SupWorld.java | 0 .../com/example/res/com/another/supworld.txt | 0 .../BUCK.fixture | 0 .../SeriousBusiness.java | 0 .../Util.java | 0 .../java/testdata/slow_tests/BUCK.fixture | 0 .../java/testdata/slow_tests/SlowTest.java | 0 .../testdata/slow_tests/SpinningTest.java | 0 .../testdata/slow_tests/hamcrest-core-1.3.jar | Bin .../slow_tests/hamcrest-library-1.3.jar | Bin .../java/testdata/slow_tests/junit-4.11.jar | Bin .../{ => jvm}/java/testdata/sourcepath/A.java | 0 .../{ => jvm}/java/testdata/sourcepath/B.java | 0 .../java/testdata/sourcepath/BUCK.fixture | 0 .../java/testdata/src_zip/BUCK.fixture | 0 .../{ => jvm}/java/testdata/src_zip/Yin.java | 0 .../{ => jvm}/java/testdata/src_zip/Zip.java | 0 .../static_initialization_test/BUCK.fixture | 0 .../StaticErrorTest.java | 0 .../hamcrest-core-1.3.jar | Bin .../hamcrest-library-1.3.jar | Bin .../static_initialization_test/junit-4.11.jar | Bin .../java/testdata/symbol_finder/.buckconfig | 0 .../symbol_finder/java/com/example/a/A.java | 0 .../java/com/example/a/BUCK.fixture | 0 .../symbol_finder/java/com/example/b/B.java | 0 .../java/com/example/b/BUCK.fixture | 0 .../java/com/example/b/MoreB.java | 0 .../java/testdata/test_with_jni/.buckconfig | 0 .../java/testdata/test_with_jni/BUCK.fixture | 0 .../java/testdata/test_with_jni/JLib.java | 0 .../java/testdata/test_with_jni/JTest.java | 0 .../test_with_jni/hamcrest-core-1.3.jar | Bin .../java/testdata/test_with_jni/jlib.c | 0 .../testdata/test_with_jni/junit-4.11.jar | Bin .../testdata/warn_on_transitive/BUCK.fixture | 0 .../java/testdata/warn_on_transitive/Bar.java | 0 .../testdata/warn_on_transitive/Blargh.java | 0 .../java/testdata/warn_on_transitive/Foo.java | 0 .../java/testdata/warn_on_transitive/Meh.java | 0 .../java/testdata/warn_on_transitive/Raz.java | 0 .../wont_delete/java/com/example/BUCK.fixture | 0 .../java/com/example/data/acceptance.dmp | 0 .../java/com/example/data/looping.data | 0 .../facebook/buck/{ => jvm}/java/tracing/BUCK | 6 +-- .../java/tracing/JavacPhaseEventTest.java | 2 +- .../TracingTaskListenerCleanerTest.java | 2 +- .../TranslatingJavacPhaseTracerTest.java | 2 +- test/com/facebook/buck/maven/BUCK | 6 +-- .../buck/maven/PomIntegrationTest.java | 4 +- .../buck/maven/ResolverIntegrationTest.java | 2 +- test/com/facebook/buck/model/BUCK | 4 +- test/com/facebook/buck/parser/BUCK | 8 ++-- .../FlavoredTargetsParserIntegrationTest.java | 2 +- test/com/facebook/buck/parser/ParserTest.java | 2 +- test/com/facebook/buck/python/BUCK | 4 +- test/com/facebook/buck/rules/BUCK | 16 ++++---- .../facebook/buck/rules/BuildContextTest.java | 2 +- .../buck/rules/BuildRuleResolverTest.java | 2 +- .../buck/rules/CachingBuildEngineTest.java | 4 +- .../facebook/buck/rules/FakeBuildContext.java | 4 +- .../buck/rules/KnownBuildRuleTypesTest.java | 10 ++--- .../buck/rules/ProjectConfigTest.java | 2 +- test/com/facebook/buck/rules/RuleKeyTest.java | 2 +- .../buck/rules/TargetGraphHashingTest.java | 2 +- .../facebook/buck/rules/TargetGraphTest.java | 2 +- test/com/facebook/buck/rules/keys/BUCK | 2 +- test/com/facebook/buck/rules/macros/BUCK | 2 +- .../macros/ClasspathMacroExpanderTest.java | 2 +- .../macros/ExecutableMacroExpanderTest.java | 4 +- .../macros/LocationMacroExpanderTest.java | 4 +- test/com/facebook/buck/shell/BUCK | 10 ++--- .../facebook/buck/shell/ExportFileTest.java | 2 +- .../buck/shell/GenruleDescriptionTest.java | 2 +- test/com/facebook/buck/shell/GenruleTest.java | 6 +-- test/com/facebook/buck/step/BUCK | 2 +- .../buck/step/TestExecutionContext.java | 2 +- test/com/facebook/buck/thrift/BUCK | 8 ++-- .../buck/thrift/ThriftJavaEnhancerTest.java | 4 +- .../facebook/buck/util/LicenseCheckTest.java | 2 +- third-party/java/eclipse/BUCK | 2 +- third-party/java/jackson/BUCK | 4 +- third-party/java/jacoco/BUCK | 2 +- third-party/java/jdk/BUCK | 8 ++-- 752 files changed, 868 insertions(+), 751 deletions(-) rename src/com/facebook/buck/{ => jvm}/java/AbstractJavacOptions.java (99%) rename src/com/facebook/buck/{ => jvm}/java/AbstractJavacVersion.java (96%) rename src/com/facebook/buck/{ => jvm}/java/AccumulateClassNamesStep.java (96%) rename src/com/facebook/buck/{ => jvm}/java/AnnotationProcessingEvent.java (99%) rename src/com/facebook/buck/{ => jvm}/java/AnnotationProcessingParams.java (99%) rename src/com/facebook/buck/{ => jvm}/java/BUCK (87%) rename src/com/facebook/buck/{ => jvm}/java/BuildsAnnotationProcessor.java (96%) rename src/com/facebook/buck/{ => jvm}/java/BuiltInJavac.java (84%) rename src/com/facebook/buck/{ => jvm}/java/CalculateAbi.java (98%) rename src/com/facebook/buck/{ => jvm}/java/CalculateAbiStep.java (97%) rename src/com/facebook/buck/{ => jvm}/java/Classpaths.java (98%) rename src/com/facebook/buck/{ => jvm}/java/CopyResourcesStep.java (99%) rename src/com/facebook/buck/{ => jvm}/java/DefaultJavaLibrary.java (99%) rename src/com/facebook/buck/{ => jvm}/java/DefaultJavaPackageFinder.java (99%) rename src/com/facebook/buck/{ => jvm}/java/DiagnosticPrettyPrinter.java (99%) rename src/com/facebook/buck/{ => jvm}/java/ExternalJavac.java (99%) rename src/com/facebook/buck/{ => jvm}/java/FatJar.java (88%) rename src/com/facebook/buck/{ => jvm}/java/FatJarMain.java (96%) rename src/com/facebook/buck/{ => jvm}/java/GenerateCodeCoverageReportStep.java (99%) rename src/com/facebook/buck/{ => jvm}/java/GwtModule.java (98%) rename src/com/facebook/buck/{ => jvm}/java/HasClasspathEntries.java (97%) rename src/com/facebook/buck/{ => jvm}/java/HasJavaAbi.java (96%) rename src/com/facebook/buck/{ => jvm}/java/HasJavaClassHashes.java (96%) rename src/com/facebook/buck/{ => jvm}/java/HasMavenCoordinates.java (97%) rename src/com/facebook/buck/{ => jvm}/java/HasSources.java (95%) rename src/com/facebook/buck/{ => jvm}/java/JUnitStep.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JarBackedJavac.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JarDirectoryStep.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JarDirectoryStepHelper.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JarFattener.java (89%) rename src/com/facebook/buck/{ => jvm}/java/JavaBinary.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavaBinaryDescription.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavaBuckConfig.java (98%) rename src/com/facebook/buck/{ => jvm}/java/JavaFileParser.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavaLibrary.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavaLibraryClasspathProvider.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavaLibraryDescription.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavaLibraryRules.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavaNativeLinkable.java (97%) rename src/com/facebook/buck/{ => jvm}/java/JavaPackageFinder.java (97%) rename src/com/facebook/buck/{ => jvm}/java/JavaSourceJar.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavaSymbolFinder.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavaTest.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavaTestDescription.java (99%) rename src/com/facebook/buck/{ => jvm}/java/Javac.java (98%) rename src/com/facebook/buck/{ => jvm}/java/JavacErrorParser.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JavacStep.java (98%) rename src/com/facebook/buck/{ => jvm}/java/JavacToJarStepFactory.java (99%) rename src/com/facebook/buck/{ => jvm}/java/JdkProvidedInMemoryJavac.java (98%) rename src/com/facebook/buck/{ => jvm}/java/Jsr199Javac.java (98%) rename src/com/facebook/buck/{ => jvm}/java/Keystore.java (98%) rename src/com/facebook/buck/{ => jvm}/java/KeystoreDescription.java (98%) rename src/com/facebook/buck/{ => jvm}/java/MavenPublishable.java (96%) rename src/com/facebook/buck/{ => jvm}/java/MavenUberJar.java (99%) rename src/com/facebook/buck/{ => jvm}/java/PrebuiltJar.java (99%) rename src/com/facebook/buck/{ => jvm}/java/PrebuiltJarDescription.java (99%) rename src/com/facebook/buck/{ => jvm}/java/ResourcesRootPackageFinder.java (98%) rename src/com/facebook/buck/{ => jvm}/java/SrcRootsFinder.java (98%) rename src/com/facebook/buck/{ => jvm}/java/TestType.java (94%) rename src/com/facebook/buck/{ => jvm}/java/TracingProcessorWrapper.java (99%) rename src/com/facebook/buck/{ => jvm}/java/ZipEntryJavaFileObject.java (98%) rename src/com/facebook/buck/{ => jvm}/java/abi/AbiWriterProtocol.java (92%) rename src/com/facebook/buck/{ => jvm}/java/abi/AnnotationMirror.java (98%) rename src/com/facebook/buck/{ => jvm}/java/abi/AnnotationValueMirror.java (99%) rename src/com/facebook/buck/{ => jvm}/java/abi/ApiStubber.java (96%) rename src/com/facebook/buck/{ => jvm}/java/abi/BUCK (76%) rename src/com/facebook/buck/{ => jvm}/java/abi/ClassMirror.java (99%) rename src/com/facebook/buck/{ => jvm}/java/abi/DirectoryWalker.java (98%) rename src/com/facebook/buck/{ => jvm}/java/abi/EnumMirror.java (95%) rename src/com/facebook/buck/{ => jvm}/java/abi/FieldMirror.java (96%) rename src/com/facebook/buck/{ => jvm}/java/abi/FileAction.java (95%) rename src/com/facebook/buck/{ => jvm}/java/abi/MethodMirror.java (99%) rename src/com/facebook/buck/{ => jvm}/java/abi/StubJar.java (98%) rename src/com/facebook/buck/{ => jvm}/java/abi/Walker.java (94%) rename src/com/facebook/buck/{ => jvm}/java/abi/Walkers.java (96%) rename src/com/facebook/buck/{ => jvm}/java/abi/ZipWalker.java (98%) rename src/com/facebook/buck/{ => jvm}/java/classes/AbstractFileLike.java (94%) rename src/com/facebook/buck/{ => jvm}/java/classes/BUCK (83%) rename src/com/facebook/buck/{ => jvm}/java/classes/ClasspathTraversal.java (99%) rename src/com/facebook/buck/{ => jvm}/java/classes/ClasspathTraverser.java (94%) rename src/com/facebook/buck/{ => jvm}/java/classes/DefaultClasspathTraverser.java (95%) rename src/com/facebook/buck/{ => jvm}/java/classes/FileLike.java (97%) rename src/com/facebook/buck/{ => jvm}/java/classes/FileLikeCharSource.java (96%) rename src/com/facebook/buck/{ => jvm}/java/classes/FileLikes.java (96%) rename src/com/facebook/buck/{ => jvm}/java/coverage/BUCK (74%) rename src/com/facebook/buck/{ => jvm}/java/coverage/ReportGenerator.java (99%) rename src/com/facebook/buck/{ => jvm}/java/intellij/AbstractIjFolder.java (98%) rename src/com/facebook/buck/{ => jvm}/java/intellij/AbstractIjLibrary.java (98%) rename src/com/facebook/buck/{ => jvm}/java/intellij/AbstractIjModule.java (99%) rename src/com/facebook/buck/{ => jvm}/java/intellij/AbstractIjModuleAndroidFacet.java (97%) rename src/com/facebook/buck/{ => jvm}/java/intellij/BUCK (83%) rename src/com/facebook/buck/{ => jvm}/java/intellij/CompilerXml.java (98%) rename src/com/facebook/buck/{ => jvm}/java/intellij/DefaultIjLibraryFactory.java (98%) rename src/com/facebook/buck/{ => jvm}/java/intellij/ExportedDepsClosureResolver.java (96%) rename src/com/facebook/buck/{ => jvm}/java/intellij/IjDependencyListBuilder.java (99%) rename src/com/facebook/buck/{ => jvm}/java/intellij/IjLibraryFactory.java (96%) rename src/com/facebook/buck/{ => jvm}/java/intellij/IjModuleFactory.java (99%) rename src/com/facebook/buck/{ => jvm}/java/intellij/IjModuleGraph.java (99%) rename src/com/facebook/buck/{ => jvm}/java/intellij/IjProject.java (96%) rename src/com/facebook/buck/{ => jvm}/java/intellij/IjProjectElement.java (96%) rename src/com/facebook/buck/{ => jvm}/java/intellij/IjProjectTemplateDataPreparer.java (99%) rename src/com/facebook/buck/{ => jvm}/java/intellij/IjProjectWriter.java (99%) rename src/com/facebook/buck/{ => jvm}/java/intellij/IntellijConfig.java (97%) rename src/com/facebook/buck/{ => jvm}/java/intellij/ParsingJavaPackageFinder.java (96%) rename src/com/facebook/buck/{ => jvm}/java/intellij/Project.java (98%) rename src/com/facebook/buck/{ => jvm}/java/intellij/SerializableAndroidAar.java (97%) rename src/com/facebook/buck/{ => jvm}/java/intellij/SerializableDependentModule.java (99%) rename src/com/facebook/buck/{ => jvm}/java/intellij/SerializableIntellijSettings.java (97%) rename src/com/facebook/buck/{ => jvm}/java/intellij/SerializableModule.java (99%) rename src/com/facebook/buck/{ => jvm}/java/intellij/Util.java (96%) rename src/com/facebook/buck/{ => jvm}/java/intellij/ij-library.st (100%) rename src/com/facebook/buck/{ => jvm}/java/intellij/ij-module-index.st (100%) rename src/com/facebook/buck/{ => jvm}/java/intellij/ij-module.st (100%) rename src/com/facebook/buck/{ => jvm}/java/runner/BUCK (53%) rename src/com/facebook/buck/{ => jvm}/java/runner/FileClassPathRunner.java (90%) rename src/com/facebook/buck/{ => jvm}/java/tracing/BUCK (72%) rename src/com/facebook/buck/{ => jvm}/java/tracing/JavacPhaseEvent.java (98%) rename src/com/facebook/buck/{ => jvm}/java/tracing/JavacPhaseEventLogger.java (99%) rename src/com/facebook/buck/{ => jvm}/java/tracing/JavacPhaseTracer.java (78%) rename src/com/facebook/buck/{ => jvm}/java/tracing/TracingTaskListener.java (95%) rename src/com/facebook/buck/{ => jvm}/java/tracing/TranslatingJavacPhaseTracer.java (98%) create mode 100644 src/com/facebook/buck/util/exportedfiles/BUCK create mode 100644 src/com/facebook/buck/util/exportedfiles/Nullable.java create mode 100644 src/com/facebook/buck/util/exportedfiles/Preconditions.java rename test/com/facebook/buck/{ => jvm}/java/AccumulateClassNamesStepTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/AnnotationProcessingEventTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/AnnotationProcessingParamsTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/BUCK (85%) rename test/com/facebook/buck/{ => jvm}/java/BuildTargetSourcePathAsSrcIntegrationTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/CachedTestIntegrationTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/CachedTestRunReportingIntegrationTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/CalculateAbiStepTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/CalculateAbiTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/CleanClasspathIntegrationTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/CompileSrcZipIntegrationTest.java (97%) rename test/com/facebook/buck/{ => jvm}/java/CopyResourcesStepIntegrationTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/CopyResourcesStepMustCorrectlyParseFilepathIntegrationTest.java (97%) rename test/com/facebook/buck/{ => jvm}/java/CopyResourcesStepTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/DefaultJavaLibraryIntegrationTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/DefaultJavaLibraryTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/DiagnosticPrettyPrinterTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/EmptyTestIntegrationTest.java (97%) rename test/com/facebook/buck/{ => jvm}/java/ExternalJavacEscaperTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/ExternalJavacIntegrationTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/ExternalJavacTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/FakeJavaLibrary.java (99%) rename test/com/facebook/buck/{ => jvm}/java/FakeJavaPackageFinder.java (96%) rename test/com/facebook/buck/{ => jvm}/java/GenerateCodeCoverageReportStepTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/GenruleDepsIntegrationTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/JUnitStepTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/JarDirectoryStepTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/JavaBinaryDescriptionTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/JavaBinaryIntegrationTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/JavaBinaryRuleBuilder.java (92%) rename test/com/facebook/buck/{ => jvm}/java/JavaBinaryTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/JavaBuckConfigTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/JavaCompilationConstants.java (96%) rename test/com/facebook/buck/{ => jvm}/java/JavaFileParserTest.java (96%) rename test/com/facebook/buck/{ => jvm}/java/JavaLibraryBuilder.java (96%) rename test/com/facebook/buck/{ => jvm}/java/JavaLibraryDescriptionTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/JavaSourceJarTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/JavaSymbolFinderIntegrationTest.java (97%) rename test/com/facebook/buck/{ => jvm}/java/JavaTestBuilder.java (94%) rename test/com/facebook/buck/{ => jvm}/java/JavaTestDescriptionTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/JavaTestGetClassNamesIntegrationTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/JavaTestIntegrationTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/JavaTestRuleTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/JavacErrorParserTest.java (93%) rename test/com/facebook/buck/{ => jvm}/java/JavacOptionsTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/JavacStepTest.java (97%) rename test/com/facebook/buck/{ => jvm}/java/Jsr199JavacIntegrationTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/Jsr199JavacTest.java (95%) rename test/com/facebook/buck/{ => jvm}/java/KeystoreBuilder.java (97%) rename test/com/facebook/buck/{ => jvm}/java/KeystoreTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/MissingSymbolsHandlerIntegrationTest.java (97%) rename test/com/facebook/buck/{ => jvm}/java/PrebuiltJarBuilder.java (97%) rename test/com/facebook/buck/{ => jvm}/java/PrebuiltJarIntegrationTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/PrebuiltJarTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/ResourcesRootIntegrationTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/SrcRootsFinderIntegrationTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/abi/AbiClass.java (98%) rename test/com/facebook/buck/{ => jvm}/java/abi/BUCK (87%) rename test/com/facebook/buck/{ => jvm}/java/abi/MirrorTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/abi/StubJarIntegrationTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/abi/testdata/sample/android.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/abi/testdata/sample/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/abi/testdata/sample/unity.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/classes/BUCK (77%) rename test/com/facebook/buck/{ => jvm}/java/classes/ClasspathTraversalTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/classes/FileLikesTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/intellij/BUCK (79%) rename test/com/facebook/buck/{ => jvm}/java/intellij/DefaultIjLibraryFactoryTest.java (96%) rename test/com/facebook/buck/{ => jvm}/java/intellij/IjFolderTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/intellij/IjModuleFactoryTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/intellij/IjModuleGraphTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/intellij/IjModuleTest.java (94%) rename test/com/facebook/buck/{ => jvm}/java/intellij/IjProjectDataPreparerTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/intellij/ParsingJavaPackageFinderTest.java (95%) rename test/com/facebook/buck/{ => jvm}/java/intellij/ProjectIntegrationTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/intellij/ProjectTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/app.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/keystore/debug.keystore (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/keystore/debug.keystore.properties (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/AndroidManifest.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/assets/app_asset_index.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/java/com/example/MyActivity.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-hdpi/ic_launcher.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-ldpi/ic_launcher.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-mdpi/ic_launcher.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-xhdpi/ic_launcher.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/layout/main.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/values/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libA/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libA/libA.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/AndroidManifest.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/assets/libA_asset_index.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/java/com/example/ActivityA.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/res/layout/main.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/res/values/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libB/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libB/libB.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/AndroidManifest.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/java/com/example/ActivityB.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/res/layout/main.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/res/values/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/lib/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/lib/junit-4.11.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/src/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/test/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/test/module_test.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_generated.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_guava.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_jsr305.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_junit.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/.idea/libraries/library_modules_dep1_generated.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/.idea/modules/modules_dep1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/.idea/modules/modules_tip.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/.idea/modules/project_root.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/libs/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/libs/guava.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/libs/jsr305.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/libs/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/modules/dep1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/modules/dep1/src/Foo.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project1/modules/tip/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project_slice/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project_slice/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project_slice/.idea/modules/modules_dep1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project_slice/.idea/modules/modules_dep2.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project_slice/.idea/modules/project_root.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project_slice/modules/dep1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project_slice/modules/dep1/src/Foo.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project_slice/modules/dep2/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/experimental_project_slice/modules/dep2/src/Foo.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/libs/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/libs/guava.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/libs/jsr305.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/libs/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/modules/dep1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/modules/dep1/module_modules_dep1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/modules/dep1/src/Foo.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/modules/tip/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/modules/tip/module_modules_tip.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project1/root.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/libs/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/libs/guava.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/libs/jsr305.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/libs/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/modules/dep1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/modules/dep1/ignore/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/modules/dep1/module_modules_dep1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/modules/dep1/src/Foo.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/modules/tip/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/modules/tip/module_modules_tip.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project2/root.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/apps/myapp/AndroidManifest.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/apps/myapp/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/apps/myapp/app.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/apps/myapp/debug.keystore (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/apps/myapp/debug.keystore.properties (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/java/com/example/activity/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/java/com/example/activity/MyFirstActivity.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/java/com/example/activity/module_java_com_example_activity.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/res/AndroidManifest.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/res/com/example/activity/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/res/com/example/activity/module_res_com_example_activity.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/res/com/example/activity/res/layout/main.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_001/res/com/example/activity/res/values/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/apps/myapp/AndroidManifest.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/apps/myapp/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/apps/myapp/debug.keystore (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/apps/myapp/debug.keystore.properties (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/java/com/example/activity/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/java/com/example/activity/MyFirstActivity.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/res/AndroidManifest.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/res/com/example/activity/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/res/com/example/activity/res/layout/main.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_r_002/res/com/example/activity/res/values/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/libs/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/libs/guava.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/libs/jsr305.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/libs/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/module_.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/modules/dep1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/modules/dep1/dep2/world.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/modules/dep1/module_modules_dep1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/modules/tip/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice/tests/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_project_in_different_buck_file/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_project_in_different_buck_file/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_project_in_different_buck_file/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_project_in_different_buck_file/module_.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/dep1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/module_modules_dep1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/libs/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/libs/guava.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/libs/jsr305.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/libs/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/modules/dep1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/modules/dep1/module_modules_dep1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/modules/tip/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/modules/tip/module_modules_tip.iml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/tests/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests/tests/module_tests.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep1/module_modules_dep1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep2/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep2/module_modules_dep2.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/tests/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/tests/module_tests.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/modules/dep1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/modules/dep1/module_modules_dep1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/module_tests_test1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/test1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/.idea/compiler.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/.idea/runConfigurations/Debug_Buck_test.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/apps/sample/AndroidManifest.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/apps/sample/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/apps/sample/module_apps_sample.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample2.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample3.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/module_java_com_sample_lib.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/keystores/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/keystores/debug.keystore (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/keystores/debug.keystore.properties (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/assets/asset_file.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/module_res_com_sample_asset_only.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/base/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/base/buck-assets/hilarity.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/base/module_res_com_sample_base.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-hdpi/app_icon.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-mdpi/app_icon.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-xhdpi/app_icon.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/values-fr/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/values/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/title/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/title/module_res_com_sample_title.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/title/res/values/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/top/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/top/module_res_com_sample_top.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_black.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_something.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_white.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/layout/top_layout.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/compiler.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/runConfigurations/Debug_Buck_test.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/AndroidManifest.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/module_apps_sample.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample2.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample3.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/module_java_com_sample_lib.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/debug.keystore (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/debug.keystore.properties (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/assets/asset_file.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/module_res_com_sample_asset_only.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/buck-assets/hilarity.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/module_res_com_sample_base.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-hdpi/app_icon.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-mdpi/app_icon.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-xhdpi/app_icon.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/values-fr/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/values/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/module_res_com_sample_title.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/res/values/strings.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/module_res_com_sample_top.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_black.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_something.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_white.png (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/layout/top_layout.xml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/.idea/modules.xml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/libs/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/libs/guava.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/libs/jsr305.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/libs/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/module_modules_dep1.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/src/Foo.java (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/modules/tip/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/modules/tip/module_modules_tip.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/root.iml (100%) rename test/com/facebook/buck/{ => jvm}/java/intellij/testdata/project_with_root_iml_already_present/root.iml.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/runner/BUCK (73%) rename test/com/facebook/buck/{ => jvm}/java/runner/FileClassPathRunnerTest.java (99%) rename test/com/facebook/buck/{ => jvm}/java/testdata/abi/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/abi/.gitignore (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/abi/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/abi/buck-out/bin/.no_srcs/metadata/ABI_KEY.expected (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/build_rule_source_path_as_src_test/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/build_rule_source_path_as_src_test/LameGenfile.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/build_rule_source_path_as_src_test/LameTest.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/build_rule_source_path_as_src_test/hamcrest-core-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/build_rule_source_path_as_src_test/hamcrest-library-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/build_rule_source_path_as_src_test/junit-4.11.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/build_rule_source_path_as_src_test/resource.base.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/cached_test/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/cached_test/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/cached_test/LameTest.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/cached_test/hamcrest-core-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/cached_test/hamcrest-library-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/cached_test/junit-4.11.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/classpath_corruption_regression/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/classpath_corruption_regression/Bar.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/classpath_corruption_regression/Foo.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/deadlock/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/deadlock/AllTests.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/deadlock/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/deadlock/Junit4BlockTest.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/deadlock/hamcrest.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/deadlock/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/empty_test/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/export_directory_entries/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/export_directory_entries/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/export_directory_entries/some_directory/swag.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/export_directory_entries/some_directory/yolo.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac/check_env.sh (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac/error.sh (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac/java/com/example/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac/java/com/example/Example.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac/javac.sh (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac_src_zip/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac_src_zip/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac_src_zip/Yin.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac_src_zip/Zip.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/external_javac_src_zip/javac.sh (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/fat_jar/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/fat_jar/Dep.cpp (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/fat_jar/Dep.h (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/fat_jar/Lib.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/fat_jar/LibExitCode.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/fat_jar/LibOutput.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/fat_jar/Native.cpp (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/fat_jar/print_lib_path.py (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/generated_resources/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/generated_resources/java/com/example/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/generated_resources/java/com/example/HelloWorld.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/generated_resources/java/com/example/res/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/genrule_test/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/genrule_test/LameTest.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/genrule_test/LibraryClass.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/genrule_test/hamcrest-core-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/genrule_test/hamcrest-library-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/genrule_test/junit-4.11.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/genrule_test/resource.base.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/guava_no_deps/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/guava_no_deps/Bar.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/guava_no_deps/Foo.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_broken_test/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_broken_test/SimpleTest.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_broken_test/hamcrest-core-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_broken_test/hamcrest-library-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_broken_test/junit-4.11.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_get_class_names/case1.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_get_class_names/case2.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_get_class_names/case2fail.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_get_class_names/default.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_missing_result_file/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_missing_result_file/SimpleTest.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_missing_result_file/hamcrest-core-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_missing_result_file/hamcrest-library-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/java_test_missing_result_file/junit-4.11.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/missing_test_deps/A.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/missing_test_deps/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/missing_test_deps/hamcrest.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/missing_test_deps/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/missing_test_deps/testng.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/prebuilt/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/prebuilt/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/provided_deps/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/provided_deps/Example.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/provided_deps/guava.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/provided_deps/junit.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/resource_change_causes_repack/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/resource_change_causes_repack/LibClass.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/resource_change_causes_repack/ResClass.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/resource_change_causes_repack/ResClass.java.new (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/resources_root/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/resources_root/java/com/example/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/resources_root/java/com/example/SupWorld.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/resources_root/java/com/example/res/com/another/supworld.txt (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/rulekey_changed_while_abi_stable/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/rulekey_changed_while_abi_stable/SeriousBusiness.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/rulekey_changed_while_abi_stable/Util.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/slow_tests/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/slow_tests/SlowTest.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/slow_tests/SpinningTest.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/slow_tests/hamcrest-core-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/slow_tests/hamcrest-library-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/slow_tests/junit-4.11.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/sourcepath/A.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/sourcepath/B.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/sourcepath/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/src_zip/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/src_zip/Yin.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/src_zip/Zip.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/static_initialization_test/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/static_initialization_test/StaticErrorTest.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/static_initialization_test/hamcrest-core-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/static_initialization_test/hamcrest-library-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/static_initialization_test/junit-4.11.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/symbol_finder/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/symbol_finder/java/com/example/a/A.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/symbol_finder/java/com/example/a/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/symbol_finder/java/com/example/b/B.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/symbol_finder/java/com/example/b/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/symbol_finder/java/com/example/b/MoreB.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/test_with_jni/.buckconfig (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/test_with_jni/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/test_with_jni/JLib.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/test_with_jni/JTest.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/test_with_jni/hamcrest-core-1.3.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/test_with_jni/jlib.c (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/test_with_jni/junit-4.11.jar (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/warn_on_transitive/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/warn_on_transitive/Bar.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/warn_on_transitive/Blargh.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/warn_on_transitive/Foo.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/warn_on_transitive/Meh.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/warn_on_transitive/Raz.java (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/wont_delete/java/com/example/BUCK.fixture (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/wont_delete/java/com/example/data/acceptance.dmp (100%) rename test/com/facebook/buck/{ => jvm}/java/testdata/wont_delete/java/com/example/data/looping.data (100%) rename test/com/facebook/buck/{ => jvm}/java/tracing/BUCK (71%) rename test/com/facebook/buck/{ => jvm}/java/tracing/JavacPhaseEventTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/tracing/TracingTaskListenerCleanerTest.java (98%) rename test/com/facebook/buck/{ => jvm}/java/tracing/TranslatingJavacPhaseTracerTest.java (99%) diff --git a/build.xml b/build.xml index f143f44a5d1..f56d30b8a87 100644 --- a/build.xml +++ b/build.xml @@ -14,7 +14,7 @@ - + @@ -180,7 +180,7 @@ + + @@ -249,6 +251,8 @@ + + @@ -258,7 +262,7 @@ - + @@ -536,10 +540,10 @@ - + - + @@ -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. --> - + @@ -667,11 +671,11 @@ - + - + @@ -705,7 +709,7 @@ - + diff --git a/programs/BUCK b/programs/BUCK index 778646b162e..5fe23b30c40 100644 --- 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 index 1163a9cd9a9..d212a4a37b4 100644 --- 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 index 3fa6edda0c2..0458224a908 100644 --- 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 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 getJavaLibrariesToDex(); /** - * See {@link com.facebook.buck.java.JavaLibrary#getClassNamesToHashes()} + * See {@link com.facebook.buck.jvm.java.JavaLibrary#getClassNamesToHashes()} */ Supplier> getClassNamesToHashesSupplier(); } diff --git a/src/com/facebook/buck/android/AndroidAar.java b/src/com/facebook/buck/android/AndroidAar.java index 0665d6a9a9b..d72edaa9dc9 100644 --- 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 index eee68336085..7951b0a0787 100644 --- 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 index 3cbd2e4da6c..89fb5eb8de6 100644 --- 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 index c63ba671d9a..7b1eb5bbcef 100644 --- 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 index 8ced277900d..384883a1baf 100644 --- 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 index f485d36c481..ffc92f79eff 100644 --- 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 index 708c6142688..7f4ea4bd054 100644 --- 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 index 2031dbf6694..e009aa520c2 100644 --- 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 index a97c4c6d91a..05e55c37e7c 100644 --- 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 index cd950c9ad2f..d2dfe46a72c 100644 --- 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 index db30e30c30b..bbe97ff89a7 100644 --- 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 index e9dd53b410a..c339ba8346f 100644 --- 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 index bd45cf3968e..dc520a1bc00 100644 --- 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 index df2c813ca0d..c84ca138c6e 100644 --- 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 index b4232359f9e..8973a72810b 100644 --- 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 index ceea9b39beb..0cb45b0c894 100644 --- 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 index d5841b11546..2713f517a89 100644 --- 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 index be3202b70b4..c708db10100 100644 --- 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; diff --git a/src/com/facebook/buck/android/DummyRDotJava.java b/src/com/facebook/buck/android/DummyRDotJava.java index 6f6a27d5380..22248d3f8d7 100644 --- a/src/com/facebook/buck/android/DummyRDotJava.java +++ b/src/com/facebook/buck/android/DummyRDotJava.java @@ -16,10 +16,10 @@ package com.facebook.buck.android; -import com.facebook.buck.java.CalculateAbiStep; -import com.facebook.buck.java.HasJavaAbi; -import com.facebook.buck.java.JavacOptions; -import com.facebook.buck.java.JavacStep; +import com.facebook.buck.jvm.java.CalculateAbiStep; +import com.facebook.buck.jvm.java.HasJavaAbi; +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.model.HasBuildTarget; diff --git a/src/com/facebook/buck/android/GenAidl.java b/src/com/facebook/buck/android/GenAidl.java index 6dccfefb8c8..613be2c7af9 100644 --- a/src/com/facebook/buck/android/GenAidl.java +++ b/src/com/facebook/buck/android/GenAidl.java @@ -16,11 +16,11 @@ package com.facebook.buck.android; -import static com.facebook.buck.java.Javac.SRC_ZIP; +import static com.facebook.buck.jvm.java.Javac.SRC_ZIP; import static com.facebook.buck.rules.BuildableProperties.Kind.ANDROID; import com.facebook.buck.event.ConsoleEvent; -import com.facebook.buck.java.JarDirectoryStep; +import com.facebook.buck.jvm.java.JarDirectoryStep; 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/HashInputJarsToDexStep.java b/src/com/facebook/buck/android/HashInputJarsToDexStep.java index ba185b6b5ce..0eec5f59c0c 100644 --- a/src/com/facebook/buck/android/HashInputJarsToDexStep.java +++ b/src/com/facebook/buck/android/HashInputJarsToDexStep.java @@ -17,9 +17,9 @@ package com.facebook.buck.android; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.classes.ClasspathTraversal; -import com.facebook.buck.java.classes.DefaultClasspathTraverser; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.ClasspathTraversal; +import com.facebook.buck.jvm.java.classes.DefaultClasspathTraverser; +import com.facebook.buck.jvm.java.classes.FileLike; import com.facebook.buck.rules.Sha1HashCode; import com.facebook.buck.step.AbstractExecutionStep; import com.facebook.buck.step.ExecutionContext; diff --git a/src/com/facebook/buck/android/PreDexedFilesSorter.java b/src/com/facebook/buck/android/PreDexedFilesSorter.java index 7b3cd1d521a..2b4a96d6ed7 100644 --- a/src/com/facebook/buck/android/PreDexedFilesSorter.java +++ b/src/com/facebook/buck/android/PreDexedFilesSorter.java @@ -20,7 +20,7 @@ import com.facebook.buck.dalvik.CanaryFactory; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.FileLike; import com.facebook.buck.rules.BuildContext; import com.facebook.buck.rules.Sha1HashCode; import com.facebook.buck.step.AbstractExecutionStep; diff --git a/src/com/facebook/buck/android/RDotJava.java b/src/com/facebook/buck/android/RDotJava.java index 69a0d3179ec..08936ac8cc5 100644 --- a/src/com/facebook/buck/android/RDotJava.java +++ b/src/com/facebook/buck/android/RDotJava.java @@ -17,9 +17,9 @@ package com.facebook.buck.android; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.AnnotationProcessingParams; -import com.facebook.buck.java.JavacOptions; -import com.facebook.buck.java.JavacStep; +import com.facebook.buck.jvm.java.AnnotationProcessingParams; +import com.facebook.buck.jvm.java.JavacOptions; +import com.facebook.buck.jvm.java.JavacStep; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.SourcePathResolver; import com.facebook.buck.step.Step; diff --git a/src/com/facebook/buck/android/RobolectricTest.java b/src/com/facebook/buck/android/RobolectricTest.java index d3b98056978..63117988884 100644 --- a/src/com/facebook/buck/android/RobolectricTest.java +++ b/src/com/facebook/buck/android/RobolectricTest.java @@ -20,9 +20,9 @@ import static com.facebook.buck.rules.BuildableProperties.Kind.LIBRARY; import static com.facebook.buck.rules.BuildableProperties.Kind.TEST; -import com.facebook.buck.java.JavaTest; -import com.facebook.buck.java.JavacOptions; -import com.facebook.buck.java.TestType; +import com.facebook.buck.jvm.java.JavaTest; +import com.facebook.buck.jvm.java.JavacOptions; +import com.facebook.buck.jvm.java.TestType; import com.facebook.buck.log.Logger; import com.facebook.buck.rules.BuildRule; import com.facebook.buck.rules.BuildRuleParams; diff --git a/src/com/facebook/buck/android/RobolectricTestDescription.java b/src/com/facebook/buck/android/RobolectricTestDescription.java index 20bcbd25790..dee6d69f3c6 100644 --- a/src/com/facebook/buck/android/RobolectricTestDescription.java +++ b/src/com/facebook/buck/android/RobolectricTestDescription.java @@ -18,11 +18,11 @@ import com.facebook.buck.android.AndroidLibraryGraphEnhancer.ResourceDependencyMode; import com.facebook.buck.cxx.CxxPlatform; -import com.facebook.buck.java.AnnotationProcessingParams; -import com.facebook.buck.java.CalculateAbi; -import com.facebook.buck.java.JavaLibraryDescription; -import com.facebook.buck.java.JavaTestDescription; -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.JavaLibraryDescription; +import com.facebook.buck.jvm.java.JavaTestDescription; +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/UnsortedAndroidResourceDeps.java b/src/com/facebook/buck/android/UnsortedAndroidResourceDeps.java index 9664a4cc92a..6c66c072d05 100644 --- a/src/com/facebook/buck/android/UnsortedAndroidResourceDeps.java +++ b/src/com/facebook/buck/android/UnsortedAndroidResourceDeps.java @@ -17,8 +17,8 @@ package com.facebook.buck.android; import com.facebook.buck.graph.AbstractBreadthFirstTraversal; -import com.facebook.buck.java.JavaLibrary; -import com.facebook.buck.java.JavaTest; +import com.facebook.buck.jvm.java.JavaLibrary; +import com.facebook.buck.jvm.java.JavaTest; import com.facebook.buck.rules.BuildRule; import com.facebook.buck.rules.BuildRuleDependencyVisitors; import com.google.common.base.Optional; diff --git a/src/com/facebook/buck/android/UnzipAar.java b/src/com/facebook/buck/android/UnzipAar.java index cbff62d0800..94a1552a17f 100644 --- a/src/com/facebook/buck/android/UnzipAar.java +++ b/src/com/facebook/buck/android/UnzipAar.java @@ -17,7 +17,7 @@ package com.facebook.buck.android; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JarDirectoryStepHelper; +import com.facebook.buck.jvm.java.JarDirectoryStepHelper; 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/cli/AuditClasspathCommand.java b/src/com/facebook/buck/cli/AuditClasspathCommand.java index 4f32779d725..ac64fc08878 100644 --- a/src/com/facebook/buck/cli/AuditClasspathCommand.java +++ b/src/com/facebook/buck/cli/AuditClasspathCommand.java @@ -18,7 +18,7 @@ import com.facebook.buck.event.ConsoleEvent; import com.facebook.buck.graph.Dot; -import com.facebook.buck.java.HasClasspathEntries; +import com.facebook.buck.jvm.java.HasClasspathEntries; import com.facebook.buck.json.BuildFileParseException; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetException; diff --git a/src/com/facebook/buck/cli/BUCK b/src/com/facebook/buck/cli/BUCK index ceae64e0522..03c95ceae77 100644 --- a/src/com/facebook/buck/cli/BUCK +++ b/src/com/facebook/buck/cli/BUCK @@ -46,8 +46,8 @@ java_library( deps = [ '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:packagefinder', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:packagefinder', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:rule_pattern', @@ -73,9 +73,9 @@ java_library( '//src/com/facebook/buck/d:d', '//src/com/facebook/buck/go:go', '//src/com/facebook/buck/file:downloader', - '//src/com/facebook/buck/java:autodeps', - '//src/com/facebook/buck/java:config', - '//src/com/facebook/buck/java/intellij:intellij', + '//src/com/facebook/buck/jvm/java:autodeps', + '//src/com/facebook/buck/jvm/java:config', + '//src/com/facebook/buck/jvm/java/intellij:intellij', '//src/com/facebook/buck/js:js', '//src/com/facebook/buck/ocaml:rules', '//src/com/facebook/buck/parser:config', @@ -126,14 +126,14 @@ java_immutables_library( '//src/com/facebook/buck/io:io', '//src/com/facebook/buck/io:watchman', '//src/com/facebook/buck/js:js', - '//src/com/facebook/buck/java:autodeps', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:config', - '//src/com/facebook/buck/java:packagefinder', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:steps', - '//src/com/facebook/buck/java:support', - '//src/com/facebook/buck/java/intellij:intellij', + '//src/com/facebook/buck/jvm/java:autodeps', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:config', + '//src/com/facebook/buck/jvm/java:packagefinder', + '//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/intellij:intellij', '//src/com/facebook/buck/json:json', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/log:log', @@ -197,7 +197,7 @@ java_immutables_library( '//src/com/facebook/buck/event:event', '//test/com/facebook/buck/android:unit', '//test/com/facebook/buck/apple:apple', - '//test/com/facebook/buck/java:java', + '//test/com/facebook/buck/jvm/java:java', '//test/com/facebook/buck/cli/...', '//test/com/facebook/buck/parser:parser', '//test/com/facebook/buck/query:query', diff --git a/src/com/facebook/buck/cli/BuckConfig.java b/src/com/facebook/buck/cli/BuckConfig.java index 0d1157beab4..79d3c66a533 100644 --- a/src/com/facebook/buck/cli/BuckConfig.java +++ b/src/com/facebook/buck/cli/BuckConfig.java @@ -18,7 +18,7 @@ import com.facebook.buck.io.MorePaths; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.DefaultJavaPackageFinder; +import com.facebook.buck.jvm.java.DefaultJavaPackageFinder; import com.facebook.buck.log.Logger; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.Pair; diff --git a/src/com/facebook/buck/cli/CleanCommand.java b/src/com/facebook/buck/cli/CleanCommand.java index f7bcee98c83..25c217622f1 100644 --- a/src/com/facebook/buck/cli/CleanCommand.java +++ b/src/com/facebook/buck/cli/CleanCommand.java @@ -18,7 +18,7 @@ import com.facebook.buck.event.listener.JavaUtilsLoggingBuildListener; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.intellij.Project; +import com.facebook.buck.jvm.java.intellij.Project; import com.facebook.buck.util.BuckConstant; import org.kohsuke.args4j.Option; diff --git a/src/com/facebook/buck/cli/CommandRunnerParams.java b/src/com/facebook/buck/cli/CommandRunnerParams.java index 8282443f76b..078faaf9ab7 100644 --- a/src/com/facebook/buck/cli/CommandRunnerParams.java +++ b/src/com/facebook/buck/cli/CommandRunnerParams.java @@ -19,7 +19,7 @@ import com.facebook.buck.android.AndroidPlatformTarget; import com.facebook.buck.event.BuckEventBus; import com.facebook.buck.httpserver.WebServer; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.parser.Parser; import com.facebook.buck.artifact_cache.ArtifactCache; import com.facebook.buck.rules.Cell; diff --git a/src/com/facebook/buck/cli/Main.java b/src/com/facebook/buck/cli/Main.java index 07a4473c972..759dbec7e7b 100644 --- a/src/com/facebook/buck/cli/Main.java +++ b/src/com/facebook/buck/cli/Main.java @@ -40,8 +40,8 @@ import com.facebook.buck.io.ProjectFilesystem; import com.facebook.buck.io.TempDirectoryCreator; import com.facebook.buck.io.Watchman; -import com.facebook.buck.java.JavaBuckConfig; -import com.facebook.buck.java.JavacOptions; +import com.facebook.buck.jvm.java.JavaBuckConfig; +import com.facebook.buck.jvm.java.JavacOptions; import com.facebook.buck.log.CommandThreadAssociation; import com.facebook.buck.log.LogConfig; import com.facebook.buck.log.Logger; diff --git a/src/com/facebook/buck/cli/MissingSymbolsHandler.java b/src/com/facebook/buck/cli/MissingSymbolsHandler.java index 1aac785db84..c578cdb685c 100644 --- a/src/com/facebook/buck/cli/MissingSymbolsHandler.java +++ b/src/com/facebook/buck/cli/MissingSymbolsHandler.java @@ -21,9 +21,9 @@ import com.facebook.buck.event.MissingSymbolEvent; import com.facebook.buck.io.ExecutableFinder; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaSymbolFinder; -import com.facebook.buck.java.JavacOptions; -import com.facebook.buck.java.SrcRootsFinder; +import com.facebook.buck.jvm.java.JavaSymbolFinder; +import com.facebook.buck.jvm.java.JavacOptions; +import com.facebook.buck.jvm.java.SrcRootsFinder; import com.facebook.buck.json.DefaultProjectBuildFileParserFactory; import com.facebook.buck.json.ProjectBuildFileParserFactory; import com.facebook.buck.json.ProjectBuildFileParserOptions; diff --git a/src/com/facebook/buck/cli/ProjectCommand.java b/src/com/facebook/buck/cli/ProjectCommand.java index 79792d141c9..b0bb9ad0cf9 100644 --- a/src/com/facebook/buck/cli/ProjectCommand.java +++ b/src/com/facebook/buck/cli/ProjectCommand.java @@ -29,15 +29,15 @@ import com.facebook.buck.event.ConsoleEvent; import com.facebook.buck.event.ProjectGenerationEvent; import com.facebook.buck.io.ExecutableFinder; -import com.facebook.buck.java.JavaBuckConfig; -import com.facebook.buck.java.JavaFileParser; -import com.facebook.buck.java.JavaLibraryDescription; -import com.facebook.buck.java.JavaPackageFinder; -import com.facebook.buck.java.JavacOptions; -import com.facebook.buck.java.intellij.IjModuleGraph; -import com.facebook.buck.java.intellij.IjProject; -import com.facebook.buck.java.intellij.IntellijConfig; -import com.facebook.buck.java.intellij.Project; +import com.facebook.buck.jvm.java.JavaBuckConfig; +import com.facebook.buck.jvm.java.JavaFileParser; +import com.facebook.buck.jvm.java.JavaLibraryDescription; +import com.facebook.buck.jvm.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavacOptions; +import com.facebook.buck.jvm.java.intellij.IjModuleGraph; +import com.facebook.buck.jvm.java.intellij.IjProject; +import com.facebook.buck.jvm.java.intellij.IntellijConfig; +import com.facebook.buck.jvm.java.intellij.Project; import com.facebook.buck.json.BuildFileParseException; import com.facebook.buck.log.Logger; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/cli/PublishCommand.java b/src/com/facebook/buck/cli/PublishCommand.java index e70941c672a..3ceb3fcf424 100644 --- a/src/com/facebook/buck/cli/PublishCommand.java +++ b/src/com/facebook/buck/cli/PublishCommand.java @@ -17,8 +17,8 @@ package com.facebook.buck.cli; import com.facebook.buck.event.ConsoleEvent; -import com.facebook.buck.java.JavaLibrary; -import com.facebook.buck.java.MavenPublishable; +import com.facebook.buck.jvm.java.JavaLibrary; +import com.facebook.buck.jvm.java.MavenPublishable; import com.facebook.buck.maven.Publisher; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.parser.BuildTargetSpec; diff --git a/src/com/facebook/buck/cli/TestRunning.java b/src/com/facebook/buck/cli/TestRunning.java index 74eeaf1dab4..71ca0269fdf 100644 --- a/src/com/facebook/buck/cli/TestRunning.java +++ b/src/com/facebook/buck/cli/TestRunning.java @@ -16,15 +16,15 @@ package com.facebook.buck.cli; -import static com.facebook.buck.java.JUnitStep.JACOCO_OUTPUT_DIR; +import static com.facebook.buck.jvm.java.JUnitStep.JACOCO_OUTPUT_DIR; import com.facebook.buck.event.ConsoleEvent; import com.facebook.buck.io.MorePaths; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.DefaultJavaPackageFinder; -import com.facebook.buck.java.GenerateCodeCoverageReportStep; -import com.facebook.buck.java.JavaLibrary; -import com.facebook.buck.java.JavaTest; +import com.facebook.buck.jvm.java.DefaultJavaPackageFinder; +import com.facebook.buck.jvm.java.GenerateCodeCoverageReportStep; +import com.facebook.buck.jvm.java.JavaLibrary; +import com.facebook.buck.jvm.java.JavaTest; import com.facebook.buck.log.Logger; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.HasBuildTarget; diff --git a/src/com/facebook/buck/cli/bootstrapper/BUCK b/src/com/facebook/buck/cli/bootstrapper/BUCK index 6f1c3655f44..fa2f53a2671 100644 --- a/src/com/facebook/buck/cli/bootstrapper/BUCK +++ b/src/com/facebook/buck/cli/bootstrapper/BUCK @@ -28,7 +28,7 @@ java_library( # This is an internal API used by the javac tracing support (TracingTaskListener). # TaskListeners are a kind of compiler plugin, so the same logic applies as the Tracing API # above. This is just a more specialized tracing API we've built for this one case. - '//src/com/facebook/buck/java/tracing:api', + '//src/com/facebook/buck/jvm/java/tracing:api', ], visibility = [ '//test/...', diff --git a/src/com/facebook/buck/command/BUCK b/src/com/facebook/buck/command/BUCK index fc6b3d154c2..642a7056fe2 100644 --- a/src/com/facebook/buck/command/BUCK +++ b/src/com/facebook/buck/command/BUCK @@ -14,10 +14,10 @@ java_immutables_library( '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:packagefinder', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:packagefinder', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:parser', '//src/com/facebook/buck/rules:build_rule', diff --git a/src/com/facebook/buck/command/Build.java b/src/com/facebook/buck/command/Build.java index 0986193d55d..417c6dcdeb5 100644 --- a/src/com/facebook/buck/command/Build.java +++ b/src/com/facebook/buck/command/Build.java @@ -21,7 +21,7 @@ import com.facebook.buck.event.BuckEventBus; import com.facebook.buck.event.ConsoleEvent; import com.facebook.buck.event.ThrowableConsoleEvent; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.HasBuildTarget; import com.facebook.buck.rules.ActionGraph; diff --git a/src/com/facebook/buck/cxx/AbstractCxxLibrary.java b/src/com/facebook/buck/cxx/AbstractCxxLibrary.java index a6a994c5535..d252660258f 100644 --- a/src/com/facebook/buck/cxx/AbstractCxxLibrary.java +++ b/src/com/facebook/buck/cxx/AbstractCxxLibrary.java @@ -17,7 +17,7 @@ package com.facebook.buck.cxx; import com.facebook.buck.android.AndroidPackageable; -import com.facebook.buck.java.JavaNativeLinkable; +import com.facebook.buck.jvm.java.JavaNativeLinkable; import com.facebook.buck.python.PythonPackagable; import com.facebook.buck.rules.BuildRuleParams; import com.facebook.buck.rules.NoopBuildRule; diff --git a/src/com/facebook/buck/cxx/BUCK b/src/com/facebook/buck/cxx/BUCK index e8564aa86cc..eeb2e49e87f 100644 --- a/src/com/facebook/buck/cxx/BUCK +++ b/src/com/facebook/buck/cxx/BUCK @@ -54,7 +54,7 @@ java_immutables_library( '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:nativelinkable', + '//src/com/facebook/buck/jvm/java:nativelinkable', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:rule_pattern', @@ -81,7 +81,7 @@ java_immutables_library( '//third-party/java/jackson:jackson', '//third-party/java/jsr:jsr305', '//third-party/java/gson:gson', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:support', ], visibility = [ 'PUBLIC' diff --git a/src/com/facebook/buck/cxx/CxxPrepareForLinkStep.java b/src/com/facebook/buck/cxx/CxxPrepareForLinkStep.java index 65eab90105e..d0d64954491 100644 --- a/src/com/facebook/buck/cxx/CxxPrepareForLinkStep.java +++ b/src/com/facebook/buck/cxx/CxxPrepareForLinkStep.java @@ -16,7 +16,7 @@ package com.facebook.buck.cxx; -import com.facebook.buck.java.Javac; +import com.facebook.buck.jvm.java.Javac; import com.facebook.buck.log.Logger; import com.facebook.buck.step.ExecutionContext; import com.facebook.buck.step.Step; diff --git a/src/com/facebook/buck/dalvik/BUCK b/src/com/facebook/buck/dalvik/BUCK index c76cce307a6..1db5f2fe567 100644 --- a/src/com/facebook/buck/dalvik/BUCK +++ b/src/com/facebook/buck/dalvik/BUCK @@ -46,7 +46,7 @@ java_library( deps = [ ':dalvik_stats_tool', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java/classes:classes', + '//src/com/facebook/buck/jvm/java/classes:classes', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/util:exceptions', '//src/com/facebook/buck/util:util', @@ -72,7 +72,7 @@ java_library( '//third-party/java/guava:guava', '//third-party/java/jsr:jsr305', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java/classes:classes', + '//src/com/facebook/buck/jvm/java/classes:classes', '//src/com/facebook/buck/step:step', ], visibility = [ diff --git a/src/com/facebook/buck/dalvik/CanaryFactory.java b/src/com/facebook/buck/dalvik/CanaryFactory.java index fa38bf467aa..9e9dfdc0dbd 100644 --- a/src/com/facebook/buck/dalvik/CanaryFactory.java +++ b/src/com/facebook/buck/dalvik/CanaryFactory.java @@ -16,8 +16,8 @@ package com.facebook.buck.dalvik; -import com.facebook.buck.java.classes.AbstractFileLike; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.AbstractFileLike; +import com.facebook.buck.jvm.java.classes.FileLike; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; diff --git a/src/com/facebook/buck/dalvik/DalvikAwareOutputStreamHelper.java b/src/com/facebook/buck/dalvik/DalvikAwareOutputStreamHelper.java index e2ba6e3d3f7..96de796282a 100644 --- a/src/com/facebook/buck/dalvik/DalvikAwareOutputStreamHelper.java +++ b/src/com/facebook/buck/dalvik/DalvikAwareOutputStreamHelper.java @@ -19,7 +19,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.facebook.buck.io.MorePaths; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.FileLike; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.google.common.io.ByteStreams; diff --git a/src/com/facebook/buck/dalvik/DalvikAwareZipSplitter.java b/src/com/facebook/buck/dalvik/DalvikAwareZipSplitter.java index 5227b1b0653..44549b0a821 100644 --- a/src/com/facebook/buck/dalvik/DalvikAwareZipSplitter.java +++ b/src/com/facebook/buck/dalvik/DalvikAwareZipSplitter.java @@ -17,11 +17,11 @@ package com.facebook.buck.dalvik; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.classes.AbstractFileLike; -import com.facebook.buck.java.classes.ClasspathTraversal; -import com.facebook.buck.java.classes.ClasspathTraverser; -import com.facebook.buck.java.classes.DefaultClasspathTraverser; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.AbstractFileLike; +import com.facebook.buck.jvm.java.classes.ClasspathTraversal; +import com.facebook.buck.jvm.java.classes.ClasspathTraverser; +import com.facebook.buck.jvm.java.classes.DefaultClasspathTraverser; +import com.facebook.buck.jvm.java.classes.FileLike; import com.facebook.buck.log.Logger; import com.facebook.buck.util.HumanReadableException; import com.google.common.base.Preconditions; diff --git a/src/com/facebook/buck/dalvik/DalvikStatsCache.java b/src/com/facebook/buck/dalvik/DalvikStatsCache.java index 44de7999593..d23fad0cecf 100644 --- a/src/com/facebook/buck/dalvik/DalvikStatsCache.java +++ b/src/com/facebook/buck/dalvik/DalvikStatsCache.java @@ -16,7 +16,7 @@ package com.facebook.buck.dalvik; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.FileLike; import com.google.common.collect.MapMaker; import java.io.InputStream; diff --git a/src/com/facebook/buck/dalvik/DefaultZipOutputStreamHelper.java b/src/com/facebook/buck/dalvik/DefaultZipOutputStreamHelper.java index ba090df159c..e5d972ca524 100644 --- a/src/com/facebook/buck/dalvik/DefaultZipOutputStreamHelper.java +++ b/src/com/facebook/buck/dalvik/DefaultZipOutputStreamHelper.java @@ -19,7 +19,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.facebook.buck.io.MorePaths; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.FileLike; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.google.common.io.ByteStreams; diff --git a/src/com/facebook/buck/dalvik/DefaultZipSplitter.java b/src/com/facebook/buck/dalvik/DefaultZipSplitter.java index 5982d58a980..a1d06d6dc61 100644 --- a/src/com/facebook/buck/dalvik/DefaultZipSplitter.java +++ b/src/com/facebook/buck/dalvik/DefaultZipSplitter.java @@ -17,10 +17,10 @@ package com.facebook.buck.dalvik; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.classes.ClasspathTraversal; -import com.facebook.buck.java.classes.ClasspathTraverser; -import com.facebook.buck.java.classes.DefaultClasspathTraverser; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.ClasspathTraversal; +import com.facebook.buck.jvm.java.classes.ClasspathTraverser; +import com.facebook.buck.jvm.java.classes.DefaultClasspathTraverser; +import com.facebook.buck.jvm.java.classes.FileLike; import com.facebook.buck.log.Logger; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; diff --git a/src/com/facebook/buck/dalvik/EstimateLinearAllocStep.java b/src/com/facebook/buck/dalvik/EstimateLinearAllocStep.java index 5495dd68658..42a3ded4b2f 100644 --- a/src/com/facebook/buck/dalvik/EstimateLinearAllocStep.java +++ b/src/com/facebook/buck/dalvik/EstimateLinearAllocStep.java @@ -17,10 +17,10 @@ package com.facebook.buck.dalvik; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.classes.ClasspathTraversal; -import com.facebook.buck.java.classes.DefaultClasspathTraverser; -import com.facebook.buck.java.classes.FileLike; -import com.facebook.buck.java.classes.FileLikes; +import com.facebook.buck.jvm.java.classes.ClasspathTraversal; +import com.facebook.buck.jvm.java.classes.DefaultClasspathTraverser; +import com.facebook.buck.jvm.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.FileLikes; import com.facebook.buck.step.ExecutionContext; import com.facebook.buck.step.Step; import com.google.common.annotations.VisibleForTesting; diff --git a/src/com/facebook/buck/dalvik/SecondaryDexHelper.java b/src/com/facebook/buck/dalvik/SecondaryDexHelper.java index 3621fc735f4..fa1f770d4c2 100644 --- a/src/com/facebook/buck/dalvik/SecondaryDexHelper.java +++ b/src/com/facebook/buck/dalvik/SecondaryDexHelper.java @@ -16,7 +16,7 @@ package com.facebook.buck.dalvik; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.FileLike; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/src/com/facebook/buck/dalvik/ZipOutputStreamHelper.java b/src/com/facebook/buck/dalvik/ZipOutputStreamHelper.java index 465c6c223f7..4a9b4fe514e 100644 --- a/src/com/facebook/buck/dalvik/ZipOutputStreamHelper.java +++ b/src/com/facebook/buck/dalvik/ZipOutputStreamHelper.java @@ -16,7 +16,7 @@ package com.facebook.buck.dalvik; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.FileLike; import java.io.IOException; diff --git a/src/com/facebook/buck/event/listener/BUCK b/src/com/facebook/buck/event/listener/BUCK index 4eab9c92788..73bc7290866 100644 --- a/src/com/facebook/buck/event/listener/BUCK +++ b/src/com/facebook/buck/event/listener/BUCK @@ -12,8 +12,8 @@ java_immutables_library( '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/httpserver:httpserver', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:support', - '//src/com/facebook/buck/java/tracing:tracing', + '//src/com/facebook/buck/jvm/java:support', + '//src/com/facebook/buck/jvm/java/tracing:tracing', '//src/com/facebook/buck/json:json', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/log:log', diff --git a/src/com/facebook/buck/event/listener/ChromeTraceBuildListener.java b/src/com/facebook/buck/event/listener/ChromeTraceBuildListener.java index 0a76f953c58..6ff1e79bfad 100644 --- a/src/com/facebook/buck/event/listener/ChromeTraceBuildListener.java +++ b/src/com/facebook/buck/event/listener/ChromeTraceBuildListener.java @@ -28,8 +28,8 @@ import com.facebook.buck.event.UninstallEvent; import com.facebook.buck.io.PathListing; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.AnnotationProcessingEvent; -import com.facebook.buck.java.tracing.JavacPhaseEvent; +import com.facebook.buck.jvm.java.AnnotationProcessingEvent; +import com.facebook.buck.jvm.java.tracing.JavacPhaseEvent; import com.facebook.buck.json.ParseBuckFileEvent; import com.facebook.buck.log.CommandThreadFactory; import com.facebook.buck.log.Logger; diff --git a/src/com/facebook/buck/gwt/BUCK b/src/com/facebook/buck/gwt/BUCK index 7ccd53eed4a..3bdca356101 100644 --- a/src/com/facebook/buck/gwt/BUCK +++ b/src/com/facebook/buck/gwt/BUCK @@ -4,10 +4,10 @@ java_library( deps = [ '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:steps', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:classhash', + '//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/model:model', '//src/com/facebook/buck/rules:build_rule', '//src/com/facebook/buck/rules:rules', diff --git a/src/com/facebook/buck/gwt/GwtBinary.java b/src/com/facebook/buck/gwt/GwtBinary.java index 6e898f4eea5..b5e09395c1c 100644 --- a/src/com/facebook/buck/gwt/GwtBinary.java +++ b/src/com/facebook/buck/gwt/GwtBinary.java @@ -16,7 +16,7 @@ package com.facebook.buck.gwt; -import com.facebook.buck.java.JavaLibrary; +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/gwt/GwtBinaryDescription.java b/src/com/facebook/buck/gwt/GwtBinaryDescription.java index 0f663092e50..ab59609b48a 100644 --- a/src/com/facebook/buck/gwt/GwtBinaryDescription.java +++ b/src/com/facebook/buck/gwt/GwtBinaryDescription.java @@ -18,7 +18,7 @@ import com.facebook.buck.graph.AbstractBreadthFirstTraversal; import com.facebook.buck.gwt.GwtBinary.Style; -import com.facebook.buck.java.JavaLibrary; +import com.facebook.buck.jvm.java.JavaLibrary; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargets; import com.facebook.buck.rules.BuildRule; diff --git a/src/com/facebook/buck/junit/BUCK b/src/com/facebook/buck/junit/BUCK index 37a6005162c..ac2b9989895 100644 --- a/src/com/facebook/buck/junit/BUCK +++ b/src/com/facebook/buck/junit/BUCK @@ -32,7 +32,7 @@ java_library( # test, as not to interfere with the results of the test. '//third-party/java/junit:junit', '//src/com/facebook/buck/util/concurrent:concurrent_for_junit_runner', - '//src/com/facebook/buck/java/runner:runner', + '//src/com/facebook/buck/jvm/java/runner:runner', ], visibility = [ '//test/com/facebook/buck/junit:junit', diff --git a/src/com/facebook/buck/java/AbstractJavacOptions.java b/src/com/facebook/buck/jvm/java/AbstractJavacOptions.java similarity index 99% rename from src/com/facebook/buck/java/AbstractJavacOptions.java rename to src/com/facebook/buck/jvm/java/AbstractJavacOptions.java index 2a0a169ae64..1e2df589f7e 100644 --- a/src/com/facebook/buck/java/AbstractJavacOptions.java +++ b/src/com/facebook/buck/jvm/java/AbstractJavacOptions.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.rules.BuildRule; import com.facebook.buck.rules.RuleKeyAppendable; diff --git a/src/com/facebook/buck/java/AbstractJavacVersion.java b/src/com/facebook/buck/jvm/java/AbstractJavacVersion.java similarity index 96% rename from src/com/facebook/buck/java/AbstractJavacVersion.java rename to src/com/facebook/buck/jvm/java/AbstractJavacVersion.java index bd4c8db97e7..fa31c6c22fc 100644 --- a/src/com/facebook/buck/java/AbstractJavacVersion.java +++ b/src/com/facebook/buck/jvm/java/AbstractJavacVersion.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.util.immutables.BuckStyleImmutable; diff --git a/src/com/facebook/buck/java/AccumulateClassNamesStep.java b/src/com/facebook/buck/jvm/java/AccumulateClassNamesStep.java similarity index 96% rename from src/com/facebook/buck/java/AccumulateClassNamesStep.java rename to src/com/facebook/buck/jvm/java/AccumulateClassNamesStep.java index 09ba8aa2ebb..0cafe308935 100644 --- a/src/com/facebook/buck/java/AccumulateClassNamesStep.java +++ b/src/com/facebook/buck/jvm/java/AccumulateClassNamesStep.java @@ -14,14 +14,14 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.event.ThrowableConsoleEvent; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.classes.ClasspathTraversal; -import com.facebook.buck.java.classes.DefaultClasspathTraverser; -import com.facebook.buck.java.classes.FileLike; -import com.facebook.buck.java.classes.FileLikes; +import com.facebook.buck.jvm.java.classes.ClasspathTraversal; +import com.facebook.buck.jvm.java.classes.DefaultClasspathTraverser; +import com.facebook.buck.jvm.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.FileLikes; import com.facebook.buck.step.ExecutionContext; import com.facebook.buck.step.Step; import com.google.common.base.Function; diff --git a/src/com/facebook/buck/java/AnnotationProcessingEvent.java b/src/com/facebook/buck/jvm/java/AnnotationProcessingEvent.java similarity index 99% rename from src/com/facebook/buck/java/AnnotationProcessingEvent.java rename to src/com/facebook/buck/jvm/java/AnnotationProcessingEvent.java index 04b014f0cc3..40adbec4238 100644 --- a/src/com/facebook/buck/java/AnnotationProcessingEvent.java +++ b/src/com/facebook/buck/jvm/java/AnnotationProcessingEvent.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.event.AbstractBuckEvent; import com.facebook.buck.event.EventKey; diff --git a/src/com/facebook/buck/java/AnnotationProcessingParams.java b/src/com/facebook/buck/jvm/java/AnnotationProcessingParams.java similarity index 99% rename from src/com/facebook/buck/java/AnnotationProcessingParams.java rename to src/com/facebook/buck/jvm/java/AnnotationProcessingParams.java index ec66a6766dc..099e8bb0074 100644 --- a/src/com/facebook/buck/java/AnnotationProcessingParams.java +++ b/src/com/facebook/buck/jvm/java/AnnotationProcessingParams.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/BUCK b/src/com/facebook/buck/jvm/java/BUCK similarity index 87% rename from src/com/facebook/buck/java/BUCK rename to src/com/facebook/buck/jvm/java/BUCK index 638224886af..5c160757f50 100644 --- a/src/com/facebook/buck/java/BUCK +++ b/src/com/facebook/buck/jvm/java/BUCK @@ -21,6 +21,8 @@ java_library( srcs = [ 'FatJar.java', 'FatJarMain.java', + '//src/com/facebook/buck/util/exportedfiles:Nullable.java', + '//src/com/facebook/buck/util/exportedfiles:Preconditions.java', ], # Must be empty! We package these sources and compile them into fat JARs, # so it's important that they don't bring along any additional dependencies. @@ -90,8 +92,8 @@ java_immutables_library( 'TracingProcessorWrapper.java', ], tests = [ - '//test/com/facebook/buck/java:integration-slow', - '//test/com/facebook/buck/java:java', + '//test/com/facebook/buck/jvm/java:integration-slow', + '//test/com/facebook/buck/jvm/java:java', ], deps = [ ':classhash', @@ -99,9 +101,9 @@ java_immutables_library( ':packagefinder', '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java/abi:protocol', - '//src/com/facebook/buck/java/tracing:api', - '//src/com/facebook/buck/java/tracing:tracing', + '//src/com/facebook/buck/jvm/java/abi:protocol', + '//src/com/facebook/buck/jvm/java/tracing:api', + '//src/com/facebook/buck/jvm/java/tracing:tracing', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/rules:build_rule', @@ -163,12 +165,14 @@ java_library( 'PrebuiltJarDescription.java', ], tests = [ - '//test/com/facebook/buck/java:integration-slow', - '//test/com/facebook/buck/java:java', + '//test/com/facebook/buck/jvm/java:integration-slow', + '//test/com/facebook/buck/jvm/java:java', ], resources = [ 'FatJar.java', 'FatJarMain.java', + '//src/com/facebook/buck/util/exportedfiles:Nullable.java', + '//src/com/facebook/buck/util/exportedfiles:Preconditions.java', ], deps = [ ':classhash', @@ -183,7 +187,7 @@ java_library( '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java/abi:protocol', + '//src/com/facebook/buck/jvm/java/abi:protocol', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/maven:util', '//src/com/facebook/buck/model:model', @@ -224,16 +228,16 @@ java_library( 'TestType.java', ], tests = [ - '//test/com/facebook/buck/java:integration-slow', - '//test/com/facebook/buck/java:java', + '//test/com/facebook/buck/jvm/java:integration-slow', + '//test/com/facebook/buck/jvm/java:java', ], deps = [ ':packagefinder', ':support', '//src/com/facebook/buck/dalvik:dalvik_stats_tool', - '//src/com/facebook/buck/java/abi:abi', - '//src/com/facebook/buck/java/classes:classes', - '//src/com/facebook/buck/java/runner:runner', + '//src/com/facebook/buck/jvm/java/abi:abi', + '//src/com/facebook/buck/jvm/java/classes:classes', + '//src/com/facebook/buck/jvm/java/runner:runner', '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/io:io', '//src/com/facebook/buck/log:api', @@ -285,8 +289,8 @@ java_library( ], visibility = [ '//src/com/facebook/buck/cli:cli', - '//src/com/facebook/buck/java/intellij:intellij', - '//test/com/facebook/buck/java:java', - '//test/com/facebook/buck/java/intellij:intellij', + '//src/com/facebook/buck/jvm/java/intellij:intellij', + '//test/com/facebook/buck/jvm/java:java', + '//test/com/facebook/buck/jvm/java/intellij:intellij', ], ) diff --git a/src/com/facebook/buck/java/BuildsAnnotationProcessor.java b/src/com/facebook/buck/jvm/java/BuildsAnnotationProcessor.java similarity index 96% rename from src/com/facebook/buck/java/BuildsAnnotationProcessor.java rename to src/com/facebook/buck/jvm/java/BuildsAnnotationProcessor.java index 87e992e1064..f7255e49c71 100644 --- a/src/com/facebook/buck/java/BuildsAnnotationProcessor.java +++ b/src/com/facebook/buck/jvm/java/BuildsAnnotationProcessor.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/com/facebook/buck/java/BuiltInJavac.java b/src/com/facebook/buck/jvm/java/BuiltInJavac.java similarity index 84% rename from src/com/facebook/buck/java/BuiltInJavac.java rename to src/com/facebook/buck/jvm/java/BuiltInJavac.java index 1c855da4a93..b77a132c9f7 100644 --- a/src/com/facebook/buck/java/BuiltInJavac.java +++ b/src/com/facebook/buck/jvm/java/BuiltInJavac.java @@ -14,10 +14,10 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; /** - * Which of the built in {@link com.facebook.buck.java.Jsr199Javac} implementations to use for + * Which of the built in {@link com.facebook.buck.jvm.java.Jsr199Javac} implementations to use for * compilation. */ enum BuiltInJavac { diff --git a/src/com/facebook/buck/java/CalculateAbi.java b/src/com/facebook/buck/jvm/java/CalculateAbi.java similarity index 98% rename from src/com/facebook/buck/java/CalculateAbi.java rename to src/com/facebook/buck/jvm/java/CalculateAbi.java index b3b800456b7..1bc5d8ba832 100644 --- a/src/com/facebook/buck/java/CalculateAbi.java +++ b/src/com/facebook/buck/jvm/java/CalculateAbi.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargets; diff --git a/src/com/facebook/buck/java/CalculateAbiStep.java b/src/com/facebook/buck/jvm/java/CalculateAbiStep.java similarity index 97% rename from src/com/facebook/buck/java/CalculateAbiStep.java rename to src/com/facebook/buck/jvm/java/CalculateAbiStep.java index e749cc26989..13a5fdcc9bb 100644 --- a/src/com/facebook/buck/java/CalculateAbiStep.java +++ b/src/com/facebook/buck/jvm/java/CalculateAbiStep.java @@ -14,11 +14,11 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.event.ConsoleEvent; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.abi.StubJar; +import com.facebook.buck.jvm.java.abi.StubJar; import com.facebook.buck.rules.keys.AbiRule; import com.facebook.buck.rules.BuildableContext; import com.facebook.buck.rules.Sha1HashCode; diff --git a/src/com/facebook/buck/java/Classpaths.java b/src/com/facebook/buck/jvm/java/Classpaths.java similarity index 98% rename from src/com/facebook/buck/java/Classpaths.java rename to src/com/facebook/buck/jvm/java/Classpaths.java index 786b8c5e317..a50a1c80556 100644 --- a/src/com/facebook/buck/java/Classpaths.java +++ b/src/com/facebook/buck/jvm/java/Classpaths.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.rules.BuildRule; import com.google.common.collect.ImmutableSet; diff --git a/src/com/facebook/buck/java/CopyResourcesStep.java b/src/com/facebook/buck/jvm/java/CopyResourcesStep.java similarity index 99% rename from src/com/facebook/buck/java/CopyResourcesStep.java rename to src/com/facebook/buck/jvm/java/CopyResourcesStep.java index 2c55f6ce374..eaa5fce2fbe 100644 --- a/src/com/facebook/buck/java/CopyResourcesStep.java +++ b/src/com/facebook/buck/jvm/java/CopyResourcesStep.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.MorePaths; import com.facebook.buck.io.ProjectFilesystem; diff --git a/src/com/facebook/buck/java/DefaultJavaLibrary.java b/src/com/facebook/buck/jvm/java/DefaultJavaLibrary.java similarity index 99% rename from src/com/facebook/buck/java/DefaultJavaLibrary.java rename to src/com/facebook/buck/jvm/java/DefaultJavaLibrary.java index c56cd0ece52..d4f46201cfa 100644 --- a/src/com/facebook/buck/java/DefaultJavaLibrary.java +++ b/src/com/facebook/buck/jvm/java/DefaultJavaLibrary.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static com.facebook.buck.rules.BuildableProperties.Kind.ANDROID; import static com.facebook.buck.rules.BuildableProperties.Kind.LIBRARY; diff --git a/src/com/facebook/buck/java/DefaultJavaPackageFinder.java b/src/com/facebook/buck/jvm/java/DefaultJavaPackageFinder.java similarity index 99% rename from src/com/facebook/buck/java/DefaultJavaPackageFinder.java rename to src/com/facebook/buck/jvm/java/DefaultJavaPackageFinder.java index 6073db2bd5c..c9662f486dc 100644 --- a/src/com/facebook/buck/java/DefaultJavaPackageFinder.java +++ b/src/com/facebook/buck/jvm/java/DefaultJavaPackageFinder.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.MorePaths; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/DiagnosticPrettyPrinter.java b/src/com/facebook/buck/jvm/java/DiagnosticPrettyPrinter.java similarity index 99% rename from src/com/facebook/buck/java/DiagnosticPrettyPrinter.java rename to src/com/facebook/buck/jvm/java/DiagnosticPrettyPrinter.java index 223aee1ea68..ea107e0366f 100644 --- a/src/com/facebook/buck/java/DiagnosticPrettyPrinter.java +++ b/src/com/facebook/buck/jvm/java/DiagnosticPrettyPrinter.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.google.common.base.Optional; diff --git a/src/com/facebook/buck/java/ExternalJavac.java b/src/com/facebook/buck/jvm/java/ExternalJavac.java similarity index 99% rename from src/com/facebook/buck/java/ExternalJavac.java rename to src/com/facebook/buck/jvm/java/ExternalJavac.java index 3b2234dfa9e..449a25d2d1b 100644 --- a/src/com/facebook/buck/java/ExternalJavac.java +++ b/src/com/facebook/buck/jvm/java/ExternalJavac.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; diff --git a/src/com/facebook/buck/java/FatJar.java b/src/com/facebook/buck/jvm/java/FatJar.java similarity index 88% rename from src/com/facebook/buck/java/FatJar.java rename to src/com/facebook/buck/jvm/java/FatJar.java index 6d29be083d1..7b0a3d77810 100644 --- a/src/com/facebook/buck/java/FatJar.java +++ b/src/com/facebook/buck/jvm/java/FatJar.java @@ -21,7 +21,10 @@ * ***************/ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; + +import com.facebook.buck.util.exportedfiles.Nullable; +import com.facebook.buck.util.exportedfiles.Preconditions; import java.io.BufferedInputStream; import java.io.IOException; @@ -45,22 +48,6 @@ @XmlRootElement(name = "fatjar") @XmlAccessorType(XmlAccessType.FIELD) public class FatJar { - /** - * Since FatJar is going to be embedded in many targets, it cannot have external dependencies, but - * we'd like to have {@link javax.annotation.Nullable} and - * {@link com.google.common.base.Preconditions#checkNotNull} anyway, so we define these here. - */ - @interface Nullable {} - private static class Preconditions { - private Preconditions() {} - - public static T checkNotNull(@Nullable T value) { - if (value == null) { - throw new RuntimeException(); - } - return value; - } - } public static final String FAT_JAR_INFO_RESOURCE = "fat_jar_info.dat"; diff --git a/src/com/facebook/buck/java/FatJarMain.java b/src/com/facebook/buck/jvm/java/FatJarMain.java similarity index 96% rename from src/com/facebook/buck/java/FatJarMain.java rename to src/com/facebook/buck/jvm/java/FatJarMain.java index 5d2b0de6039..3a42ca38b8a 100644 --- a/src/com/facebook/buck/java/FatJarMain.java +++ b/src/com/facebook/buck/jvm/java/FatJarMain.java @@ -21,7 +21,9 @@ * ***************/ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; + +import com.facebook.buck.util.exportedfiles.Preconditions; import java.io.File; import java.io.IOException; @@ -107,7 +109,7 @@ public static void main(String[] args) throws Exception { * @return the platform specific environment variable for setting the native library search path. */ private static String getLibrarySearchPathName() { - String platform = System.getProperty("os.name"); + String platform = Preconditions.checkNotNull(System.getProperty("os.name")); if (platform.startsWith("Linux")) { return "LD_LIBRARY_PATH"; } else if (platform.startsWith("Mac OS")) { diff --git a/src/com/facebook/buck/java/GenerateCodeCoverageReportStep.java b/src/com/facebook/buck/jvm/java/GenerateCodeCoverageReportStep.java similarity index 99% rename from src/com/facebook/buck/java/GenerateCodeCoverageReportStep.java rename to src/com/facebook/buck/jvm/java/GenerateCodeCoverageReportStep.java index cd5ac749223..72c6e477f6b 100644 --- a/src/com/facebook/buck/java/GenerateCodeCoverageReportStep.java +++ b/src/com/facebook/buck/jvm/java/GenerateCodeCoverageReportStep.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; import com.facebook.buck.shell.ShellStep; diff --git a/src/com/facebook/buck/java/GwtModule.java b/src/com/facebook/buck/jvm/java/GwtModule.java similarity index 98% rename from src/com/facebook/buck/java/GwtModule.java rename to src/com/facebook/buck/jvm/java/GwtModule.java index f10e64f9357..bc4ce6446d0 100644 --- a/src/com/facebook/buck/java/GwtModule.java +++ b/src/com/facebook/buck/jvm/java/GwtModule.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargets; diff --git a/src/com/facebook/buck/java/HasClasspathEntries.java b/src/com/facebook/buck/jvm/java/HasClasspathEntries.java similarity index 97% rename from src/com/facebook/buck/java/HasClasspathEntries.java rename to src/com/facebook/buck/jvm/java/HasClasspathEntries.java index e641236a6a1..c4174b7185b 100644 --- a/src/com/facebook/buck/java/HasClasspathEntries.java +++ b/src/com/facebook/buck/jvm/java/HasClasspathEntries.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; diff --git a/src/com/facebook/buck/java/HasJavaAbi.java b/src/com/facebook/buck/jvm/java/HasJavaAbi.java similarity index 96% rename from src/com/facebook/buck/java/HasJavaAbi.java rename to src/com/facebook/buck/jvm/java/HasJavaAbi.java index 2785476e731..748265006e4 100644 --- a/src/com/facebook/buck/java/HasJavaAbi.java +++ b/src/com/facebook/buck/jvm/java/HasJavaAbi.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.HasBuildTarget; import com.facebook.buck.rules.SourcePath; diff --git a/src/com/facebook/buck/java/HasJavaClassHashes.java b/src/com/facebook/buck/jvm/java/HasJavaClassHashes.java similarity index 96% rename from src/com/facebook/buck/java/HasJavaClassHashes.java rename to src/com/facebook/buck/jvm/java/HasJavaClassHashes.java index 720c0f2d33e..da6efbaae5a 100644 --- a/src/com/facebook/buck/java/HasJavaClassHashes.java +++ b/src/com/facebook/buck/jvm/java/HasJavaClassHashes.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.HasBuildTarget; import com.google.common.collect.ImmutableSortedMap; diff --git a/src/com/facebook/buck/java/HasMavenCoordinates.java b/src/com/facebook/buck/jvm/java/HasMavenCoordinates.java similarity index 97% rename from src/com/facebook/buck/java/HasMavenCoordinates.java rename to src/com/facebook/buck/jvm/java/HasMavenCoordinates.java index ad31d551436..5af2975f9e9 100644 --- a/src/com/facebook/buck/java/HasMavenCoordinates.java +++ b/src/com/facebook/buck/jvm/java/HasMavenCoordinates.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.rules.BuildRule; import com.google.common.base.Optional; diff --git a/src/com/facebook/buck/java/HasSources.java b/src/com/facebook/buck/jvm/java/HasSources.java similarity index 95% rename from src/com/facebook/buck/java/HasSources.java rename to src/com/facebook/buck/jvm/java/HasSources.java index eab6892efce..75a4c546807 100644 --- a/src/com/facebook/buck/java/HasSources.java +++ b/src/com/facebook/buck/jvm/java/HasSources.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.rules.BuildRule; import com.facebook.buck.rules.SourcePath; diff --git a/src/com/facebook/buck/java/JUnitStep.java b/src/com/facebook/buck/jvm/java/JUnitStep.java similarity index 99% rename from src/com/facebook/buck/java/JUnitStep.java rename to src/com/facebook/buck/jvm/java/JUnitStep.java index 2af4c723c2b..6d976bd0c5c 100644 --- a/src/com/facebook/buck/java/JUnitStep.java +++ b/src/com/facebook/buck/jvm/java/JUnitStep.java @@ -14,11 +14,11 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ExecutableFinder; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.runner.FileClassPathRunner; +import com.facebook.buck.jvm.java.runner.FileClassPathRunner; import com.facebook.buck.log.Logger; import com.facebook.buck.model.BuildId; import com.facebook.buck.shell.ShellStep; diff --git a/src/com/facebook/buck/java/JarBackedJavac.java b/src/com/facebook/buck/jvm/java/JarBackedJavac.java similarity index 99% rename from src/com/facebook/buck/java/JarBackedJavac.java rename to src/com/facebook/buck/jvm/java/JarBackedJavac.java index 12a9faac2eb..9509f14db4a 100644 --- a/src/com/facebook/buck/java/JarBackedJavac.java +++ b/src/com/facebook/buck/jvm/java/JarBackedJavac.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.rules.BuildRule; import com.facebook.buck.rules.RuleKeyBuilder; diff --git a/src/com/facebook/buck/java/JarDirectoryStep.java b/src/com/facebook/buck/jvm/java/JarDirectoryStep.java similarity index 99% rename from src/com/facebook/buck/java/JarDirectoryStep.java rename to src/com/facebook/buck/jvm/java/JarDirectoryStep.java index f7ef022c19d..fa3a4406ce4 100644 --- a/src/com/facebook/buck/java/JarDirectoryStep.java +++ b/src/com/facebook/buck/jvm/java/JarDirectoryStep.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; import com.facebook.buck.step.ExecutionContext; diff --git a/src/com/facebook/buck/java/JarDirectoryStepHelper.java b/src/com/facebook/buck/jvm/java/JarDirectoryStepHelper.java similarity index 99% rename from src/com/facebook/buck/java/JarDirectoryStepHelper.java rename to src/com/facebook/buck/jvm/java/JarDirectoryStepHelper.java index 1615d76dbf8..c1fbdcf60f4 100644 --- a/src/com/facebook/buck/java/JarDirectoryStepHelper.java +++ b/src/com/facebook/buck/jvm/java/JarDirectoryStepHelper.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static com.facebook.buck.zip.ZipOutputStreams.HandleDuplicates.APPEND_TO_ZIP; diff --git a/src/com/facebook/buck/java/JarFattener.java b/src/com/facebook/buck/jvm/java/JarFattener.java similarity index 89% rename from src/com/facebook/buck/java/JarFattener.java rename to src/com/facebook/buck/jvm/java/JarFattener.java index f8e2a405a25..0d5448cadd4 100644 --- a/src/com/facebook/buck/java/JarFattener.java +++ b/src/com/facebook/buck/jvm/java/JarFattener.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.BuildTargets; import com.facebook.buck.rules.AbstractBuildRule; @@ -39,6 +39,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import com.google.common.io.ByteSource; import com.google.common.io.Resources; @@ -49,6 +50,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Map; +import java.util.Set; /** * Build a fat JAR that packages an inner JAR along with any required native libraries. @@ -57,8 +59,14 @@ public class JarFattener extends AbstractBuildRule implements BinaryBuildRule { private static final String FAT_JAR_INNER_JAR = "inner.jar"; private static final String FAT_JAR_NATIVE_LIBRARY_RESOURCE_ROOT = "nativelibs"; - public static final String FAT_JAR_SRC_RESOURCE = "com/facebook/buck/java/FatJar.java"; - public static final String FAT_JAR_MAIN_SRC_RESOURCE = "com/facebook/buck/java/FatJarMain.java"; + public static final ImmutableList FAT_JAR_SRC_RESOURCES = + ImmutableList.of( + "com/facebook/buck/jvm/java/FatJar.java", + "com/facebook/buck/util/exportedfiles/Nullable.java", + "com/facebook/buck/util/exportedfiles/Preconditions.java" + ); + public static final String FAT_JAR_MAIN_SRC_RESOURCE = + "com/facebook/buck/jvm/java/FatJarMain.java"; private final JavacOptions javacOptions; @AddToRuleKey @@ -112,9 +120,14 @@ public ImmutableList getBuildSteps( steps.add(writeFatJarInfo(fatJarInfo, sonameToResourceMap)); // Build up the resource and src collections. - Path fatJarSource = outputDir.resolve(Paths.get(FAT_JAR_SRC_RESOURCE).getFileName()); - steps.add(writeFromResource(fatJarSource, FAT_JAR_SRC_RESOURCE)); + Set javaSourceFilePaths = Sets.newHashSet(); + for (String srcResource : FAT_JAR_SRC_RESOURCES) { + Path fatJarSource = outputDir.resolve(Paths.get(srcResource).getFileName()); + javaSourceFilePaths.add(fatJarSource); + steps.add(writeFromResource(fatJarSource, srcResource)); + } Path fatJarMainSource = outputDir.resolve(Paths.get(FAT_JAR_MAIN_SRC_RESOURCE).getFileName()); + javaSourceFilePaths.add(fatJarMainSource); steps.add(writeFromResource(fatJarMainSource, FAT_JAR_MAIN_SRC_RESOURCE)); // Symlink the inner JAR into it's place in the fat JAR. @@ -145,7 +158,7 @@ public ImmutableList getBuildSteps( JavacToJarStepFactory javacToJarStepFactory = new JavacToJarStepFactory( fatJarDir, Optional.absent(), - ImmutableSet.of(fatJarSource, fatJarMainSource), + ImmutableSet.copyOf(javaSourceFilePaths), Optional.absent(), /* declared classpath */ ImmutableSet.of(), javacOptions, diff --git a/src/com/facebook/buck/java/JavaBinary.java b/src/com/facebook/buck/jvm/java/JavaBinary.java similarity index 99% rename from src/com/facebook/buck/java/JavaBinary.java rename to src/com/facebook/buck/jvm/java/JavaBinary.java index 1f82ab3ef75..6e87835c7d4 100644 --- a/src/com/facebook/buck/java/JavaBinary.java +++ b/src/com/facebook/buck/jvm/java/JavaBinary.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static com.facebook.buck.rules.BuildableProperties.Kind.PACKAGING; diff --git a/src/com/facebook/buck/java/JavaBinaryDescription.java b/src/com/facebook/buck/jvm/java/JavaBinaryDescription.java similarity index 99% rename from src/com/facebook/buck/java/JavaBinaryDescription.java rename to src/com/facebook/buck/jvm/java/JavaBinaryDescription.java index 18150e881a2..e4512d240c0 100644 --- a/src/com/facebook/buck/java/JavaBinaryDescription.java +++ b/src/com/facebook/buck/jvm/java/JavaBinaryDescription.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.cxx.CxxPlatform; import com.facebook.buck.io.DefaultDirectoryTraverser; diff --git a/src/com/facebook/buck/java/JavaBuckConfig.java b/src/com/facebook/buck/jvm/java/JavaBuckConfig.java similarity index 98% rename from src/com/facebook/buck/java/JavaBuckConfig.java rename to src/com/facebook/buck/jvm/java/JavaBuckConfig.java index de700d7cabc..9643d59f65f 100644 --- a/src/com/facebook/buck/java/JavaBuckConfig.java +++ b/src/com/facebook/buck/jvm/java/JavaBuckConfig.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.cli.BuckConfig; import com.facebook.buck.rules.SourcePath; diff --git a/src/com/facebook/buck/java/JavaFileParser.java b/src/com/facebook/buck/jvm/java/JavaFileParser.java similarity index 99% rename from src/com/facebook/buck/java/JavaFileParser.java rename to src/com/facebook/buck/jvm/java/JavaFileParser.java index e94003ea9bb..93bca920499 100644 --- a/src/com/facebook/buck/java/JavaFileParser.java +++ b/src/com/facebook/buck/jvm/java/JavaFileParser.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.google.common.base.Joiner; import com.google.common.base.Optional; diff --git a/src/com/facebook/buck/java/JavaLibrary.java b/src/com/facebook/buck/jvm/java/JavaLibrary.java similarity index 99% rename from src/com/facebook/buck/java/JavaLibrary.java rename to src/com/facebook/buck/jvm/java/JavaLibrary.java index 8a6b6a08de5..9dc068b4a39 100644 --- a/src/com/facebook/buck/java/JavaLibrary.java +++ b/src/com/facebook/buck/jvm/java/JavaLibrary.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.Flavor; import com.facebook.buck.model.ImmutableFlavor; diff --git a/src/com/facebook/buck/java/JavaLibraryClasspathProvider.java b/src/com/facebook/buck/jvm/java/JavaLibraryClasspathProvider.java similarity index 99% rename from src/com/facebook/buck/java/JavaLibraryClasspathProvider.java rename to src/com/facebook/buck/jvm/java/JavaLibraryClasspathProvider.java index ff136776a58..8c65aa97f3a 100644 --- a/src/com/facebook/buck/java/JavaLibraryClasspathProvider.java +++ b/src/com/facebook/buck/jvm/java/JavaLibraryClasspathProvider.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.rules.BuildRule; import com.facebook.buck.rules.ExportDependencies; diff --git a/src/com/facebook/buck/java/JavaLibraryDescription.java b/src/com/facebook/buck/jvm/java/JavaLibraryDescription.java similarity index 99% rename from src/com/facebook/buck/java/JavaLibraryDescription.java rename to src/com/facebook/buck/jvm/java/JavaLibraryDescription.java index a927151132a..fe16f6b3ee1 100644 --- a/src/com/facebook/buck/java/JavaLibraryDescription.java +++ b/src/com/facebook/buck/jvm/java/JavaLibraryDescription.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; import com.facebook.buck.maven.AetherUtil; diff --git a/src/com/facebook/buck/java/JavaLibraryRules.java b/src/com/facebook/buck/jvm/java/JavaLibraryRules.java similarity index 99% rename from src/com/facebook/buck/java/JavaLibraryRules.java rename to src/com/facebook/buck/jvm/java/JavaLibraryRules.java index 0dcedba3788..2d4e6c85364 100644 --- a/src/com/facebook/buck/java/JavaLibraryRules.java +++ b/src/com/facebook/buck/jvm/java/JavaLibraryRules.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.cxx.CxxPlatform; import com.facebook.buck.graph.AbstractBreadthFirstTraversal; diff --git a/src/com/facebook/buck/java/JavaNativeLinkable.java b/src/com/facebook/buck/jvm/java/JavaNativeLinkable.java similarity index 97% rename from src/com/facebook/buck/java/JavaNativeLinkable.java rename to src/com/facebook/buck/jvm/java/JavaNativeLinkable.java index 738d1cf2182..ca99e22fd89 100644 --- a/src/com/facebook/buck/java/JavaNativeLinkable.java +++ b/src/com/facebook/buck/jvm/java/JavaNativeLinkable.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.cxx.CxxPlatform; import com.facebook.buck.rules.SourcePath; diff --git a/src/com/facebook/buck/java/JavaPackageFinder.java b/src/com/facebook/buck/jvm/java/JavaPackageFinder.java similarity index 97% rename from src/com/facebook/buck/java/JavaPackageFinder.java rename to src/com/facebook/buck/jvm/java/JavaPackageFinder.java index 43e4307f289..5ebf0ec1292 100644 --- a/src/com/facebook/buck/java/JavaPackageFinder.java +++ b/src/com/facebook/buck/jvm/java/JavaPackageFinder.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/JavaSourceJar.java b/src/com/facebook/buck/jvm/java/JavaSourceJar.java similarity index 99% rename from src/com/facebook/buck/java/JavaSourceJar.java rename to src/com/facebook/buck/jvm/java/JavaSourceJar.java index dfa93045d55..3be91f261eb 100644 --- a/src/com/facebook/buck/java/JavaSourceJar.java +++ b/src/com/facebook/buck/jvm/java/JavaSourceJar.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static com.facebook.buck.zip.ZipStep.DEFAULT_COMPRESSION_LEVEL; diff --git a/src/com/facebook/buck/java/JavaSymbolFinder.java b/src/com/facebook/buck/jvm/java/JavaSymbolFinder.java similarity index 99% rename from src/com/facebook/buck/java/JavaSymbolFinder.java rename to src/com/facebook/buck/jvm/java/JavaSymbolFinder.java index 63fb44bde64..a61663e6685 100644 --- a/src/com/facebook/buck/java/JavaSymbolFinder.java +++ b/src/com/facebook/buck/jvm/java/JavaSymbolFinder.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.android.AndroidLibraryDescription; import com.facebook.buck.cli.BuckConfig; diff --git a/src/com/facebook/buck/java/JavaTest.java b/src/com/facebook/buck/jvm/java/JavaTest.java similarity index 99% rename from src/com/facebook/buck/java/JavaTest.java rename to src/com/facebook/buck/jvm/java/JavaTest.java index a20ca2efcf4..74ae0e0c625 100644 --- a/src/com/facebook/buck/java/JavaTest.java +++ b/src/com/facebook/buck/jvm/java/JavaTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; import com.facebook.buck.log.Logger; @@ -193,7 +193,7 @@ public ImmutableSet getSourceUnderTest() { /** * @param context That may be useful in producing the bootclasspath entries. */ - protected Set getBootClasspathEntries(ExecutionContext context) { + protected ImmutableSet getBootClasspathEntries(ExecutionContext context) { return ImmutableSet.of(); } @@ -510,7 +510,7 @@ public Set getClassNamesForSources() { * @param jarFilePath jar where the generated .class files were written */ @VisibleForTesting - static Set getClassNamesForSources( + static ImmutableSet getClassNamesForSources( Set sources, @Nullable Path jarFilePath, ProjectFilesystem projectFilesystem) { diff --git a/src/com/facebook/buck/java/JavaTestDescription.java b/src/com/facebook/buck/jvm/java/JavaTestDescription.java similarity index 99% rename from src/com/facebook/buck/java/JavaTestDescription.java rename to src/com/facebook/buck/jvm/java/JavaTestDescription.java index f011b03e80c..d106af64806 100644 --- a/src/com/facebook/buck/java/JavaTestDescription.java +++ b/src/com/facebook/buck/jvm/java/JavaTestDescription.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.cxx.CxxDescriptionEnhancer; import com.facebook.buck.cxx.CxxPlatform; diff --git a/src/com/facebook/buck/java/Javac.java b/src/com/facebook/buck/jvm/java/Javac.java similarity index 98% rename from src/com/facebook/buck/java/Javac.java rename to src/com/facebook/buck/jvm/java/Javac.java index c9dca18bfff..b173beeb644 100644 --- a/src/com/facebook/buck/java/Javac.java +++ b/src/com/facebook/buck/jvm/java/Javac.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/JavacErrorParser.java b/src/com/facebook/buck/jvm/java/JavacErrorParser.java similarity index 99% rename from src/com/facebook/buck/java/JavacErrorParser.java rename to src/com/facebook/buck/jvm/java/JavacErrorParser.java index 9addb1ee19d..f026a1eb5a5 100644 --- a/src/com/facebook/buck/java/JavacErrorParser.java +++ b/src/com/facebook/buck/jvm/java/JavacErrorParser.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; import com.google.common.base.Optional; diff --git a/src/com/facebook/buck/java/JavacStep.java b/src/com/facebook/buck/jvm/java/JavacStep.java similarity index 98% rename from src/com/facebook/buck/java/JavacStep.java rename to src/com/facebook/buck/jvm/java/JavacStep.java index e1f0dce5fbf..0ae965baa29 100644 --- a/src/com/facebook/buck/java/JavacStep.java +++ b/src/com/facebook/buck/jvm/java/JavacStep.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.event.CompilerErrorEvent; import com.facebook.buck.io.ProjectFilesystem; @@ -42,6 +42,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.annotation.Nullable; + /** * Command used to compile java libraries with a variety of ways to handle dependencies. */ @@ -97,6 +99,7 @@ public class JavacStep implements Step { CLASS_NOT_FOUND, CLASS_SYMBOL_NOT_FOUND); + @Nullable private static final String LINE_SEPARATOR = System.getProperty("line.separator"); public static interface SuggestBuildRules { @@ -284,7 +287,7 @@ ImmutableSet getClasspathEntries() { } @VisibleForTesting - Set getSrcs() { + ImmutableSet getSrcs() { return javaSourceFilePaths; } } diff --git a/src/com/facebook/buck/java/JavacToJarStepFactory.java b/src/com/facebook/buck/jvm/java/JavacToJarStepFactory.java similarity index 99% rename from src/com/facebook/buck/java/JavacToJarStepFactory.java rename to src/com/facebook/buck/jvm/java/JavacToJarStepFactory.java index 25ba9067cca..28dcc6e2757 100644 --- a/src/com/facebook/buck/java/JavacToJarStepFactory.java +++ b/src/com/facebook/buck/jvm/java/JavacToJarStepFactory.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/JdkProvidedInMemoryJavac.java b/src/com/facebook/buck/jvm/java/JdkProvidedInMemoryJavac.java similarity index 98% rename from src/com/facebook/buck/java/JdkProvidedInMemoryJavac.java rename to src/com/facebook/buck/jvm/java/JdkProvidedInMemoryJavac.java index c9ec6ede3ff..e84867b86aa 100644 --- a/src/com/facebook/buck/java/JdkProvidedInMemoryJavac.java +++ b/src/com/facebook/buck/jvm/java/JdkProvidedInMemoryJavac.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.rules.BuildRule; import com.facebook.buck.rules.RuleKeyBuilder; diff --git a/src/com/facebook/buck/java/Jsr199Javac.java b/src/com/facebook/buck/jvm/java/Jsr199Javac.java similarity index 98% rename from src/com/facebook/buck/java/Jsr199Javac.java rename to src/com/facebook/buck/jvm/java/Jsr199Javac.java index 61eafa2b1c5..c1c3e914091 100644 --- a/src/com/facebook/buck/java/Jsr199Javac.java +++ b/src/com/facebook/buck/jvm/java/Jsr199Javac.java @@ -14,14 +14,14 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.event.BuckEventBus; import com.facebook.buck.event.BuckTracingEventBusBridge; import com.facebook.buck.event.MissingSymbolEvent; import com.facebook.buck.event.api.BuckTracing; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.tracing.TranslatingJavacPhaseTracer; +import com.facebook.buck.jvm.java.tracing.TranslatingJavacPhaseTracer; import com.facebook.buck.log.Logger; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.SourcePathResolver; @@ -348,6 +348,7 @@ private Iterable createCompilationUnits( } else if (pathString.endsWith(SRC_ZIP) || pathString.endsWith(SRC_JAR)) { // For a Zip of .java files, create a JavaFileObject for each .java entry. ZipFile zipFile = new ZipFile(absolutifier.apply(path).toFile()); + boolean hasZipFileBeenUsed = false; for (Enumeration entries = zipFile.entries(); entries.hasMoreElements(); ) { @@ -356,8 +357,13 @@ private Iterable createCompilationUnits( continue; } + hasZipFileBeenUsed = true; compilationUnits.add(new ZipEntryJavaFileObject(zipFile, entry)); } + + if (!hasZipFileBeenUsed) { + zipFile.close(); + } } } return compilationUnits; diff --git a/src/com/facebook/buck/java/Keystore.java b/src/com/facebook/buck/jvm/java/Keystore.java similarity index 98% rename from src/com/facebook/buck/java/Keystore.java rename to src/com/facebook/buck/jvm/java/Keystore.java index a32b5852d29..ead9f3d917b 100644 --- a/src/com/facebook/buck/java/Keystore.java +++ b/src/com/facebook/buck/jvm/java/Keystore.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.rules.AbstractBuildRule; import com.facebook.buck.rules.AddToRuleKey; diff --git a/src/com/facebook/buck/java/KeystoreDescription.java b/src/com/facebook/buck/jvm/java/KeystoreDescription.java similarity index 98% rename from src/com/facebook/buck/java/KeystoreDescription.java rename to src/com/facebook/buck/jvm/java/KeystoreDescription.java index 2f8528a0a64..1736da63884 100644 --- a/src/com/facebook/buck/java/KeystoreDescription.java +++ b/src/com/facebook/buck/jvm/java/KeystoreDescription.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.BuildRuleParams; diff --git a/src/com/facebook/buck/java/MavenPublishable.java b/src/com/facebook/buck/jvm/java/MavenPublishable.java similarity index 96% rename from src/com/facebook/buck/java/MavenPublishable.java rename to src/com/facebook/buck/jvm/java/MavenPublishable.java index 875cd53dbe9..d7c22a43aa2 100644 --- a/src/com/facebook/buck/java/MavenPublishable.java +++ b/src/com/facebook/buck/jvm/java/MavenPublishable.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.rules.BuildRule; import com.google.common.collect.ImmutableSortedSet; diff --git a/src/com/facebook/buck/java/MavenUberJar.java b/src/com/facebook/buck/jvm/java/MavenUberJar.java similarity index 99% rename from src/com/facebook/buck/java/MavenUberJar.java rename to src/com/facebook/buck/jvm/java/MavenUberJar.java index 4316bebe487..15fb2a3f8e6 100644 --- a/src/com/facebook/buck/java/MavenUberJar.java +++ b/src/com/facebook/buck/jvm/java/MavenUberJar.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.rules.AbstractBuildRule; import com.facebook.buck.rules.BuildContext; diff --git a/src/com/facebook/buck/java/PrebuiltJar.java b/src/com/facebook/buck/jvm/java/PrebuiltJar.java similarity index 99% rename from src/com/facebook/buck/java/PrebuiltJar.java rename to src/com/facebook/buck/jvm/java/PrebuiltJar.java index c48a9742e07..615309c3b9b 100644 --- a/src/com/facebook/buck/java/PrebuiltJar.java +++ b/src/com/facebook/buck/jvm/java/PrebuiltJar.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static com.facebook.buck.rules.BuildableProperties.Kind.LIBRARY; diff --git a/src/com/facebook/buck/java/PrebuiltJarDescription.java b/src/com/facebook/buck/jvm/java/PrebuiltJarDescription.java similarity index 99% rename from src/com/facebook/buck/java/PrebuiltJarDescription.java rename to src/com/facebook/buck/jvm/java/PrebuiltJarDescription.java index 1e2296e4baf..1e47aa627bb 100644 --- a/src/com/facebook/buck/java/PrebuiltJarDescription.java +++ b/src/com/facebook/buck/jvm/java/PrebuiltJarDescription.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/ResourcesRootPackageFinder.java b/src/com/facebook/buck/jvm/java/ResourcesRootPackageFinder.java similarity index 98% rename from src/com/facebook/buck/java/ResourcesRootPackageFinder.java rename to src/com/facebook/buck/jvm/java/ResourcesRootPackageFinder.java index 6549df43a70..ce6a4f8b34c 100644 --- a/src/com/facebook/buck/java/ResourcesRootPackageFinder.java +++ b/src/com/facebook/buck/jvm/java/ResourcesRootPackageFinder.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.MorePaths; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/SrcRootsFinder.java b/src/com/facebook/buck/jvm/java/SrcRootsFinder.java similarity index 98% rename from src/com/facebook/buck/java/SrcRootsFinder.java rename to src/com/facebook/buck/jvm/java/SrcRootsFinder.java index 22d9ec5abaf..d62270a3f18 100644 --- a/src/com/facebook/buck/java/SrcRootsFinder.java +++ b/src/com/facebook/buck/jvm/java/SrcRootsFinder.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.io.ProjectFilesystem; import com.google.common.collect.ImmutableSet; diff --git a/src/com/facebook/buck/java/TestType.java b/src/com/facebook/buck/jvm/java/TestType.java similarity index 94% rename from src/com/facebook/buck/java/TestType.java rename to src/com/facebook/buck/jvm/java/TestType.java index 75a81d9e5d3..d4ecb4cda3b 100644 --- a/src/com/facebook/buck/java/TestType.java +++ b/src/com/facebook/buck/jvm/java/TestType.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; public enum TestType { JUNIT, diff --git a/src/com/facebook/buck/java/TracingProcessorWrapper.java b/src/com/facebook/buck/jvm/java/TracingProcessorWrapper.java similarity index 99% rename from src/com/facebook/buck/java/TracingProcessorWrapper.java rename to src/com/facebook/buck/jvm/java/TracingProcessorWrapper.java index 3c83a51bd01..68ec4ef86fe 100644 --- a/src/com/facebook/buck/java/TracingProcessorWrapper.java +++ b/src/com/facebook/buck/jvm/java/TracingProcessorWrapper.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.event.BuckEventBus; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/ZipEntryJavaFileObject.java b/src/com/facebook/buck/jvm/java/ZipEntryJavaFileObject.java similarity index 98% rename from src/com/facebook/buck/java/ZipEntryJavaFileObject.java rename to src/com/facebook/buck/jvm/java/ZipEntryJavaFileObject.java index 0cf430c68e9..092f66a0aa3 100644 --- a/src/com/facebook/buck/java/ZipEntryJavaFileObject.java +++ b/src/com/facebook/buck/jvm/java/ZipEntryJavaFileObject.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.google.common.base.Charsets; import com.google.common.io.CharStreams; diff --git a/src/com/facebook/buck/java/abi/AbiWriterProtocol.java b/src/com/facebook/buck/jvm/java/abi/AbiWriterProtocol.java similarity index 92% rename from src/com/facebook/buck/java/abi/AbiWriterProtocol.java rename to src/com/facebook/buck/jvm/java/abi/AbiWriterProtocol.java index 69ad723a993..8c8dd0de33c 100644 --- a/src/com/facebook/buck/java/abi/AbiWriterProtocol.java +++ b/src/com/facebook/buck/jvm/java/abi/AbiWriterProtocol.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; /** * Shared information between {@link StubJar} and its callers. @@ -27,7 +27,7 @@ private AbiWriterProtocol() {} "buck.output_abi_file"; /** - * The integrity of this value is verified by {@code com.facebook.buck.java.abi.AbiWriterTest}. + * The integrity of this value is verified by {@code com.facebook.buck.jvm.java.abi.AbiWriterTest}. */ public static final String EMPTY_ABI_KEY = "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33"; } diff --git a/src/com/facebook/buck/java/abi/AnnotationMirror.java b/src/com/facebook/buck/jvm/java/abi/AnnotationMirror.java similarity index 98% rename from src/com/facebook/buck/java/abi/AnnotationMirror.java rename to src/com/facebook/buck/jvm/java/abi/AnnotationMirror.java index df044255c5b..e182f97340c 100644 --- a/src/com/facebook/buck/java/abi/AnnotationMirror.java +++ b/src/com/facebook/buck/jvm/java/abi/AnnotationMirror.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import com.google.common.collect.Maps; diff --git a/src/com/facebook/buck/java/abi/AnnotationValueMirror.java b/src/com/facebook/buck/jvm/java/abi/AnnotationValueMirror.java similarity index 99% rename from src/com/facebook/buck/java/abi/AnnotationValueMirror.java rename to src/com/facebook/buck/jvm/java/abi/AnnotationValueMirror.java index c109c1c0276..216773eb3f7 100644 --- a/src/com/facebook/buck/java/abi/AnnotationValueMirror.java +++ b/src/com/facebook/buck/jvm/java/abi/AnnotationValueMirror.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.Opcodes; diff --git a/src/com/facebook/buck/java/abi/ApiStubber.java b/src/com/facebook/buck/jvm/java/abi/ApiStubber.java similarity index 96% rename from src/com/facebook/buck/java/abi/ApiStubber.java rename to src/com/facebook/buck/jvm/java/abi/ApiStubber.java index 795456620b2..5db08b161c5 100644 --- a/src/com/facebook/buck/java/abi/ApiStubber.java +++ b/src/com/facebook/buck/jvm/java/abi/ApiStubber.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import com.facebook.buck.io.ProjectFilesystem; diff --git a/src/com/facebook/buck/java/abi/BUCK b/src/com/facebook/buck/jvm/java/abi/BUCK similarity index 76% rename from src/com/facebook/buck/java/abi/BUCK rename to src/com/facebook/buck/jvm/java/abi/BUCK index 755351e0915..9db3af211f5 100644 --- a/src/com/facebook/buck/java/abi/BUCK +++ b/src/com/facebook/buck/jvm/java/abi/BUCK @@ -6,7 +6,7 @@ java_library( name = 'abi', srcs = glob(['*.java'], excludes = PROTOCOL_SRCS + ['ApiStubber.java']), tests = [ - '//test/com/facebook/buck/java/abi:abi', + '//test/com/facebook/buck/jvm/java/abi:abi', ], deps = [ '//src/com/facebook/buck/io:io', @@ -15,8 +15,8 @@ java_library( '//third-party/java/jsr:jsr305', ], visibility = [ - '//src/com/facebook/buck/java:steps', - '//test/com/facebook/buck/java/abi:abi' + '//src/com/facebook/buck/jvm/java:steps', + '//test/com/facebook/buck/jvm/java/abi:abi' ], ) @@ -30,7 +30,7 @@ java_library( java_binary( name = 'api-stubber', - main_class = 'com.facebook.buck.java.abi.ApiStubber', + main_class = 'com.facebook.buck.jvm.java.abi.ApiStubber', deps = [ ':lib-api-stubber', ], diff --git a/src/com/facebook/buck/java/abi/ClassMirror.java b/src/com/facebook/buck/jvm/java/abi/ClassMirror.java similarity index 99% rename from src/com/facebook/buck/java/abi/ClassMirror.java rename to src/com/facebook/buck/jvm/java/abi/ClassMirror.java index 548b29f3bba..e0fe4ed84f0 100644 --- a/src/com/facebook/buck/java/abi/ClassMirror.java +++ b/src/com/facebook/buck/jvm/java/abi/ClassMirror.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import com.google.common.base.Preconditions; import com.google.common.base.Strings; diff --git a/src/com/facebook/buck/java/abi/DirectoryWalker.java b/src/com/facebook/buck/jvm/java/abi/DirectoryWalker.java similarity index 98% rename from src/com/facebook/buck/java/abi/DirectoryWalker.java rename to src/com/facebook/buck/jvm/java/abi/DirectoryWalker.java index e4bc98c2f8a..2fef2b74787 100644 --- a/src/com/facebook/buck/java/abi/DirectoryWalker.java +++ b/src/com/facebook/buck/jvm/java/abi/DirectoryWalker.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import com.google.common.base.Preconditions; diff --git a/src/com/facebook/buck/java/abi/EnumMirror.java b/src/com/facebook/buck/jvm/java/abi/EnumMirror.java similarity index 95% rename from src/com/facebook/buck/java/abi/EnumMirror.java rename to src/com/facebook/buck/jvm/java/abi/EnumMirror.java index c5411122736..16187e55c96 100644 --- a/src/com/facebook/buck/java/abi/EnumMirror.java +++ b/src/com/facebook/buck/jvm/java/abi/EnumMirror.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; public class EnumMirror { public final String desc; diff --git a/src/com/facebook/buck/java/abi/FieldMirror.java b/src/com/facebook/buck/jvm/java/abi/FieldMirror.java similarity index 96% rename from src/com/facebook/buck/java/abi/FieldMirror.java rename to src/com/facebook/buck/jvm/java/abi/FieldMirror.java index 88732e1350a..727fc8e1828 100644 --- a/src/com/facebook/buck/java/abi/FieldMirror.java +++ b/src/com/facebook/buck/jvm/java/abi/FieldMirror.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.FieldNode; diff --git a/src/com/facebook/buck/java/abi/FileAction.java b/src/com/facebook/buck/jvm/java/abi/FileAction.java similarity index 95% rename from src/com/facebook/buck/java/abi/FileAction.java rename to src/com/facebook/buck/jvm/java/abi/FileAction.java index 1c58683722b..f1793e40ec2 100644 --- a/src/com/facebook/buck/java/abi/FileAction.java +++ b/src/com/facebook/buck/jvm/java/abi/FileAction.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/facebook/buck/java/abi/MethodMirror.java b/src/com/facebook/buck/jvm/java/abi/MethodMirror.java similarity index 99% rename from src/com/facebook/buck/java/abi/MethodMirror.java rename to src/com/facebook/buck/jvm/java/abi/MethodMirror.java index 2c3e9c0544c..eeb684e36a7 100644 --- a/src/com/facebook/buck/java/abi/MethodMirror.java +++ b/src/com/facebook/buck/jvm/java/abi/MethodMirror.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; diff --git a/src/com/facebook/buck/java/abi/StubJar.java b/src/com/facebook/buck/jvm/java/abi/StubJar.java similarity index 98% rename from src/com/facebook/buck/java/abi/StubJar.java rename to src/com/facebook/buck/jvm/java/abi/StubJar.java index c2493875441..be5b9fc3d60 100644 --- a/src/com/facebook/buck/java/abi/StubJar.java +++ b/src/com/facebook/buck/jvm/java/abi/StubJar.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import static org.objectweb.asm.ClassReader.SKIP_CODE; import static org.objectweb.asm.ClassReader.SKIP_DEBUG; diff --git a/src/com/facebook/buck/java/abi/Walker.java b/src/com/facebook/buck/jvm/java/abi/Walker.java similarity index 94% rename from src/com/facebook/buck/java/abi/Walker.java rename to src/com/facebook/buck/jvm/java/abi/Walker.java index 2771064a700..bc21b814e59 100644 --- a/src/com/facebook/buck/java/abi/Walker.java +++ b/src/com/facebook/buck/jvm/java/abi/Walker.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import java.io.IOException; diff --git a/src/com/facebook/buck/java/abi/Walkers.java b/src/com/facebook/buck/jvm/java/abi/Walkers.java similarity index 96% rename from src/com/facebook/buck/java/abi/Walkers.java rename to src/com/facebook/buck/jvm/java/abi/Walkers.java index adc2baeaffd..59dad5725f2 100644 --- a/src/com/facebook/buck/java/abi/Walkers.java +++ b/src/com/facebook/buck/jvm/java/abi/Walkers.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import com.google.common.base.Preconditions; diff --git a/src/com/facebook/buck/java/abi/ZipWalker.java b/src/com/facebook/buck/jvm/java/abi/ZipWalker.java similarity index 98% rename from src/com/facebook/buck/java/abi/ZipWalker.java rename to src/com/facebook/buck/jvm/java/abi/ZipWalker.java index f5c6cc5368f..0a2bd505cf3 100644 --- a/src/com/facebook/buck/java/abi/ZipWalker.java +++ b/src/com/facebook/buck/jvm/java/abi/ZipWalker.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; diff --git a/src/com/facebook/buck/java/classes/AbstractFileLike.java b/src/com/facebook/buck/jvm/java/classes/AbstractFileLike.java similarity index 94% rename from src/com/facebook/buck/java/classes/AbstractFileLike.java rename to src/com/facebook/buck/jvm/java/classes/AbstractFileLike.java index d3c42f21c53..fb6c218e87c 100644 --- a/src/com/facebook/buck/java/classes/AbstractFileLike.java +++ b/src/com/facebook/buck/jvm/java/classes/AbstractFileLike.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.classes; +package com.facebook.buck.jvm.java.classes; public abstract class AbstractFileLike implements FileLike { diff --git a/src/com/facebook/buck/java/classes/BUCK b/src/com/facebook/buck/jvm/java/classes/BUCK similarity index 83% rename from src/com/facebook/buck/java/classes/BUCK rename to src/com/facebook/buck/jvm/java/classes/BUCK index ef26e809c7c..8e5c2f6b591 100644 --- a/src/com/facebook/buck/java/classes/BUCK +++ b/src/com/facebook/buck/jvm/java/classes/BUCK @@ -2,7 +2,7 @@ java_library( name = 'classes', srcs = glob(['*.java']), tests = [ - '//test/com/facebook/buck/java/classes:classes', + '//test/com/facebook/buck/jvm/java/classes:classes', ], deps = [ '//third-party/java/guava:guava', diff --git a/src/com/facebook/buck/java/classes/ClasspathTraversal.java b/src/com/facebook/buck/jvm/java/classes/ClasspathTraversal.java similarity index 99% rename from src/com/facebook/buck/java/classes/ClasspathTraversal.java rename to src/com/facebook/buck/jvm/java/classes/ClasspathTraversal.java index b98b18caff1..68a6f8493ae 100644 --- a/src/com/facebook/buck/java/classes/ClasspathTraversal.java +++ b/src/com/facebook/buck/jvm/java/classes/ClasspathTraversal.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.classes; +package com.facebook.buck.jvm.java.classes; import com.facebook.buck.io.DirectoryTraversal; import com.facebook.buck.io.MorePaths; diff --git a/src/com/facebook/buck/java/classes/ClasspathTraverser.java b/src/com/facebook/buck/jvm/java/classes/ClasspathTraverser.java similarity index 94% rename from src/com/facebook/buck/java/classes/ClasspathTraverser.java rename to src/com/facebook/buck/jvm/java/classes/ClasspathTraverser.java index 4be65f0d52e..52d1659ffa5 100644 --- a/src/com/facebook/buck/java/classes/ClasspathTraverser.java +++ b/src/com/facebook/buck/jvm/java/classes/ClasspathTraverser.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.classes; +package com.facebook.buck.jvm.java.classes; import java.io.IOException; diff --git a/src/com/facebook/buck/java/classes/DefaultClasspathTraverser.java b/src/com/facebook/buck/jvm/java/classes/DefaultClasspathTraverser.java similarity index 95% rename from src/com/facebook/buck/java/classes/DefaultClasspathTraverser.java rename to src/com/facebook/buck/jvm/java/classes/DefaultClasspathTraverser.java index c865085a2d5..4fdec052c99 100644 --- a/src/com/facebook/buck/java/classes/DefaultClasspathTraverser.java +++ b/src/com/facebook/buck/jvm/java/classes/DefaultClasspathTraverser.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.classes; +package com.facebook.buck.jvm.java.classes; import java.io.IOException; diff --git a/src/com/facebook/buck/java/classes/FileLike.java b/src/com/facebook/buck/jvm/java/classes/FileLike.java similarity index 97% rename from src/com/facebook/buck/java/classes/FileLike.java rename to src/com/facebook/buck/jvm/java/classes/FileLike.java index dffe4816fa6..e648408c49a 100644 --- a/src/com/facebook/buck/java/classes/FileLike.java +++ b/src/com/facebook/buck/jvm/java/classes/FileLike.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.classes; +package com.facebook.buck.jvm.java.classes; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/facebook/buck/java/classes/FileLikeCharSource.java b/src/com/facebook/buck/jvm/java/classes/FileLikeCharSource.java similarity index 96% rename from src/com/facebook/buck/java/classes/FileLikeCharSource.java rename to src/com/facebook/buck/jvm/java/classes/FileLikeCharSource.java index 55173b31c1a..c2716530265 100644 --- a/src/com/facebook/buck/java/classes/FileLikeCharSource.java +++ b/src/com/facebook/buck/jvm/java/classes/FileLikeCharSource.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.classes; +package com.facebook.buck.jvm.java.classes; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/src/com/facebook/buck/java/classes/FileLikes.java b/src/com/facebook/buck/jvm/java/classes/FileLikes.java similarity index 96% rename from src/com/facebook/buck/java/classes/FileLikes.java rename to src/com/facebook/buck/jvm/java/classes/FileLikes.java index f3cc837b616..5b613f13839 100644 --- a/src/com/facebook/buck/java/classes/FileLikes.java +++ b/src/com/facebook/buck/jvm/java/classes/FileLikes.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.classes; +package com.facebook.buck.jvm.java.classes; /** * Utilities for common operations when working with {@link FileLike}s. diff --git a/src/com/facebook/buck/java/coverage/BUCK b/src/com/facebook/buck/jvm/java/coverage/BUCK similarity index 74% rename from src/com/facebook/buck/java/coverage/BUCK rename to src/com/facebook/buck/jvm/java/coverage/BUCK index e130828b474..1d4c56eaa6f 100644 --- a/src/com/facebook/buck/java/coverage/BUCK +++ b/src/com/facebook/buck/jvm/java/coverage/BUCK @@ -8,7 +8,7 @@ java_library( java_binary( name = 'report-generator', - main_class = 'com.facebook.buck.java.coverage.ReportGenerator', + main_class = 'com.facebook.buck.jvm.java.coverage.ReportGenerator', blacklist = [ '.*SF', '.*RSA', @@ -19,6 +19,6 @@ java_binary( visibility = [ '//programs:bucklib', '//programs:bucklib-no-nailgun', - '//src/com/facebook/buck/java:steps', + '//src/com/facebook/buck/jvm/java:steps', ] ) diff --git a/src/com/facebook/buck/java/coverage/ReportGenerator.java b/src/com/facebook/buck/jvm/java/coverage/ReportGenerator.java similarity index 99% rename from src/com/facebook/buck/java/coverage/ReportGenerator.java rename to src/com/facebook/buck/jvm/java/coverage/ReportGenerator.java index 88765929443..17ce7a54fdd 100644 --- a/src/com/facebook/buck/java/coverage/ReportGenerator.java +++ b/src/com/facebook/buck/jvm/java/coverage/ReportGenerator.java @@ -11,7 +11,7 @@ * Contributors: * Brock Janiczak - initial API and implementation *******************************************************************************/ -package com.facebook.buck.java.coverage; +package com.facebook.buck.jvm.java.coverage; import org.jacoco.core.analysis.Analyzer; import org.jacoco.core.analysis.CoverageBuilder; diff --git a/src/com/facebook/buck/java/intellij/AbstractIjFolder.java b/src/com/facebook/buck/jvm/java/intellij/AbstractIjFolder.java similarity index 98% rename from src/com/facebook/buck/java/intellij/AbstractIjFolder.java rename to src/com/facebook/buck/jvm/java/intellij/AbstractIjFolder.java index 3377561457f..90e3269e201 100644 --- a/src/com/facebook/buck/java/intellij/AbstractIjFolder.java +++ b/src/com/facebook/buck/jvm/java/intellij/AbstractIjFolder.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.util.immutables.BuckStyleImmutable; import com.google.common.base.Preconditions; diff --git a/src/com/facebook/buck/java/intellij/AbstractIjLibrary.java b/src/com/facebook/buck/jvm/java/intellij/AbstractIjLibrary.java similarity index 98% rename from src/com/facebook/buck/java/intellij/AbstractIjLibrary.java rename to src/com/facebook/buck/jvm/java/intellij/AbstractIjLibrary.java index 86b907d7b0c..c54e9089b5a 100644 --- a/src/com/facebook/buck/java/intellij/AbstractIjLibrary.java +++ b/src/com/facebook/buck/jvm/java/intellij/AbstractIjLibrary.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.rules.TargetNode; import com.facebook.buck.util.immutables.BuckStyleImmutable; diff --git a/src/com/facebook/buck/java/intellij/AbstractIjModule.java b/src/com/facebook/buck/jvm/java/intellij/AbstractIjModule.java similarity index 99% rename from src/com/facebook/buck/java/intellij/AbstractIjModule.java rename to src/com/facebook/buck/jvm/java/intellij/AbstractIjModule.java index 14bff1d4954..eb08e68fb29 100644 --- a/src/com/facebook/buck/java/intellij/AbstractIjModule.java +++ b/src/com/facebook/buck/jvm/java/intellij/AbstractIjModule.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.TargetNode; diff --git a/src/com/facebook/buck/java/intellij/AbstractIjModuleAndroidFacet.java b/src/com/facebook/buck/jvm/java/intellij/AbstractIjModuleAndroidFacet.java similarity index 97% rename from src/com/facebook/buck/java/intellij/AbstractIjModuleAndroidFacet.java rename to src/com/facebook/buck/jvm/java/intellij/AbstractIjModuleAndroidFacet.java index 4d640536331..68d7db5fd85 100644 --- a/src/com/facebook/buck/java/intellij/AbstractIjModuleAndroidFacet.java +++ b/src/com/facebook/buck/jvm/java/intellij/AbstractIjModuleAndroidFacet.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.rules.SourcePath; import com.facebook.buck.util.immutables.BuckStyleImmutable; diff --git a/src/com/facebook/buck/java/intellij/BUCK b/src/com/facebook/buck/jvm/java/intellij/BUCK similarity index 83% rename from src/com/facebook/buck/java/intellij/BUCK rename to src/com/facebook/buck/jvm/java/intellij/BUCK index 812cd25fac2..a34d4a017e2 100644 --- a/src/com/facebook/buck/java/intellij/BUCK +++ b/src/com/facebook/buck/jvm/java/intellij/BUCK @@ -14,11 +14,11 @@ java_immutables_library( '//src/com/facebook/buck/cxx:rules', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:autodeps', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:packagefinder', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:autodeps', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:packagefinder', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/rules:build_rule', diff --git a/src/com/facebook/buck/java/intellij/CompilerXml.java b/src/com/facebook/buck/jvm/java/intellij/CompilerXml.java similarity index 98% rename from src/com/facebook/buck/java/intellij/CompilerXml.java rename to src/com/facebook/buck/jvm/java/intellij/CompilerXml.java index 76dc4108296..7e25f86ffa5 100644 --- a/src/com/facebook/buck/java/intellij/CompilerXml.java +++ b/src/com/facebook/buck/jvm/java/intellij/CompilerXml.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.util.BuckConstant; import com.google.common.base.Charsets; diff --git a/src/com/facebook/buck/java/intellij/DefaultIjLibraryFactory.java b/src/com/facebook/buck/jvm/java/intellij/DefaultIjLibraryFactory.java similarity index 98% rename from src/com/facebook/buck/java/intellij/DefaultIjLibraryFactory.java rename to src/com/facebook/buck/jvm/java/intellij/DefaultIjLibraryFactory.java index caab4db92db..3381592a3dd 100644 --- a/src/com/facebook/buck/java/intellij/DefaultIjLibraryFactory.java +++ b/src/com/facebook/buck/jvm/java/intellij/DefaultIjLibraryFactory.java @@ -14,10 +14,10 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.android.AndroidPrebuiltAarDescription; -import com.facebook.buck.java.PrebuiltJarDescription; +import com.facebook.buck.jvm.java.PrebuiltJarDescription; import com.facebook.buck.rules.BuildRuleType; import com.facebook.buck.rules.SourcePath; import com.facebook.buck.rules.SourcePathResolver; diff --git a/src/com/facebook/buck/java/intellij/ExportedDepsClosureResolver.java b/src/com/facebook/buck/jvm/java/intellij/ExportedDepsClosureResolver.java similarity index 96% rename from src/com/facebook/buck/java/intellij/ExportedDepsClosureResolver.java rename to src/com/facebook/buck/jvm/java/intellij/ExportedDepsClosureResolver.java index c81149befea..7b118b0fb23 100644 --- a/src/com/facebook/buck/java/intellij/ExportedDepsClosureResolver.java +++ b/src/com/facebook/buck/jvm/java/intellij/ExportedDepsClosureResolver.java @@ -14,10 +14,10 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.android.AndroidLibraryDescription; -import com.facebook.buck.java.JavaLibraryDescription; +import com.facebook.buck.jvm.java.JavaLibraryDescription; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.TargetGraph; import com.facebook.buck.rules.TargetNode; diff --git a/src/com/facebook/buck/java/intellij/IjDependencyListBuilder.java b/src/com/facebook/buck/jvm/java/intellij/IjDependencyListBuilder.java similarity index 99% rename from src/com/facebook/buck/java/intellij/IjDependencyListBuilder.java rename to src/com/facebook/buck/jvm/java/intellij/IjDependencyListBuilder.java index 8de0e14ebe3..3a0a4bb8624 100644 --- a/src/com/facebook/buck/java/intellij/IjDependencyListBuilder.java +++ b/src/com/facebook/buck/jvm/java/intellij/IjDependencyListBuilder.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.util.immutables.BuckStyleImmutable; import com.google.common.base.Optional; diff --git a/src/com/facebook/buck/java/intellij/IjLibraryFactory.java b/src/com/facebook/buck/jvm/java/intellij/IjLibraryFactory.java similarity index 96% rename from src/com/facebook/buck/java/intellij/IjLibraryFactory.java rename to src/com/facebook/buck/jvm/java/intellij/IjLibraryFactory.java index d806a70d43a..ca8516e6588 100644 --- a/src/com/facebook/buck/java/intellij/IjLibraryFactory.java +++ b/src/com/facebook/buck/jvm/java/intellij/IjLibraryFactory.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.rules.TargetNode; import com.google.common.base.Optional; diff --git a/src/com/facebook/buck/java/intellij/IjModuleFactory.java b/src/com/facebook/buck/jvm/java/intellij/IjModuleFactory.java similarity index 99% rename from src/com/facebook/buck/java/intellij/IjModuleFactory.java rename to src/com/facebook/buck/jvm/java/intellij/IjModuleFactory.java index 9fefd9ea1c1..7f14306243f 100644 --- a/src/com/facebook/buck/java/intellij/IjModuleFactory.java +++ b/src/com/facebook/buck/jvm/java/intellij/IjModuleFactory.java @@ -14,14 +14,14 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.android.AndroidBinaryDescription; import com.facebook.buck.android.AndroidLibraryDescription; import com.facebook.buck.android.AndroidResourceDescription; import com.facebook.buck.android.RobolectricTestDescription; -import com.facebook.buck.java.JavaLibraryDescription; -import com.facebook.buck.java.JavaTestDescription; +import com.facebook.buck.jvm.java.JavaLibraryDescription; +import com.facebook.buck.jvm.java.JavaTestDescription; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.HasBuildTarget; import com.facebook.buck.rules.BuildRuleType; diff --git a/src/com/facebook/buck/java/intellij/IjModuleGraph.java b/src/com/facebook/buck/jvm/java/intellij/IjModuleGraph.java similarity index 99% rename from src/com/facebook/buck/java/intellij/IjModuleGraph.java rename to src/com/facebook/buck/jvm/java/intellij/IjModuleGraph.java index c7bf4e172be..0e9de4c4212 100644 --- a/src/com/facebook/buck/java/intellij/IjModuleGraph.java +++ b/src/com/facebook/buck/jvm/java/intellij/IjModuleGraph.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.TargetGraph; diff --git a/src/com/facebook/buck/java/intellij/IjProject.java b/src/com/facebook/buck/jvm/java/intellij/IjProject.java similarity index 96% rename from src/com/facebook/buck/java/intellij/IjProject.java rename to src/com/facebook/buck/jvm/java/intellij/IjProject.java index 71a530e9d01..f38950311a6 100644 --- a/src/com/facebook/buck/java/intellij/IjProject.java +++ b/src/com/facebook/buck/jvm/java/intellij/IjProject.java @@ -14,14 +14,14 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.android.AndroidLibraryGraphEnhancer; import com.facebook.buck.android.DummyRDotJava; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaFileParser; -import com.facebook.buck.java.JavaLibrary; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaFileParser; +import com.facebook.buck.jvm.java.JavaLibrary; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.BuildRule; import com.facebook.buck.rules.BuildRuleResolver; diff --git a/src/com/facebook/buck/java/intellij/IjProjectElement.java b/src/com/facebook/buck/jvm/java/intellij/IjProjectElement.java similarity index 96% rename from src/com/facebook/buck/java/intellij/IjProjectElement.java rename to src/com/facebook/buck/jvm/java/intellij/IjProjectElement.java index efcc37c92a7..fd39d70b946 100644 --- a/src/com/facebook/buck/java/intellij/IjProjectElement.java +++ b/src/com/facebook/buck/jvm/java/intellij/IjProjectElement.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.rules.TargetNode; import com.google.common.collect.ImmutableSet; diff --git a/src/com/facebook/buck/java/intellij/IjProjectTemplateDataPreparer.java b/src/com/facebook/buck/jvm/java/intellij/IjProjectTemplateDataPreparer.java similarity index 99% rename from src/com/facebook/buck/java/intellij/IjProjectTemplateDataPreparer.java rename to src/com/facebook/buck/jvm/java/intellij/IjProjectTemplateDataPreparer.java index 96f3fe1f5e6..3311afb486d 100644 --- a/src/com/facebook/buck/java/intellij/IjProjectTemplateDataPreparer.java +++ b/src/com/facebook/buck/jvm/java/intellij/IjProjectTemplateDataPreparer.java @@ -14,10 +14,10 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.rules.TargetNode; import com.facebook.buck.util.immutables.BuckStyleImmutable; import com.google.common.annotations.VisibleForTesting; diff --git a/src/com/facebook/buck/java/intellij/IjProjectWriter.java b/src/com/facebook/buck/jvm/java/intellij/IjProjectWriter.java similarity index 99% rename from src/com/facebook/buck/java/intellij/IjProjectWriter.java rename to src/com/facebook/buck/jvm/java/intellij/IjProjectWriter.java index bedaa2f01f6..2f0dbefb73c 100644 --- a/src/com/facebook/buck/java/intellij/IjProjectWriter.java +++ b/src/com/facebook/buck/jvm/java/intellij/IjProjectWriter.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.io.ProjectFilesystem; import com.google.common.annotations.VisibleForTesting; diff --git a/src/com/facebook/buck/java/intellij/IntellijConfig.java b/src/com/facebook/buck/jvm/java/intellij/IntellijConfig.java similarity index 97% rename from src/com/facebook/buck/java/intellij/IntellijConfig.java rename to src/com/facebook/buck/jvm/java/intellij/IntellijConfig.java index fc3856e71a6..39295150bb5 100644 --- a/src/com/facebook/buck/java/intellij/IntellijConfig.java +++ b/src/com/facebook/buck/jvm/java/intellij/IntellijConfig.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.cli.BuckConfig; import com.google.common.base.Optional; diff --git a/src/com/facebook/buck/java/intellij/ParsingJavaPackageFinder.java b/src/com/facebook/buck/jvm/java/intellij/ParsingJavaPackageFinder.java similarity index 96% rename from src/com/facebook/buck/java/intellij/ParsingJavaPackageFinder.java rename to src/com/facebook/buck/jvm/java/intellij/ParsingJavaPackageFinder.java index 09a0868feb3..6095ab1ad19 100644 --- a/src/com/facebook/buck/java/intellij/ParsingJavaPackageFinder.java +++ b/src/com/facebook/buck/jvm/java/intellij/ParsingJavaPackageFinder.java @@ -14,13 +14,13 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.io.MorePaths; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.DefaultJavaPackageFinder; -import com.facebook.buck.java.JavaFileParser; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.DefaultJavaPackageFinder; +import com.facebook.buck.jvm.java.JavaFileParser; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.util.Optionals; import com.google.common.base.Function; diff --git a/src/com/facebook/buck/java/intellij/Project.java b/src/com/facebook/buck/jvm/java/intellij/Project.java similarity index 98% rename from src/com/facebook/buck/java/intellij/Project.java rename to src/com/facebook/buck/jvm/java/intellij/Project.java index faffaa092d8..7b96e50147e 100644 --- a/src/com/facebook/buck/java/intellij/Project.java +++ b/src/com/facebook/buck/jvm/java/intellij/Project.java @@ -14,10 +14,10 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; -import static com.facebook.buck.java.intellij.SerializableAndroidAar.createSerializableAndroidAar; -import static com.facebook.buck.java.intellij.SerializableIntellijSettings.createSerializableIntellijSettings; +import static com.facebook.buck.jvm.java.intellij.SerializableAndroidAar.createSerializableAndroidAar; +import static com.facebook.buck.jvm.java.intellij.SerializableIntellijSettings.createSerializableIntellijSettings; import static com.facebook.buck.rules.BuildableProperties.Kind.ANDROID; import static com.facebook.buck.rules.BuildableProperties.Kind.LIBRARY; import static com.facebook.buck.rules.BuildableProperties.Kind.PACKAGING; @@ -34,11 +34,11 @@ import com.facebook.buck.cxx.CxxLibrary; import com.facebook.buck.graph.AbstractBreadthFirstTraversal; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.AnnotationProcessingParams; -import com.facebook.buck.java.JavaBinary; -import com.facebook.buck.java.JavaLibrary; -import com.facebook.buck.java.JavaPackageFinder; -import com.facebook.buck.java.PrebuiltJar; +import com.facebook.buck.jvm.java.AnnotationProcessingParams; +import com.facebook.buck.jvm.java.JavaBinary; +import com.facebook.buck.jvm.java.JavaLibrary; +import com.facebook.buck.jvm.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.PrebuiltJar; import com.facebook.buck.log.Logger; import com.facebook.buck.model.BuildFileTree; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/intellij/SerializableAndroidAar.java b/src/com/facebook/buck/jvm/java/intellij/SerializableAndroidAar.java similarity index 97% rename from src/com/facebook/buck/java/intellij/SerializableAndroidAar.java rename to src/com/facebook/buck/jvm/java/intellij/SerializableAndroidAar.java index 33d571d7580..da372fa4662 100644 --- a/src/com/facebook/buck/java/intellij/SerializableAndroidAar.java +++ b/src/com/facebook/buck/jvm/java/intellij/SerializableAndroidAar.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.android.AndroidPrebuiltAar; import com.facebook.buck.rules.SourcePath; diff --git a/src/com/facebook/buck/java/intellij/SerializableDependentModule.java b/src/com/facebook/buck/jvm/java/intellij/SerializableDependentModule.java similarity index 99% rename from src/com/facebook/buck/java/intellij/SerializableDependentModule.java rename to src/com/facebook/buck/jvm/java/intellij/SerializableDependentModule.java index 10d0ba74f49..773c2b77cd2 100644 --- a/src/com/facebook/buck/java/intellij/SerializableDependentModule.java +++ b/src/com/facebook/buck/jvm/java/intellij/SerializableDependentModule.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.model.BuildTarget; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/com/facebook/buck/java/intellij/SerializableIntellijSettings.java b/src/com/facebook/buck/jvm/java/intellij/SerializableIntellijSettings.java similarity index 97% rename from src/com/facebook/buck/java/intellij/SerializableIntellijSettings.java rename to src/com/facebook/buck/jvm/java/intellij/SerializableIntellijSettings.java index ac48dc90a33..c3b36296a3a 100644 --- a/src/com/facebook/buck/java/intellij/SerializableIntellijSettings.java +++ b/src/com/facebook/buck/jvm/java/intellij/SerializableIntellijSettings.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/com/facebook/buck/java/intellij/SerializableModule.java b/src/com/facebook/buck/jvm/java/intellij/SerializableModule.java similarity index 99% rename from src/com/facebook/buck/java/intellij/SerializableModule.java rename to src/com/facebook/buck/jvm/java/intellij/SerializableModule.java index 6cdc40917ad..319fbe9031f 100644 --- a/src/com/facebook/buck/java/intellij/SerializableModule.java +++ b/src/com/facebook/buck/jvm/java/intellij/SerializableModule.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.io.MorePaths; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/intellij/Util.java b/src/com/facebook/buck/jvm/java/intellij/Util.java similarity index 96% rename from src/com/facebook/buck/java/intellij/Util.java rename to src/com/facebook/buck/jvm/java/intellij/Util.java index 2f0961d7407..85425fbe832 100644 --- a/src/com/facebook/buck/java/intellij/Util.java +++ b/src/com/facebook/buck/jvm/java/intellij/Util.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/intellij/ij-library.st b/src/com/facebook/buck/jvm/java/intellij/ij-library.st similarity index 100% rename from src/com/facebook/buck/java/intellij/ij-library.st rename to src/com/facebook/buck/jvm/java/intellij/ij-library.st diff --git a/src/com/facebook/buck/java/intellij/ij-module-index.st b/src/com/facebook/buck/jvm/java/intellij/ij-module-index.st similarity index 100% rename from src/com/facebook/buck/java/intellij/ij-module-index.st rename to src/com/facebook/buck/jvm/java/intellij/ij-module-index.st diff --git a/src/com/facebook/buck/java/intellij/ij-module.st b/src/com/facebook/buck/jvm/java/intellij/ij-module.st similarity index 100% rename from src/com/facebook/buck/java/intellij/ij-module.st rename to src/com/facebook/buck/jvm/java/intellij/ij-module.st diff --git a/src/com/facebook/buck/java/runner/BUCK b/src/com/facebook/buck/jvm/java/runner/BUCK similarity index 53% rename from src/com/facebook/buck/java/runner/BUCK rename to src/com/facebook/buck/jvm/java/runner/BUCK index beceb89afcc..f718b0d618c 100644 --- a/src/com/facebook/buck/java/runner/BUCK +++ b/src/com/facebook/buck/jvm/java/runner/BUCK @@ -5,9 +5,9 @@ java_library( # DO NOT ADD ANY DEPS. ], visibility = [ - '//src/com/facebook/buck/java:steps', + '//src/com/facebook/buck/jvm/java:steps', '//src/com/facebook/buck/junit:junit', - '//test/com/facebook/buck/java:java', - '//test/com/facebook/buck/java/runner:runner', + '//test/com/facebook/buck/jvm/java:java', + '//test/com/facebook/buck/jvm/java/runner:runner', ], ) diff --git a/src/com/facebook/buck/java/runner/FileClassPathRunner.java b/src/com/facebook/buck/jvm/java/runner/FileClassPathRunner.java similarity index 90% rename from src/com/facebook/buck/java/runner/FileClassPathRunner.java rename to src/com/facebook/buck/jvm/java/runner/FileClassPathRunner.java index 9e50b65e1ed..245a92090d6 100644 --- a/src/com/facebook/buck/java/runner/FileClassPathRunner.java +++ b/src/com/facebook/buck/jvm/java/runner/FileClassPathRunner.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.runner; +package com.facebook.buck.jvm.java.runner; import static java.nio.charset.StandardCharsets.UTF_8; @@ -154,7 +154,10 @@ static List readUrls(List paths, boolean modifySystemClassPathPropert } StringBuilder newClassPath = new StringBuilder(); - constructNewClassPath(newClassPath, System.getProperty("java.class.path"), classPathEntries); + constructNewClassPath( + newClassPath, + Preconditions.checkNotNull(System.getProperty("java.class.path")), + classPathEntries); if (modifySystemClassPathProperty) { System.setProperty("java.class.path", newClassPath.toString()); @@ -214,4 +217,21 @@ private static Method getMainClass(String[] args) throws ReflectiveOperationExce } return main; } + + /** + * Since FatJar is going to be embedded in many targets, it cannot have external dependencies, but + * we'd like to have {@link javax.annotation.Nullable} and + * {@link com.google.common.base.Preconditions#checkNotNull} anyway, so we define these here. + */ + @interface Nullable {} + private static class Preconditions { + private Preconditions() {} + + public static T checkNotNull(@Nullable T value) { + if (value == null) { + throw new RuntimeException(); + } + return value; + } + } } diff --git a/src/com/facebook/buck/java/tracing/BUCK b/src/com/facebook/buck/jvm/java/tracing/BUCK similarity index 72% rename from src/com/facebook/buck/java/tracing/BUCK rename to src/com/facebook/buck/jvm/java/tracing/BUCK index f3972e28afb..1cf0cd4215c 100644 --- a/src/com/facebook/buck/java/tracing/BUCK +++ b/src/com/facebook/buck/jvm/java/tracing/BUCK @@ -6,7 +6,7 @@ java_library( 'TranslatingJavacPhaseTracer.java', ], tests = [ - '//test/com/facebook/buck/java/tracing:tracing', + '//test/com/facebook/buck/jvm/java/tracing:tracing', ], resources = [ ':javac-tracing-compiler-plugin', @@ -30,9 +30,9 @@ java_library( ], visibility = [ '//src/com/facebook/buck/event/listener:listener', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:support', '//test/com/facebook/buck/event/listener:listener', - '//test/com/facebook/buck/java/tracing:tracing', + '//test/com/facebook/buck/jvm/java/tracing:tracing', ], ) @@ -47,9 +47,11 @@ java_library( name = 'compiler-plugin', srcs = [ 'TracingTaskListener.java', + '//src/com/facebook/buck/util/exportedfiles:Nullable.java', + '//src/com/facebook/buck/util/exportedfiles:Preconditions.java', ], tests = [ - '//test/com/facebook/buck/java/tracing:tracing', + '//test/com/facebook/buck/jvm/java/tracing:tracing', ], provided_deps = [ # Tools.jar is the compiler itself, and will already be present at runtime; @@ -60,7 +62,7 @@ java_library( ':api', ], visibility = [ - '//test/com/facebook/buck/java/tracing:tracing', + '//test/com/facebook/buck/jvm/java/tracing:tracing', ], ) @@ -68,6 +70,8 @@ java_library( name = 'api', srcs = [ 'JavacPhaseTracer.java', + '//src/com/facebook/buck/util/exportedfiles:Nullable.java', + '//src/com/facebook/buck/util/exportedfiles:Preconditions.java', ], deps = [ # Don't add deps; this is a super-light API that is loaded within javac. It can't access @@ -75,7 +79,7 @@ java_library( ], visibility = [ '//src/com/facebook/buck/cli/bootstrapper:bootstrapper_lib', - '//src/com/facebook/buck/java:support', - '//test/com/facebook/buck/java/tracing:tracing', + '//src/com/facebook/buck/jvm/java:support', + '//test/com/facebook/buck/jvm/java/tracing:tracing', ], ) diff --git a/src/com/facebook/buck/java/tracing/JavacPhaseEvent.java b/src/com/facebook/buck/jvm/java/tracing/JavacPhaseEvent.java similarity index 98% rename from src/com/facebook/buck/java/tracing/JavacPhaseEvent.java rename to src/com/facebook/buck/jvm/java/tracing/JavacPhaseEvent.java index 5729b487960..1f3810aa819 100644 --- a/src/com/facebook/buck/java/tracing/JavacPhaseEvent.java +++ b/src/com/facebook/buck/jvm/java/tracing/JavacPhaseEvent.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.tracing; +package com.facebook.buck.jvm.java.tracing; import com.facebook.buck.event.AbstractBuckEvent; import com.facebook.buck.event.EventKey; diff --git a/src/com/facebook/buck/java/tracing/JavacPhaseEventLogger.java b/src/com/facebook/buck/jvm/java/tracing/JavacPhaseEventLogger.java similarity index 99% rename from src/com/facebook/buck/java/tracing/JavacPhaseEventLogger.java rename to src/com/facebook/buck/jvm/java/tracing/JavacPhaseEventLogger.java index 4a0d5a06a69..fb9340bc861 100644 --- a/src/com/facebook/buck/java/tracing/JavacPhaseEventLogger.java +++ b/src/com/facebook/buck/jvm/java/tracing/JavacPhaseEventLogger.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.tracing; +package com.facebook.buck.jvm.java.tracing; import com.facebook.buck.event.BuckEventBus; import com.facebook.buck.model.BuildTarget; diff --git a/src/com/facebook/buck/java/tracing/JavacPhaseTracer.java b/src/com/facebook/buck/jvm/java/tracing/JavacPhaseTracer.java similarity index 78% rename from src/com/facebook/buck/java/tracing/JavacPhaseTracer.java rename to src/com/facebook/buck/jvm/java/tracing/JavacPhaseTracer.java index c439bdc93f9..8aa38bdc747 100644 --- a/src/com/facebook/buck/java/tracing/JavacPhaseTracer.java +++ b/src/com/facebook/buck/jvm/java/tracing/JavacPhaseTracer.java @@ -14,7 +14,9 @@ * under the License. */ -package com.facebook.buck.java.tracing; +package com.facebook.buck.jvm.java.tracing; + +import com.facebook.buck.util.exportedfiles.Nullable; import java.util.List; @@ -23,7 +25,7 @@ * in the system class loader so that it is common to both Buck and compiler plugins. */ public interface JavacPhaseTracer { - void beginParse(String filename); + void beginParse(@Nullable String filename); void endParse(); void beginEnter(); @@ -32,9 +34,9 @@ public interface JavacPhaseTracer { void beginAnnotationProcessingRound(); void endAnnotationProcessingRound(); - void beginAnalyze(String filename, String typename); + void beginAnalyze(@Nullable String filename, @Nullable String typename); void endAnalyze(); - void beginGenerate(String filename, String typename); + void beginGenerate(@Nullable String filename, @Nullable String typename); void endGenerate(); } diff --git a/src/com/facebook/buck/java/tracing/TracingTaskListener.java b/src/com/facebook/buck/jvm/java/tracing/TracingTaskListener.java similarity index 95% rename from src/com/facebook/buck/java/tracing/TracingTaskListener.java rename to src/com/facebook/buck/jvm/java/tracing/TracingTaskListener.java index c37ff14e571..50c6a7176a3 100644 --- a/src/com/facebook/buck/java/tracing/TracingTaskListener.java +++ b/src/com/facebook/buck/jvm/java/tracing/TracingTaskListener.java @@ -14,8 +14,9 @@ * under the License. */ -package com.facebook.buck.java.tracing; +package com.facebook.buck.jvm.java.tracing; +import com.facebook.buck.util.exportedfiles.Nullable; import com.sun.source.util.JavacTask; import com.sun.source.util.TaskEvent; import com.sun.source.util.TaskListener; @@ -157,7 +158,7 @@ void finishEnter() { * * @see #finishAnalyze(String, String) */ - void startAnalyze(String filename, String typename) { + void startAnalyze(@Nullable String filename, @Nullable String typename) { analyzeCount += 1; tracing.beginAnalyze(filename, typename); } @@ -165,7 +166,7 @@ void startAnalyze(String filename, String typename) { /** * @see #startAnalyze(String, String) */ - void finishAnalyze(String filename, String typename) { + void finishAnalyze(@Nullable String filename, @Nullable String typename) { if (analyzeCount > 0) { analyzeCount -= 1; tracing.endAnalyze(); @@ -176,6 +177,7 @@ void finishAnalyze(String filename, String typename) { } } + @Nullable private static String getFileName(TaskEvent e) { if (e.getSourceFile() == null) { return null; @@ -184,6 +186,7 @@ private static String getFileName(TaskEvent e) { return e.getSourceFile().toString(); } + @Nullable private static String getTypeName(TaskEvent e) { if (e.getTypeElement() == null) { return null; diff --git a/src/com/facebook/buck/java/tracing/TranslatingJavacPhaseTracer.java b/src/com/facebook/buck/jvm/java/tracing/TranslatingJavacPhaseTracer.java similarity index 98% rename from src/com/facebook/buck/java/tracing/TranslatingJavacPhaseTracer.java rename to src/com/facebook/buck/jvm/java/tracing/TranslatingJavacPhaseTracer.java index 1bfc470c143..f71112f7b01 100644 --- a/src/com/facebook/buck/java/tracing/TranslatingJavacPhaseTracer.java +++ b/src/com/facebook/buck/jvm/java/tracing/TranslatingJavacPhaseTracer.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.tracing; +package com.facebook.buck.jvm.java.tracing; import com.facebook.buck.event.BuckEventBus; import com.facebook.buck.log.Logger; @@ -129,7 +129,7 @@ public static void setupTracing( ImmutableList.of(JAVAC_TRACING_JAR_URL)); final Class tracingTaskListenerClass = Class.forName( - "com.facebook.buck.java.tracing.TracingTaskListener", + "com.facebook.buck.jvm.java.tracing.TracingTaskListener", false, tracingTaskListenerClassLoader); final Method setupTracingMethod = tracingTaskListenerClass.getMethod( diff --git a/src/com/facebook/buck/maven/BUCK b/src/com/facebook/buck/maven/BUCK index c7df644bb8d..3d7eb04e6e7 100644 --- a/src/com/facebook/buck/maven/BUCK +++ b/src/com/facebook/buck/maven/BUCK @@ -13,9 +13,9 @@ java_library( '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/rules:build_rule', '//src/com/facebook/buck/rules:rules', @@ -36,7 +36,7 @@ java_library( ], visibility = [ '//src/com/facebook/buck/cli:cli', - '//src/com/facebook/buck/java:rules', + '//src/com/facebook/buck/jvm/java:rules', '//test/com/facebook/buck/cli:cli', '//test/com/facebook/buck/maven:maven', '//test/com/facebook/buck/maven:testutil', diff --git a/src/com/facebook/buck/maven/Pom.java b/src/com/facebook/buck/maven/Pom.java index 87931570bb1..91ba1ff8327 100644 --- a/src/com/facebook/buck/maven/Pom.java +++ b/src/com/facebook/buck/maven/Pom.java @@ -16,8 +16,8 @@ package com.facebook.buck.maven; -import com.facebook.buck.java.HasMavenCoordinates; -import com.facebook.buck.java.MavenPublishable; +import com.facebook.buck.jvm.java.HasMavenCoordinates; +import com.facebook.buck.jvm.java.MavenPublishable; import com.facebook.buck.model.BuildTargets; import com.facebook.buck.rules.BuildRule; import com.google.common.annotations.VisibleForTesting; diff --git a/src/com/facebook/buck/maven/Publisher.java b/src/com/facebook/buck/maven/Publisher.java index 127e3c1ae86..32c0439a883 100644 --- a/src/com/facebook/buck/maven/Publisher.java +++ b/src/com/facebook/buck/maven/Publisher.java @@ -17,7 +17,7 @@ package com.facebook.buck.maven; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.MavenPublishable; +import com.facebook.buck.jvm.java.MavenPublishable; import com.facebook.buck.log.Logger; import com.google.common.base.Optional; import com.google.common.base.Preconditions; diff --git a/src/com/facebook/buck/rules/BUCK b/src/com/facebook/buck/rules/BUCK index a1a4ce172f5..b1456fae1e7 100644 --- a/src/com/facebook/buck/rules/BUCK +++ b/src/com/facebook/buck/rules/BUCK @@ -27,9 +27,9 @@ java_library( '//src/com/facebook/buck/halide:rules', '//src/com/facebook/buck/io:io', '//src/com/facebook/buck/io:watchman', - '//src/com/facebook/buck/java:config', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:config', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/js:js', '//src/com/facebook/buck/json:json', '//src/com/facebook/buck/log:api', @@ -158,7 +158,7 @@ java_immutables_library( '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/hashing:hashing', - '//src/com/facebook/buck/java:packagefinder', + '//src/com/facebook/buck/jvm/java:packagefinder', '//src/com/facebook/buck/io:io', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/model:model', diff --git a/src/com/facebook/buck/rules/BuildContext.java b/src/com/facebook/buck/rules/BuildContext.java index de51568a7e6..9ae1ef6b6a6 100644 --- a/src/com/facebook/buck/rules/BuildContext.java +++ b/src/com/facebook/buck/rules/BuildContext.java @@ -23,7 +23,7 @@ import com.facebook.buck.event.ConsoleEvent; import com.facebook.buck.event.ThrowableConsoleEvent; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.model.BuildId; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.step.StepRunner; diff --git a/src/com/facebook/buck/rules/HasRuntimeDeps.java b/src/com/facebook/buck/rules/HasRuntimeDeps.java index 2dc10bb4a54..847d2849233 100644 --- a/src/com/facebook/buck/rules/HasRuntimeDeps.java +++ b/src/com/facebook/buck/rules/HasRuntimeDeps.java @@ -21,8 +21,8 @@ /** * Provides a facility for a rule to list dependencies it'll need at runtime. *

- * Consider the case of a Java test. The {@link com.facebook.buck.java.JavaTest} rule itself is - * just a {@link com.facebook.buck.java.DefaultJavaLibrary} and so only lists it's immediate compile + * Consider the case of a Java test. The {@link com.facebook.buck.jvm.java.JavaTest} rule itself is + * just a {@link com.facebook.buck.jvm.java.DefaultJavaLibrary} and so only lists it's immediate compile * time deps as it's normal first-order dependencies. However, to actually run a Java test, we need * it's entire transitive dependency tree locally on disk. Since this is outside the contract of * normal build dependencies (e.g. a top-down build engine may decide not to pull a dependency diff --git a/src/com/facebook/buck/rules/KnownBuildRuleTypes.java b/src/com/facebook/buck/rules/KnownBuildRuleTypes.java index 1f28b8a8e10..9f75b30218b 100644 --- a/src/com/facebook/buck/rules/KnownBuildRuleTypes.java +++ b/src/com/facebook/buck/rules/KnownBuildRuleTypes.java @@ -86,13 +86,13 @@ import com.facebook.buck.halide.HalideLibraryDescription; import com.facebook.buck.io.ExecutableFinder; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaBinaryDescription; -import com.facebook.buck.java.JavaBuckConfig; -import com.facebook.buck.java.JavaLibraryDescription; -import com.facebook.buck.java.JavaTestDescription; -import com.facebook.buck.java.JavacOptions; -import com.facebook.buck.java.KeystoreDescription; -import com.facebook.buck.java.PrebuiltJarDescription; +import com.facebook.buck.jvm.java.JavaBinaryDescription; +import com.facebook.buck.jvm.java.JavaBuckConfig; +import com.facebook.buck.jvm.java.JavaLibraryDescription; +import com.facebook.buck.jvm.java.JavaTestDescription; +import com.facebook.buck.jvm.java.JavacOptions; +import com.facebook.buck.jvm.java.KeystoreDescription; +import com.facebook.buck.jvm.java.PrebuiltJarDescription; import com.facebook.buck.js.AndroidReactNativeLibraryDescription; import com.facebook.buck.js.IosReactNativeLibraryDescription; import com.facebook.buck.js.ReactNativeBuckConfig; diff --git a/src/com/facebook/buck/rules/macros/BUCK b/src/com/facebook/buck/rules/macros/BUCK index 6ebe9b6bba2..fceb73642c1 100644 --- a/src/com/facebook/buck/rules/macros/BUCK +++ b/src/com/facebook/buck/rules/macros/BUCK @@ -7,8 +7,8 @@ java_library( deps=[ '//src/com/facebook/buck/util/environment:platform', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:rule_pattern', '//src/com/facebook/buck/rules:build_rule', diff --git a/src/com/facebook/buck/rules/macros/ClasspathMacroExpander.java b/src/com/facebook/buck/rules/macros/ClasspathMacroExpander.java index e20500e15b8..ce69c69fb1f 100644 --- a/src/com/facebook/buck/rules/macros/ClasspathMacroExpander.java +++ b/src/com/facebook/buck/rules/macros/ClasspathMacroExpander.java @@ -17,8 +17,8 @@ package com.facebook.buck.rules.macros; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.HasClasspathEntries; -import com.facebook.buck.java.JavaLibrary; +import com.facebook.buck.jvm.java.HasClasspathEntries; +import com.facebook.buck.jvm.java.JavaLibrary; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.BuildRule; import com.facebook.buck.rules.BuildRuleResolver; diff --git a/src/com/facebook/buck/step/BUCK b/src/com/facebook/buck/step/BUCK index 466ec789e44..707be15aec8 100644 --- a/src/com/facebook/buck/step/BUCK +++ b/src/com/facebook/buck/step/BUCK @@ -9,7 +9,7 @@ java_immutables_library( '//src/com/facebook/buck/android:utils', '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:packagefinder', + '//src/com/facebook/buck/jvm/java:packagefinder', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/util:exceptions', diff --git a/src/com/facebook/buck/step/ExecutionContext.java b/src/com/facebook/buck/step/ExecutionContext.java index 140f63f5bd7..b28710e4fb2 100644 --- a/src/com/facebook/buck/step/ExecutionContext.java +++ b/src/com/facebook/buck/step/ExecutionContext.java @@ -21,7 +21,7 @@ import com.facebook.buck.event.BuckEvent; import com.facebook.buck.event.BuckEventBus; import com.facebook.buck.event.ThrowableConsoleEvent; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.model.BuildId; import com.facebook.buck.util.Ansi; import com.facebook.buck.util.ClassLoaderCache; diff --git a/src/com/facebook/buck/test/BUCK b/src/com/facebook/buck/test/BUCK index aa120cbb1f4..fde7e19fc4e 100644 --- a/src/com/facebook/buck/test/BUCK +++ b/src/com/facebook/buck/test/BUCK @@ -7,8 +7,8 @@ java_library( srcs = REPORT_FORMAT_SRCS, visibility = [ '//src/com/facebook/buck/cli:cli', - '//src/com/facebook/buck/java:steps', - '//test/com/facebook/buck/java:java', + '//src/com/facebook/buck/jvm/java:steps', + '//test/com/facebook/buck/jvm/java:java', ], ) diff --git a/src/com/facebook/buck/test/result/type/BUCK b/src/com/facebook/buck/test/result/type/BUCK index 6c1f04f103a..2ba83ac1d67 100644 --- a/src/com/facebook/buck/test/result/type/BUCK +++ b/src/com/facebook/buck/test/result/type/BUCK @@ -15,7 +15,7 @@ java_library( '//src/com/facebook/buck/shell:steps', '//src/com/facebook/buck/test:test', '//src/com/facebook/buck/cxx:rules', - '//src/com/facebook/buck/java:rules', + '//src/com/facebook/buck/jvm/java:rules', '//test/com/facebook/buck/apple:apple', '//test/com/facebook/buck/cli:cli', '//test/com/facebook/buck/event/listener:listener', diff --git a/src/com/facebook/buck/test/selectors/BUCK b/src/com/facebook/buck/test/selectors/BUCK index d4ec7c27dd2..ebb3fa6c3fb 100644 --- a/src/com/facebook/buck/test/selectors/BUCK +++ b/src/com/facebook/buck/test/selectors/BUCK @@ -13,8 +13,8 @@ java_library( '//src/com/facebook/buck/cli:cli', '//src/com/facebook/buck/d:d', '//src/com/facebook/buck/event/listener:listener', - '//src/com/facebook/buck/java:steps', - '//src/com/facebook/buck/java:rules', + '//src/com/facebook/buck/jvm/java:steps', + '//src/com/facebook/buck/jvm/java:rules', '//src/com/facebook/buck/junit:base', '//src/com/facebook/buck/rules:rules', '//src/com/facebook/buck/shell:rules', @@ -24,7 +24,7 @@ java_library( '//test/com/facebook/buck/cxx:cxx', '//test/com/facebook/buck/event:event', '//test/com/facebook/buck/event/listener:listener', - '//test/com/facebook/buck/java:java', + '//test/com/facebook/buck/jvm/java:java', '//test/com/facebook/buck/rules:rules', '//test/com/facebook/buck/rules:testutil', '//test/com/facebook/buck/test/selectors:selectors', diff --git a/src/com/facebook/buck/thrift/BUCK b/src/com/facebook/buck/thrift/BUCK index 0a978acfafd..cf9b13c45fe 100644 --- a/src/com/facebook/buck/thrift/BUCK +++ b/src/com/facebook/buck/thrift/BUCK @@ -8,11 +8,11 @@ java_library( '//src/com/facebook/buck/android:packageable', '//src/com/facebook/buck/cxx:platform', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:config', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:steps', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:config', + '//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/model:model', '//src/com/facebook/buck/parser:rule_pattern', '//src/com/facebook/buck/python:support', diff --git a/src/com/facebook/buck/thrift/ThriftJavaEnhancer.java b/src/com/facebook/buck/thrift/ThriftJavaEnhancer.java index 421992cf96b..b0ce0539b70 100644 --- a/src/com/facebook/buck/thrift/ThriftJavaEnhancer.java +++ b/src/com/facebook/buck/thrift/ThriftJavaEnhancer.java @@ -16,10 +16,10 @@ package com.facebook.buck.thrift; -import com.facebook.buck.java.CalculateAbi; -import com.facebook.buck.java.DefaultJavaLibrary; -import com.facebook.buck.java.Javac; -import com.facebook.buck.java.JavacOptions; +import com.facebook.buck.jvm.java.CalculateAbi; +import com.facebook.buck.jvm.java.DefaultJavaLibrary; +import com.facebook.buck.jvm.java.Javac; +import com.facebook.buck.jvm.java.JavacOptions; 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/util/exportedfiles/BUCK b/src/com/facebook/buck/util/exportedfiles/BUCK new file mode 100644 index 00000000000..d1930d71f35 --- /dev/null +++ b/src/com/facebook/buck/util/exportedfiles/BUCK @@ -0,0 +1,13 @@ +export_file( + name = 'Preconditions.java', + visibility = [ + 'PUBLIC', + ], +) + +export_file( + name = 'Nullable.java', + visibility = [ + 'PUBLIC', + ], +) diff --git a/src/com/facebook/buck/util/exportedfiles/Nullable.java b/src/com/facebook/buck/util/exportedfiles/Nullable.java new file mode 100644 index 00000000000..5cc71615155 --- /dev/null +++ b/src/com/facebook/buck/util/exportedfiles/Nullable.java @@ -0,0 +1,25 @@ +/* + * Copyright 2015-present Facebook, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +package com.facebook.buck.util.exportedfiles; + +/** + * Some projects like FatJar is going to be embedded in many targets, it cannot have external + * dependencies, but we'd like to have {@link javax.annotation.Nullable} and + * {@link com.google.common.base.Preconditions#checkNotNull} anyway, so we define these here. + */ +public @interface Nullable { +} diff --git a/src/com/facebook/buck/util/exportedfiles/Preconditions.java b/src/com/facebook/buck/util/exportedfiles/Preconditions.java new file mode 100644 index 00000000000..d39bc3d5a66 --- /dev/null +++ b/src/com/facebook/buck/util/exportedfiles/Preconditions.java @@ -0,0 +1,31 @@ +/* + * Copyright 2015-present Facebook, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +package com.facebook.buck.util.exportedfiles; + +/** + * Read description of {@link com.facebook.buck.util.exportedfiles.Nullable}. + */ +public class Preconditions { + private Preconditions() {} + + public static T checkNotNull(@Nullable T value) { + if (value == null) { + throw new RuntimeException(); + } + return value; + } +} diff --git a/src/com/facebook/buck/zip/BUCK b/src/com/facebook/buck/zip/BUCK index f4adfba82ac..625e936c4d1 100644 --- a/src/com/facebook/buck/zip/BUCK +++ b/src/com/facebook/buck/zip/BUCK @@ -63,7 +63,7 @@ java_library( visibility = [ '//src/com/facebook/buck/android/...', '//src/com/facebook/buck/apple:rules', - '//src/com/facebook/buck/java:rules', + '//src/com/facebook/buck/jvm/java:rules', '//src/com/facebook/buck/rules:rules', '//src/com/facebook/buck/thrift:rules', '//test/com/facebook/buck/zip:zip', @@ -80,7 +80,7 @@ java_library( deps = [ ':steps', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/rules:build_rule', '//src/com/facebook/buck/step/fs:fs', diff --git a/src/com/facebook/buck/zip/SrcZipAwareFileBundler.java b/src/com/facebook/buck/zip/SrcZipAwareFileBundler.java index d40ca92a36c..5f0982aaee3 100644 --- a/src/com/facebook/buck/zip/SrcZipAwareFileBundler.java +++ b/src/com/facebook/buck/zip/SrcZipAwareFileBundler.java @@ -17,7 +17,7 @@ package com.facebook.buck.zip; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.Javac; +import com.facebook.buck.jvm.java.Javac; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.SourcePath; import com.facebook.buck.rules.SourcePathResolver; diff --git a/test/com/facebook/buck/android/AaptPackageResourcesTest.java b/test/com/facebook/buck/android/AaptPackageResourcesTest.java index 6d6b46e809d..c47e1ffc828 100644 --- a/test/com/facebook/buck/android/AaptPackageResourcesTest.java +++ b/test/com/facebook/buck/android/AaptPackageResourcesTest.java @@ -16,7 +16,7 @@ package com.facebook.buck.android; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import static com.facebook.buck.util.BuckConstant.SCRATCH_DIR; import static com.facebook.buck.util.BuckConstant.SCRATCH_PATH; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/android/AndroidBinaryBuilder.java b/test/com/facebook/buck/android/AndroidBinaryBuilder.java index 9dcb67410e8..7a24e5f8b1a 100644 --- a/test/com/facebook/buck/android/AndroidBinaryBuilder.java +++ b/test/com/facebook/buck/android/AndroidBinaryBuilder.java @@ -16,7 +16,7 @@ package com.facebook.buck.android; -import static com.facebook.buck.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; import com.facebook.buck.android.FilterResourcesStep.ResourceFilter; import com.facebook.buck.android.ResourcesFilter.ResourceCompressionMode; diff --git a/test/com/facebook/buck/android/AndroidBinaryDescriptionTest.java b/test/com/facebook/buck/android/AndroidBinaryDescriptionTest.java index 31bc92d8964..ef6aef8dce0 100644 --- a/test/com/facebook/buck/android/AndroidBinaryDescriptionTest.java +++ b/test/com/facebook/buck/android/AndroidBinaryDescriptionTest.java @@ -18,8 +18,8 @@ import static org.junit.Assert.assertThat; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.Keystore; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.Keystore; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRule; diff --git a/test/com/facebook/buck/android/AndroidBinaryGraphEnhancerTest.java b/test/com/facebook/buck/android/AndroidBinaryGraphEnhancerTest.java index d4c92de1bcf..ad248d827cb 100644 --- a/test/com/facebook/buck/android/AndroidBinaryGraphEnhancerTest.java +++ b/test/com/facebook/buck/android/AndroidBinaryGraphEnhancerTest.java @@ -16,7 +16,7 @@ package com.facebook.buck.android; -import static com.facebook.buck.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.createStrictMock; @@ -30,9 +30,9 @@ import com.facebook.buck.android.AndroidBinary.ExopackageMode; import com.facebook.buck.android.NdkCxxPlatforms.TargetCpuType; -import com.facebook.buck.java.HasJavaClassHashes; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.Keystore; +import com.facebook.buck.jvm.java.HasJavaClassHashes; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.Keystore; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.model.BuildTargets; diff --git a/test/com/facebook/buck/android/AndroidBinaryTest.java b/test/com/facebook/buck/android/AndroidBinaryTest.java index 5f06b0b3ab1..7e350cf2e5d 100644 --- a/test/com/facebook/buck/android/AndroidBinaryTest.java +++ b/test/com/facebook/buck/android/AndroidBinaryTest.java @@ -25,10 +25,10 @@ import com.facebook.buck.android.FilterResourcesStep.ResourceFilter; import com.facebook.buck.android.ResourcesFilter.ResourceCompressionMode; -import com.facebook.buck.java.FakeJavaLibrary; -import com.facebook.buck.java.Keystore; -import com.facebook.buck.java.KeystoreBuilder; -import com.facebook.buck.java.PrebuiltJarBuilder; +import com.facebook.buck.jvm.java.FakeJavaLibrary; +import com.facebook.buck.jvm.java.Keystore; +import com.facebook.buck.jvm.java.KeystoreBuilder; +import com.facebook.buck.jvm.java.PrebuiltJarBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRule; diff --git a/test/com/facebook/buck/android/AndroidBuildConfigJavaLibraryTest.java b/test/com/facebook/buck/android/AndroidBuildConfigJavaLibraryTest.java index 71f0e662d68..7b1b3763b0d 100644 --- a/test/com/facebook/buck/android/AndroidBuildConfigJavaLibraryTest.java +++ b/test/com/facebook/buck/android/AndroidBuildConfigJavaLibraryTest.java @@ -16,7 +16,7 @@ package com.facebook.buck.android; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import static org.junit.Assert.assertEquals; import com.facebook.buck.model.BuildTarget; diff --git a/test/com/facebook/buck/android/AndroidInstrumentationApkBuilder.java b/test/com/facebook/buck/android/AndroidInstrumentationApkBuilder.java index 705e2ebdff7..d2f4bdb7a69 100644 --- a/test/com/facebook/buck/android/AndroidInstrumentationApkBuilder.java +++ b/test/com/facebook/buck/android/AndroidInstrumentationApkBuilder.java @@ -16,7 +16,7 @@ package com.facebook.buck.android; -import static com.facebook.buck.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; import com.facebook.buck.cli.FakeBuckConfig; import com.facebook.buck.model.BuildTarget; diff --git a/test/com/facebook/buck/android/AndroidInstrumentationApkDescriptionTest.java b/test/com/facebook/buck/android/AndroidInstrumentationApkDescriptionTest.java index ce40b0782b9..cc5f530fa3e 100644 --- a/test/com/facebook/buck/android/AndroidInstrumentationApkDescriptionTest.java +++ b/test/com/facebook/buck/android/AndroidInstrumentationApkDescriptionTest.java @@ -18,8 +18,8 @@ import static org.junit.Assert.assertThat; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.Keystore; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.Keystore; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRule; diff --git a/test/com/facebook/buck/android/AndroidInstrumentationApkTest.java b/test/com/facebook/buck/android/AndroidInstrumentationApkTest.java index c8679d1366b..585cabd8bac 100644 --- a/test/com/facebook/buck/android/AndroidInstrumentationApkTest.java +++ b/test/com/facebook/buck/android/AndroidInstrumentationApkTest.java @@ -16,13 +16,13 @@ package com.facebook.buck.android; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import static org.junit.Assert.assertEquals; import com.facebook.buck.cli.FakeBuckConfig; -import com.facebook.buck.java.FakeJavaLibrary; -import com.facebook.buck.java.JavaLibrary; -import com.facebook.buck.java.KeystoreBuilder; +import com.facebook.buck.jvm.java.FakeJavaLibrary; +import com.facebook.buck.jvm.java.JavaLibrary; +import com.facebook.buck.jvm.java.KeystoreBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRule; diff --git a/test/com/facebook/buck/android/AndroidLibraryBuilder.java b/test/com/facebook/buck/android/AndroidLibraryBuilder.java index 49efe62acc7..1329df4b50b 100644 --- a/test/com/facebook/buck/android/AndroidLibraryBuilder.java +++ b/test/com/facebook/buck/android/AndroidLibraryBuilder.java @@ -16,7 +16,7 @@ package com.facebook.buck.android; -import static com.facebook.buck.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.AbstractNodeBuilder; diff --git a/test/com/facebook/buck/android/AndroidLibraryGraphEnhancerTest.java b/test/com/facebook/buck/android/AndroidLibraryGraphEnhancerTest.java index 2a2095f353d..2d5efc11c46 100644 --- a/test/com/facebook/buck/android/AndroidLibraryGraphEnhancerTest.java +++ b/test/com/facebook/buck/android/AndroidLibraryGraphEnhancerTest.java @@ -16,15 +16,15 @@ package com.facebook.buck.android; -import static com.facebook.buck.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import com.facebook.buck.android.AndroidLibraryGraphEnhancer.ResourceDependencyMode; -import com.facebook.buck.java.JavacOptions; +import com.facebook.buck.jvm.java.JavacOptions; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRule; diff --git a/test/com/facebook/buck/android/AndroidLibraryTest.java b/test/com/facebook/buck/android/AndroidLibraryTest.java index 3a2685dcc8e..e7de8df2b82 100644 --- a/test/com/facebook/buck/android/AndroidLibraryTest.java +++ b/test/com/facebook/buck/android/AndroidLibraryTest.java @@ -18,8 +18,8 @@ import static org.junit.Assert.assertNotNull; -import com.facebook.buck.java.AnnotationProcessingParams; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.AnnotationProcessingParams; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRule; diff --git a/test/com/facebook/buck/android/AndroidPackageableCollectorTest.java b/test/com/facebook/buck/android/AndroidPackageableCollectorTest.java index e901282d84e..eb75eee2f53 100644 --- a/test/com/facebook/buck/android/AndroidPackageableCollectorTest.java +++ b/test/com/facebook/buck/android/AndroidPackageableCollectorTest.java @@ -19,9 +19,9 @@ import static org.junit.Assert.assertEquals; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.KeystoreBuilder; -import com.facebook.buck.java.PrebuiltJarBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.KeystoreBuilder; +import com.facebook.buck.jvm.java.PrebuiltJarBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRule; diff --git a/test/com/facebook/buck/android/AndroidPrebuiltAarBuilder.java b/test/com/facebook/buck/android/AndroidPrebuiltAarBuilder.java index 5a00ebcdb18..ecd622fbd25 100644 --- a/test/com/facebook/buck/android/AndroidPrebuiltAarBuilder.java +++ b/test/com/facebook/buck/android/AndroidPrebuiltAarBuilder.java @@ -16,7 +16,7 @@ package com.facebook.buck.android; -import com.facebook.buck.java.JavaCompilationConstants; +import com.facebook.buck.jvm.java.JavaCompilationConstants; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.AbstractNodeBuilder; import com.facebook.buck.rules.TestSourcePath; diff --git a/test/com/facebook/buck/android/ApkGenruleDescriptionTest.java b/test/com/facebook/buck/android/ApkGenruleDescriptionTest.java index f9a1fc6b0db..65e5f01717c 100644 --- a/test/com/facebook/buck/android/ApkGenruleDescriptionTest.java +++ b/test/com/facebook/buck/android/ApkGenruleDescriptionTest.java @@ -18,7 +18,7 @@ import static org.junit.Assert.assertThat; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRule; diff --git a/test/com/facebook/buck/android/ApkGenruleTest.java b/test/com/facebook/buck/android/ApkGenruleTest.java index 1677e914213..59254eef8d0 100644 --- a/test/com/facebook/buck/android/ApkGenruleTest.java +++ b/test/com/facebook/buck/android/ApkGenruleTest.java @@ -25,10 +25,10 @@ import com.facebook.buck.event.BuckEventBusFactory; import com.facebook.buck.io.MorePathsForTests; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.JavaPackageFinder; -import com.facebook.buck.java.Keystore; -import com.facebook.buck.java.KeystoreBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.Keystore; +import com.facebook.buck.jvm.java.KeystoreBuilder; import com.facebook.buck.model.BuildId; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; diff --git a/test/com/facebook/buck/android/BUCK b/test/com/facebook/buck/android/BUCK index f16e83ffedb..e7c0f3a9462 100644 --- a/test/com/facebook/buck/android/BUCK +++ b/test/com/facebook/buck/android/BUCK @@ -34,8 +34,8 @@ java_library( '//src/com/facebook/buck/cli:config', '//src/com/facebook/buck/cxx:platform', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/rules/macros:macros', '//src/com/facebook/buck/rules:build_rule', @@ -47,7 +47,7 @@ java_library( '//src/com/facebook/buck/util:util', '//test/com/facebook/buck/cli:FakeBuckConfig', '//test/com/facebook/buck/cxx:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/rules:testutil', '//test/com/facebook/buck/testutil:testutil', '//third-party/java/ddmlib:ddmlib', @@ -85,12 +85,12 @@ java_test( '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:packagefinder', - '//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/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:packagefinder', + '//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/model:model', '//src/com/facebook/buck/parser:rule_pattern', '//src/com/facebook/buck/rules:build_rule', @@ -110,7 +110,7 @@ java_test( '//third-party/java/args4j:args4j', '//test/com/facebook/buck/cli:FakeBuckConfig', '//test/com/facebook/buck/cxx:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/event:testutil', '//test/com/facebook/buck/io:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', @@ -146,7 +146,7 @@ java_test( '//src/com/facebook/buck/android:utils', '//src/com/facebook/buck/cxx:rules', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', + '//src/com/facebook/buck/jvm/java:classhash', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/rules:build_rule', '//src/com/facebook/buck/util:exceptions', diff --git a/test/com/facebook/buck/android/DexProducedFromJavaLibraryThatContainsClassFilesTest.java b/test/com/facebook/buck/android/DexProducedFromJavaLibraryThatContainsClassFilesTest.java index d2b2c6dc525..1c75c616d64 100644 --- a/test/com/facebook/buck/android/DexProducedFromJavaLibraryThatContainsClassFilesTest.java +++ b/test/com/facebook/buck/android/DexProducedFromJavaLibraryThatContainsClassFilesTest.java @@ -26,9 +26,9 @@ import com.facebook.buck.dalvik.EstimateLinearAllocStep; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.FakeJavaLibrary; -import com.facebook.buck.java.JavaLibrary; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.FakeJavaLibrary; +import com.facebook.buck.jvm.java.JavaLibrary; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildContext; diff --git a/test/com/facebook/buck/android/DexWithClassesTest.java b/test/com/facebook/buck/android/DexWithClassesTest.java index 268306b8b2b..b6b9a53a243 100644 --- a/test/com/facebook/buck/android/DexWithClassesTest.java +++ b/test/com/facebook/buck/android/DexWithClassesTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import com.facebook.buck.java.FakeJavaLibrary; -import com.facebook.buck.java.JavaLibrary; +import com.facebook.buck.jvm.java.FakeJavaLibrary; +import com.facebook.buck.jvm.java.JavaLibrary; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRuleParams; diff --git a/test/com/facebook/buck/android/DummyRDotJavaTest.java b/test/com/facebook/buck/android/DummyRDotJavaTest.java index c0b14bb6f9a..784807659fd 100644 --- a/test/com/facebook/buck/android/DummyRDotJavaTest.java +++ b/test/com/facebook/buck/android/DummyRDotJavaTest.java @@ -17,7 +17,7 @@ package com.facebook.buck.android; import static com.facebook.buck.android.AndroidResource.BuildOutput; -import static com.facebook.buck.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; import static org.junit.Assert.assertEquals; import com.facebook.buck.io.ProjectFilesystem; diff --git a/test/com/facebook/buck/android/RobolectricTestBuilder.java b/test/com/facebook/buck/android/RobolectricTestBuilder.java index d9861aad61b..848a5585216 100644 --- a/test/com/facebook/buck/android/RobolectricTestBuilder.java +++ b/test/com/facebook/buck/android/RobolectricTestBuilder.java @@ -16,7 +16,7 @@ package com.facebook.buck.android; -import static com.facebook.buck.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.ANDROID_JAVAC_OPTIONS; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.AbstractNodeBuilder; diff --git a/test/com/facebook/buck/cli/AuditClasspathCommandTest.java b/test/com/facebook/buck/cli/AuditClasspathCommandTest.java index df4eb027ebb..f1701e7e365 100644 --- a/test/com/facebook/buck/cli/AuditClasspathCommandTest.java +++ b/test/com/facebook/buck/cli/AuditClasspathCommandTest.java @@ -22,9 +22,9 @@ import com.facebook.buck.android.AndroidBinaryBuilder; import com.facebook.buck.android.AndroidLibraryBuilder; import com.facebook.buck.event.BuckEventBusFactory; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.JavaTestBuilder; -import com.facebook.buck.java.KeystoreBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaTestBuilder; +import com.facebook.buck.jvm.java.KeystoreBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.TargetGraphToActionGraph; diff --git a/test/com/facebook/buck/cli/AuditInputCommandTest.java b/test/com/facebook/buck/cli/AuditInputCommandTest.java index fb917824854..f204fa0ff2a 100644 --- a/test/com/facebook/buck/cli/AuditInputCommandTest.java +++ b/test/com/facebook/buck/cli/AuditInputCommandTest.java @@ -22,8 +22,8 @@ import com.facebook.buck.event.BuckEventBus; import com.facebook.buck.event.BuckEventBusFactory; import com.facebook.buck.httpserver.WebServer; -import com.facebook.buck.java.FakeJavaPackageFinder; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.artifact_cache.ArtifactCache; diff --git a/test/com/facebook/buck/cli/AuditOwnerCommandTest.java b/test/com/facebook/buck/cli/AuditOwnerCommandTest.java index 09f2bbeab58..faed93382b5 100644 --- a/test/com/facebook/buck/cli/AuditOwnerCommandTest.java +++ b/test/com/facebook/buck/cli/AuditOwnerCommandTest.java @@ -31,7 +31,7 @@ import com.facebook.buck.httpserver.WebServer; import com.facebook.buck.io.MorePaths; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.model.BuildTargetPattern; diff --git a/test/com/facebook/buck/cli/BUCK b/test/com/facebook/buck/cli/BUCK index c4995b2a97a..a19dd565b6d 100644 --- a/test/com/facebook/buck/cli/BUCK +++ b/test/com/facebook/buck/cli/BUCK @@ -66,7 +66,7 @@ java_library( '//src/com/facebook/buck/util/environment:platform', '//test/com/facebook/buck/android:utils', '//test/com/facebook/buck/event:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/rules:testutil', '//test/com/facebook/buck/testutil:testutil', '//test/com/facebook/buck/testutil/integration:integration', @@ -135,10 +135,10 @@ java_test( '//src/com/facebook/buck/httpserver:httpserver', '//src/com/facebook/buck/io:io', '//src/com/facebook/buck/io:watchman', - '//src/com/facebook/buck/java/intellij:intellij', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java/intellij:intellij', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/json:json', '//src/com/facebook/buck/log:api', '//src/com/facebook/buck/maven:maven', @@ -168,7 +168,7 @@ java_test( '//test/com/facebook/buck/apple:testutil', '//test/com/facebook/buck/event:testutil', '//test/com/facebook/buck/io:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/maven:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/rules:testutil', diff --git a/test/com/facebook/buck/cli/BuckQueryEnvironmentTest.java b/test/com/facebook/buck/cli/BuckQueryEnvironmentTest.java index ef809c8104d..3c7e2e92ca7 100644 --- a/test/com/facebook/buck/cli/BuckQueryEnvironmentTest.java +++ b/test/com/facebook/buck/cli/BuckQueryEnvironmentTest.java @@ -25,7 +25,7 @@ import com.facebook.buck.event.BuckEventBusFactory; import com.facebook.buck.httpserver.WebServer; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.query.QueryBuildTarget; import com.facebook.buck.query.QueryException; diff --git a/test/com/facebook/buck/cli/BuildCommandOptionsTest.java b/test/com/facebook/buck/cli/BuildCommandOptionsTest.java index 39c89f85928..a94759e2948 100644 --- a/test/com/facebook/buck/cli/BuildCommandOptionsTest.java +++ b/test/com/facebook/buck/cli/BuildCommandOptionsTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import com.facebook.buck.java.DefaultJavaPackageFinder; +import com.facebook.buck.jvm.java.DefaultJavaPackageFinder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; diff --git a/test/com/facebook/buck/cli/CleanCommandTest.java b/test/com/facebook/buck/cli/CleanCommandTest.java index f4ca63df795..24314552fc6 100644 --- a/test/com/facebook/buck/cli/CleanCommandTest.java +++ b/test/com/facebook/buck/cli/CleanCommandTest.java @@ -24,8 +24,8 @@ import com.facebook.buck.event.BuckEventBusFactory; import com.facebook.buck.httpserver.WebServer; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.FakeJavaPackageFinder; -import com.facebook.buck.java.intellij.Project; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.intellij.Project; import com.facebook.buck.parser.Parser; import com.facebook.buck.artifact_cache.ArtifactCache; import com.facebook.buck.rules.Cell; diff --git a/test/com/facebook/buck/cli/CommandRunnerParamsForTesting.java b/test/com/facebook/buck/cli/CommandRunnerParamsForTesting.java index bafeddc83b9..3805d0465b0 100644 --- a/test/com/facebook/buck/cli/CommandRunnerParamsForTesting.java +++ b/test/com/facebook/buck/cli/CommandRunnerParamsForTesting.java @@ -24,8 +24,8 @@ import com.facebook.buck.event.BuckEventBus; import com.facebook.buck.event.BuckEventBusFactory; import com.facebook.buck.httpserver.WebServer; -import com.facebook.buck.java.FakeJavaPackageFinder; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.parser.Parser; import com.facebook.buck.parser.ParserConfig; import com.facebook.buck.rules.Cell; diff --git a/test/com/facebook/buck/cli/DefaultJavaPackageFinderTest.java b/test/com/facebook/buck/cli/DefaultJavaPackageFinderTest.java index efce19b3047..624f9cfb172 100644 --- a/test/com/facebook/buck/cli/DefaultJavaPackageFinderTest.java +++ b/test/com/facebook/buck/cli/DefaultJavaPackageFinderTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import com.facebook.buck.java.DefaultJavaPackageFinder; +import com.facebook.buck.jvm.java.DefaultJavaPackageFinder; import com.facebook.buck.util.HumanReadableException; import com.google.common.collect.ImmutableList; diff --git a/test/com/facebook/buck/cli/ProjectCommandIntellijTest.java b/test/com/facebook/buck/cli/ProjectCommandIntellijTest.java index f0fac2efef9..e2c63ad5f01 100644 --- a/test/com/facebook/buck/cli/ProjectCommandIntellijTest.java +++ b/test/com/facebook/buck/cli/ProjectCommandIntellijTest.java @@ -18,9 +18,9 @@ import static org.junit.Assert.assertEquals; -import com.facebook.buck.java.JavaBinaryRuleBuilder; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.JavaTestBuilder; +import com.facebook.buck.jvm.java.JavaBinaryRuleBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaTestBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.ProjectConfigBuilder; diff --git a/test/com/facebook/buck/cli/ProjectCommandTests.java b/test/com/facebook/buck/cli/ProjectCommandTests.java index f5eeaeb6202..633ad12499d 100644 --- a/test/com/facebook/buck/cli/ProjectCommandTests.java +++ b/test/com/facebook/buck/cli/ProjectCommandTests.java @@ -21,7 +21,7 @@ import com.facebook.buck.artifact_cache.NoopArtifactCache; import com.facebook.buck.event.BuckEventBusFactory; import com.facebook.buck.httpserver.WebServer; -import com.facebook.buck.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.Cell; import com.facebook.buck.rules.TargetGraph; diff --git a/test/com/facebook/buck/cli/PublishCommandIntegrationTest.java b/test/com/facebook/buck/cli/PublishCommandIntegrationTest.java index db4ee7329d0..5006562c788 100644 --- a/test/com/facebook/buck/cli/PublishCommandIntegrationTest.java +++ b/test/com/facebook/buck/cli/PublishCommandIntegrationTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import com.facebook.buck.java.Javac; +import com.facebook.buck.jvm.java.Javac; import com.facebook.buck.maven.AetherUtil; import com.facebook.buck.maven.TestPublisher; import com.facebook.buck.testutil.integration.DebuggableTemporaryFolder; diff --git a/test/com/facebook/buck/cli/ResourcesRootPackageFinderTest.java b/test/com/facebook/buck/cli/ResourcesRootPackageFinderTest.java index fb15b94842d..e6979f4a008 100644 --- a/test/com/facebook/buck/cli/ResourcesRootPackageFinderTest.java +++ b/test/com/facebook/buck/cli/ResourcesRootPackageFinderTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import com.facebook.buck.java.FakeJavaPackageFinder; -import com.facebook.buck.java.ResourcesRootPackageFinder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.ResourcesRootPackageFinder; import org.junit.Test; diff --git a/test/com/facebook/buck/cli/TargetsCommandTest.java b/test/com/facebook/buck/cli/TargetsCommandTest.java index 3b961296156..7f7bfa806fb 100644 --- a/test/com/facebook/buck/cli/TargetsCommandTest.java +++ b/test/com/facebook/buck/cli/TargetsCommandTest.java @@ -31,12 +31,12 @@ import com.facebook.buck.event.BuckEventBusFactory; import com.facebook.buck.httpserver.WebServer; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.FakeJavaPackageFinder; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.JavaLibraryDescription; -import com.facebook.buck.java.JavaTestBuilder; -import com.facebook.buck.java.JavaTestDescription; -import com.facebook.buck.java.PrebuiltJarBuilder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaLibraryDescription; +import com.facebook.buck.jvm.java.JavaTestBuilder; +import com.facebook.buck.jvm.java.JavaTestDescription; +import com.facebook.buck.jvm.java.PrebuiltJarBuilder; import com.facebook.buck.json.BuildFileParseException; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; diff --git a/test/com/facebook/buck/cli/TestRunningTest.java b/test/com/facebook/buck/cli/TestRunningTest.java index 1b52fbea8d1..001c5aed473 100644 --- a/test/com/facebook/buck/cli/TestRunningTest.java +++ b/test/com/facebook/buck/cli/TestRunningTest.java @@ -32,9 +32,9 @@ import static org.junit.Assert.assertTrue; import com.facebook.buck.io.MorePaths; -import com.facebook.buck.java.DefaultJavaPackageFinder; -import com.facebook.buck.java.FakeJavaLibrary; -import com.facebook.buck.java.JavaLibrary; +import com.facebook.buck.jvm.java.DefaultJavaPackageFinder; +import com.facebook.buck.jvm.java.FakeJavaLibrary; +import com.facebook.buck.jvm.java.JavaLibrary; import com.facebook.buck.log.Logger; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; diff --git a/test/com/facebook/buck/command/BUCK b/test/com/facebook/buck/command/BUCK index 64cd0c17021..b8e0e98913d 100644 --- a/test/com/facebook/buck/command/BUCK +++ b/test/com/facebook/buck/command/BUCK @@ -6,8 +6,8 @@ java_test( '//src/com/facebook/buck/command:command', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:parser', '//src/com/facebook/buck/rules:build_rule', @@ -16,7 +16,7 @@ java_test( '//src/com/facebook/buck/util:exceptions', '//src/com/facebook/buck/util:util', '//test/com/facebook/buck/android:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/rules:testutil', '//test/com/facebook/buck/testutil:testutil', diff --git a/test/com/facebook/buck/cxx/BUCK b/test/com/facebook/buck/cxx/BUCK index 54c6cac0552..4b368a9504d 100644 --- a/test/com/facebook/buck/cxx/BUCK +++ b/test/com/facebook/buck/cxx/BUCK @@ -7,7 +7,7 @@ java_library( '//src/com/facebook/buck/cxx:platform', '//src/com/facebook/buck/cxx:rules', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:nativelinkable', + '//src/com/facebook/buck/jvm/java:nativelinkable', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/python:rules', '//src/com/facebook/buck/python:support', @@ -42,7 +42,7 @@ java_test( '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:nativelinkable', + '//src/com/facebook/buck/jvm/java:nativelinkable', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:rule_pattern', '//src/com/facebook/buck/python:rules', diff --git a/test/com/facebook/buck/dalvik/BUCK b/test/com/facebook/buck/dalvik/BUCK index 29ae936ef87..37b31cb133d 100644 --- a/test/com/facebook/buck/dalvik/BUCK +++ b/test/com/facebook/buck/dalvik/BUCK @@ -6,10 +6,10 @@ java_test( '//src/com/facebook/buck/dalvik:dalvik_stats_tool', '//src/com/facebook/buck/dalvik:steps', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java/classes:classes', + '//src/com/facebook/buck/jvm/java/classes:classes', '//src/com/facebook/buck/step:step', '//src/com/facebook/buck/timing:timing', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/step:testutil', '//test/com/facebook/buck/testutil:testutil', '//test/com/facebook/buck/testutil/integration:integration', diff --git a/test/com/facebook/buck/dalvik/EstimateLinearAllocStepTest.java b/test/com/facebook/buck/dalvik/EstimateLinearAllocStepTest.java index 58f23512295..570e69dc07f 100644 --- a/test/com/facebook/buck/dalvik/EstimateLinearAllocStepTest.java +++ b/test/com/facebook/buck/dalvik/EstimateLinearAllocStepTest.java @@ -20,7 +20,7 @@ import com.facebook.buck.dalvik.EstimateLinearAllocStep.LinearAllocEstimator; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.classes.FileLike; +import com.facebook.buck.jvm.java.classes.FileLike; import com.facebook.buck.step.ExecutionContext; import com.facebook.buck.step.TestExecutionContext; import com.facebook.buck.testutil.FakeProjectFilesystem; diff --git a/test/com/facebook/buck/dalvik/firstorder/BUCK b/test/com/facebook/buck/dalvik/firstorder/BUCK index ff8f74b9dcb..18060f773ef 100644 --- a/test/com/facebook/buck/dalvik/firstorder/BUCK +++ b/test/com/facebook/buck/dalvik/firstorder/BUCK @@ -13,7 +13,7 @@ java_test( '//src/com/facebook/buck/util:io', '//src/com/facebook/buck/util:util', '//src/com/facebook/buck/util/environment:environment', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/event:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/rules:testutil', diff --git a/test/com/facebook/buck/event/BUCK b/test/com/facebook/buck/event/BUCK index b6e06a868ea..cfaeac323d2 100644 --- a/test/com/facebook/buck/event/BUCK +++ b/test/com/facebook/buck/event/BUCK @@ -6,7 +6,7 @@ java_test( '//src/com/facebook/buck/artifact_cache:artifact_cache', '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/graph:graph', - '//src/com/facebook/buck/java:rules', + '//src/com/facebook/buck/jvm/java:rules', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:parser', '//src/com/facebook/buck/rules:build_rule', @@ -17,7 +17,7 @@ java_test( '//src/com/facebook/buck/timing:timing', '//src/com/facebook/buck/util/concurrent:concurrent', '//src/com/facebook/buck/util:exceptions', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/timing:testutil', '//test/com/facebook/buck/rules:testutil', diff --git a/test/com/facebook/buck/event/listener/BUCK b/test/com/facebook/buck/event/listener/BUCK index 09f0d6ca745..506328ebbe4 100644 --- a/test/com/facebook/buck/event/listener/BUCK +++ b/test/com/facebook/buck/event/listener/BUCK @@ -10,8 +10,8 @@ java_test( '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/httpserver:httpserver', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:support', - '//src/com/facebook/buck/java/tracing:tracing', + '//src/com/facebook/buck/jvm/java:support', + '//src/com/facebook/buck/jvm/java/tracing:tracing', '//src/com/facebook/buck/json:json', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:parser', @@ -35,7 +35,7 @@ java_test( '//src/com/facebook/buck/util/network:network', '//src/com/facebook/buck/util/versioncontrol:versioncontrol', '//test/com/facebook/buck/event:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/json:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/rules:testutil', diff --git a/test/com/facebook/buck/event/listener/ChromeTraceBuildListenerTest.java b/test/com/facebook/buck/event/listener/ChromeTraceBuildListenerTest.java index 60bff0cca47..b889b692265 100644 --- a/test/com/facebook/buck/event/listener/ChromeTraceBuildListenerTest.java +++ b/test/com/facebook/buck/event/listener/ChromeTraceBuildListenerTest.java @@ -34,8 +34,8 @@ import com.facebook.buck.event.TraceEvent; import com.facebook.buck.event.TraceEventLogger; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.AnnotationProcessingEvent; -import com.facebook.buck.java.tracing.JavacPhaseEvent; +import com.facebook.buck.jvm.java.AnnotationProcessingEvent; +import com.facebook.buck.jvm.java.tracing.JavacPhaseEvent; import com.facebook.buck.model.BuildId; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; diff --git a/test/com/facebook/buck/java/AccumulateClassNamesStepTest.java b/test/com/facebook/buck/jvm/java/AccumulateClassNamesStepTest.java similarity index 99% rename from test/com/facebook/buck/java/AccumulateClassNamesStepTest.java rename to test/com/facebook/buck/jvm/java/AccumulateClassNamesStepTest.java index 1b19a369152..5b200794768 100644 --- a/test/com/facebook/buck/java/AccumulateClassNamesStepTest.java +++ b/test/com/facebook/buck/jvm/java/AccumulateClassNamesStepTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/AnnotationProcessingEventTest.java b/test/com/facebook/buck/jvm/java/AnnotationProcessingEventTest.java similarity index 99% rename from test/com/facebook/buck/java/AnnotationProcessingEventTest.java rename to test/com/facebook/buck/jvm/java/AnnotationProcessingEventTest.java index 5c8fd21ec19..58ac9cd1a8c 100644 --- a/test/com/facebook/buck/java/AnnotationProcessingEventTest.java +++ b/test/com/facebook/buck/jvm/java/AnnotationProcessingEventTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static com.facebook.buck.event.TestEventConfigerator.configureTestEvent; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/AnnotationProcessingParamsTest.java b/test/com/facebook/buck/jvm/java/AnnotationProcessingParamsTest.java similarity index 98% rename from test/com/facebook/buck/java/AnnotationProcessingParamsTest.java rename to test/com/facebook/buck/jvm/java/AnnotationProcessingParamsTest.java index b161312762d..bede8924b4f 100644 --- a/test/com/facebook/buck/java/AnnotationProcessingParamsTest.java +++ b/test/com/facebook/buck/jvm/java/AnnotationProcessingParamsTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertThat; diff --git a/test/com/facebook/buck/java/BUCK b/test/com/facebook/buck/jvm/java/BUCK similarity index 85% rename from test/com/facebook/buck/java/BUCK rename to test/com/facebook/buck/jvm/java/BUCK index 22d003fabd0..3860d69b89d 100644 --- a/test/com/facebook/buck/java/BUCK +++ b/test/com/facebook/buck/jvm/java/BUCK @@ -18,10 +18,10 @@ java_library( '//src/com/facebook/buck/cxx:platform', '//src/com/facebook/buck/cxx:rules', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', - '//src/com/facebook/buck/java:steps', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', + '//src/com/facebook/buck/jvm/java:steps', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:rule_pattern', '//src/com/facebook/buck/rules:build_rule', @@ -48,7 +48,7 @@ java_library( '//src/com/facebook/buck/model:model', ], exported_deps = [ - '//src/com/facebook/buck/java:packagefinder', + '//src/com/facebook/buck/jvm/java:packagefinder', ], visibility = [ '//test/...', @@ -59,7 +59,7 @@ java_library( name = 'javac-env', srcs = [ 'JavaCompilationConstants.java', ], deps = [ - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/rules:build_rule', '//third-party/java/guava:guava', ], @@ -102,16 +102,16 @@ java_test( '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:autodeps', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:config', - '//src/com/facebook/buck/java:packagefinder', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java/runner:runner', - '//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:autodeps', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:config', + '//src/com/facebook/buck/jvm/java:packagefinder', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java/runner:runner', + '//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/json:json', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:config', diff --git a/test/com/facebook/buck/java/BuildTargetSourcePathAsSrcIntegrationTest.java b/test/com/facebook/buck/jvm/java/BuildTargetSourcePathAsSrcIntegrationTest.java similarity index 98% rename from test/com/facebook/buck/java/BuildTargetSourcePathAsSrcIntegrationTest.java rename to test/com/facebook/buck/jvm/java/BuildTargetSourcePathAsSrcIntegrationTest.java index 593ef2afc2d..67a483cf19d 100644 --- a/test/com/facebook/buck/java/BuildTargetSourcePathAsSrcIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/BuildTargetSourcePathAsSrcIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; diff --git a/test/com/facebook/buck/java/CachedTestIntegrationTest.java b/test/com/facebook/buck/jvm/java/CachedTestIntegrationTest.java similarity index 99% rename from test/com/facebook/buck/java/CachedTestIntegrationTest.java rename to test/com/facebook/buck/jvm/java/CachedTestIntegrationTest.java index 2a6fce1148a..8b8016edfec 100644 --- a/test/com/facebook/buck/java/CachedTestIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/CachedTestIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; diff --git a/test/com/facebook/buck/java/CachedTestRunReportingIntegrationTest.java b/test/com/facebook/buck/jvm/java/CachedTestRunReportingIntegrationTest.java similarity index 98% rename from test/com/facebook/buck/java/CachedTestRunReportingIntegrationTest.java rename to test/com/facebook/buck/jvm/java/CachedTestRunReportingIntegrationTest.java index f6eab1bce66..6e0d52686b8 100644 --- a/test/com/facebook/buck/java/CachedTestRunReportingIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/CachedTestRunReportingIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; diff --git a/test/com/facebook/buck/java/CalculateAbiStepTest.java b/test/com/facebook/buck/jvm/java/CalculateAbiStepTest.java similarity index 98% rename from test/com/facebook/buck/java/CalculateAbiStepTest.java rename to test/com/facebook/buck/jvm/java/CalculateAbiStepTest.java index 2b2f6a4d7fc..f76b7386163 100644 --- a/test/com/facebook/buck/java/CalculateAbiStepTest.java +++ b/test/com/facebook/buck/jvm/java/CalculateAbiStepTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/CalculateAbiTest.java b/test/com/facebook/buck/jvm/java/CalculateAbiTest.java similarity index 99% rename from test/com/facebook/buck/java/CalculateAbiTest.java rename to test/com/facebook/buck/jvm/java/CalculateAbiTest.java index 352e289dff5..0588664779e 100644 --- a/test/com/facebook/buck/java/CalculateAbiTest.java +++ b/test/com/facebook/buck/jvm/java/CalculateAbiTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertThat; diff --git a/test/com/facebook/buck/java/CleanClasspathIntegrationTest.java b/test/com/facebook/buck/jvm/java/CleanClasspathIntegrationTest.java similarity index 98% rename from test/com/facebook/buck/java/CleanClasspathIntegrationTest.java rename to test/com/facebook/buck/jvm/java/CleanClasspathIntegrationTest.java index 3d103355c67..549482852f9 100644 --- a/test/com/facebook/buck/java/CleanClasspathIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/CleanClasspathIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertTrue; diff --git a/test/com/facebook/buck/java/CompileSrcZipIntegrationTest.java b/test/com/facebook/buck/jvm/java/CompileSrcZipIntegrationTest.java similarity index 97% rename from test/com/facebook/buck/java/CompileSrcZipIntegrationTest.java rename to test/com/facebook/buck/jvm/java/CompileSrcZipIntegrationTest.java index a49dba43609..6af1aedaf84 100644 --- a/test/com/facebook/buck/java/CompileSrcZipIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/CompileSrcZipIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.testutil.integration.DebuggableTemporaryFolder; import com.facebook.buck.testutil.integration.ProjectWorkspace; diff --git a/test/com/facebook/buck/java/CopyResourcesStepIntegrationTest.java b/test/com/facebook/buck/jvm/java/CopyResourcesStepIntegrationTest.java similarity index 98% rename from test/com/facebook/buck/java/CopyResourcesStepIntegrationTest.java rename to test/com/facebook/buck/jvm/java/CopyResourcesStepIntegrationTest.java index 7478608fb1b..d32b8e08725 100644 --- a/test/com/facebook/buck/java/CopyResourcesStepIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/CopyResourcesStepIntegrationTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/CopyResourcesStepMustCorrectlyParseFilepathIntegrationTest.java b/test/com/facebook/buck/jvm/java/CopyResourcesStepMustCorrectlyParseFilepathIntegrationTest.java similarity index 97% rename from test/com/facebook/buck/java/CopyResourcesStepMustCorrectlyParseFilepathIntegrationTest.java rename to test/com/facebook/buck/jvm/java/CopyResourcesStepMustCorrectlyParseFilepathIntegrationTest.java index aac290f9a60..a463054c806 100644 --- a/test/com/facebook/buck/java/CopyResourcesStepMustCorrectlyParseFilepathIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/CopyResourcesStepMustCorrectlyParseFilepathIntegrationTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.testutil.integration.DebuggableTemporaryFolder; import com.facebook.buck.testutil.integration.ProjectWorkspace; diff --git a/test/com/facebook/buck/java/CopyResourcesStepTest.java b/test/com/facebook/buck/jvm/java/CopyResourcesStepTest.java similarity index 99% rename from test/com/facebook/buck/java/CopyResourcesStepTest.java rename to test/com/facebook/buck/jvm/java/CopyResourcesStepTest.java index 77d6faa64a8..9a4e71500b8 100644 --- a/test/com/facebook/buck/java/CopyResourcesStepTest.java +++ b/test/com/facebook/buck/jvm/java/CopyResourcesStepTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static com.facebook.buck.util.BuckConstant.SCRATCH_PATH; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/DefaultJavaLibraryIntegrationTest.java b/test/com/facebook/buck/jvm/java/DefaultJavaLibraryIntegrationTest.java similarity index 99% rename from test/com/facebook/buck/java/DefaultJavaLibraryIntegrationTest.java rename to test/com/facebook/buck/jvm/java/DefaultJavaLibraryIntegrationTest.java index 908d84f2a8d..ea94a780d0c 100644 --- a/test/com/facebook/buck/java/DefaultJavaLibraryIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/DefaultJavaLibraryIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.file.StandardOpenOption.WRITE; diff --git a/test/com/facebook/buck/java/DefaultJavaLibraryTest.java b/test/com/facebook/buck/jvm/java/DefaultJavaLibraryTest.java similarity index 99% rename from test/com/facebook/buck/java/DefaultJavaLibraryTest.java rename to test/com/facebook/buck/jvm/java/DefaultJavaLibraryTest.java index c103bf61409..530fcd41ba5 100644 --- a/test/com/facebook/buck/java/DefaultJavaLibraryTest.java +++ b/test/com/facebook/buck/jvm/java/DefaultJavaLibraryTest.java @@ -14,9 +14,9 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import static com.facebook.buck.util.BuckConstant.SCRATCH_PATH; import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect; @@ -34,7 +34,7 @@ import com.facebook.buck.event.BuckEventBusFactory; import com.facebook.buck.io.MorePaths; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.abi.AbiWriterProtocol; +import com.facebook.buck.jvm.java.abi.AbiWriterProtocol; import com.facebook.buck.model.BuildId; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; diff --git a/test/com/facebook/buck/java/DiagnosticPrettyPrinterTest.java b/test/com/facebook/buck/jvm/java/DiagnosticPrettyPrinterTest.java similarity index 99% rename from test/com/facebook/buck/java/DiagnosticPrettyPrinterTest.java rename to test/com/facebook/buck/jvm/java/DiagnosticPrettyPrinterTest.java index d71d52f477f..35759c334e3 100644 --- a/test/com/facebook/buck/java/DiagnosticPrettyPrinterTest.java +++ b/test/com/facebook/buck/jvm/java/DiagnosticPrettyPrinterTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/com/facebook/buck/java/EmptyTestIntegrationTest.java b/test/com/facebook/buck/jvm/java/EmptyTestIntegrationTest.java similarity index 97% rename from test/com/facebook/buck/java/EmptyTestIntegrationTest.java rename to test/com/facebook/buck/jvm/java/EmptyTestIntegrationTest.java index 3e2f2cd0719..2d2a41cdd85 100644 --- a/test/com/facebook/buck/java/EmptyTestIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/EmptyTestIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.testutil.integration.DebuggableTemporaryFolder; import com.facebook.buck.testutil.integration.ProjectWorkspace; diff --git a/test/com/facebook/buck/java/ExternalJavacEscaperTest.java b/test/com/facebook/buck/jvm/java/ExternalJavacEscaperTest.java similarity index 98% rename from test/com/facebook/buck/java/ExternalJavacEscaperTest.java rename to test/com/facebook/buck/jvm/java/ExternalJavacEscaperTest.java index e72df91af4d..bd95f20cb6a 100644 --- a/test/com/facebook/buck/java/ExternalJavacEscaperTest.java +++ b/test/com/facebook/buck/jvm/java/ExternalJavacEscaperTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assume.assumeTrue; diff --git a/test/com/facebook/buck/java/ExternalJavacIntegrationTest.java b/test/com/facebook/buck/jvm/java/ExternalJavacIntegrationTest.java similarity index 99% rename from test/com/facebook/buck/java/ExternalJavacIntegrationTest.java rename to test/com/facebook/buck/jvm/java/ExternalJavacIntegrationTest.java index 86c8ad146f5..e4ba7a85db8 100644 --- a/test/com/facebook/buck/java/ExternalJavacIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/ExternalJavacIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeTrue; diff --git a/test/com/facebook/buck/java/ExternalJavacTest.java b/test/com/facebook/buck/jvm/java/ExternalJavacTest.java similarity index 99% rename from test/com/facebook/buck/java/ExternalJavacTest.java rename to test/com/facebook/buck/jvm/java/ExternalJavacTest.java index f72ea938800..a27ba8ca602 100644 --- a/test/com/facebook/buck/java/ExternalJavacTest.java +++ b/test/com/facebook/buck/jvm/java/ExternalJavacTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/FakeJavaLibrary.java b/test/com/facebook/buck/jvm/java/FakeJavaLibrary.java similarity index 99% rename from test/com/facebook/buck/java/FakeJavaLibrary.java rename to test/com/facebook/buck/jvm/java/FakeJavaLibrary.java index 66a224d6ac9..e8bdf72339c 100644 --- a/test/com/facebook/buck/java/FakeJavaLibrary.java +++ b/test/com/facebook/buck/jvm/java/FakeJavaLibrary.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static com.facebook.buck.rules.BuildableProperties.Kind.LIBRARY; diff --git a/test/com/facebook/buck/java/FakeJavaPackageFinder.java b/test/com/facebook/buck/jvm/java/FakeJavaPackageFinder.java similarity index 96% rename from test/com/facebook/buck/java/FakeJavaPackageFinder.java rename to test/com/facebook/buck/jvm/java/FakeJavaPackageFinder.java index 39fee061590..6c4a00fe5c0 100644 --- a/test/com/facebook/buck/java/FakeJavaPackageFinder.java +++ b/test/com/facebook/buck/jvm/java/FakeJavaPackageFinder.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.BuildTarget; diff --git a/test/com/facebook/buck/java/GenerateCodeCoverageReportStepTest.java b/test/com/facebook/buck/jvm/java/GenerateCodeCoverageReportStepTest.java similarity index 99% rename from test/com/facebook/buck/java/GenerateCodeCoverageReportStepTest.java rename to test/com/facebook/buck/jvm/java/GenerateCodeCoverageReportStepTest.java index 31b7f2dd8c9..d138b15e58d 100644 --- a/test/com/facebook/buck/java/GenerateCodeCoverageReportStepTest.java +++ b/test/com/facebook/buck/jvm/java/GenerateCodeCoverageReportStepTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.replay; diff --git a/test/com/facebook/buck/java/GenruleDepsIntegrationTest.java b/test/com/facebook/buck/jvm/java/GenruleDepsIntegrationTest.java similarity index 98% rename from test/com/facebook/buck/java/GenruleDepsIntegrationTest.java rename to test/com/facebook/buck/jvm/java/GenruleDepsIntegrationTest.java index 49e9e3a5eae..e544deffa0b 100644 --- a/test/com/facebook/buck/java/GenruleDepsIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/GenruleDepsIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; diff --git a/test/com/facebook/buck/java/JUnitStepTest.java b/test/com/facebook/buck/jvm/java/JUnitStepTest.java similarity index 98% rename from test/com/facebook/buck/java/JUnitStepTest.java rename to test/com/facebook/buck/jvm/java/JUnitStepTest.java index 00ca45257d8..53357a60332 100644 --- a/test/com/facebook/buck/java/JUnitStepTest.java +++ b/test/com/facebook/buck/jvm/java/JUnitStepTest.java @@ -14,11 +14,11 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; -import com.facebook.buck.java.runner.FileClassPathRunner; +import com.facebook.buck.jvm.java.runner.FileClassPathRunner; import com.facebook.buck.model.BuildId; import com.facebook.buck.step.ExecutionContext; import com.facebook.buck.step.TestExecutionContext; diff --git a/test/com/facebook/buck/java/JarDirectoryStepTest.java b/test/com/facebook/buck/jvm/java/JarDirectoryStepTest.java similarity index 99% rename from test/com/facebook/buck/java/JarDirectoryStepTest.java rename to test/com/facebook/buck/jvm/java/JarDirectoryStepTest.java index 5f1b6336888..a913c511d10 100644 --- a/test/com/facebook/buck/java/JarDirectoryStepTest.java +++ b/test/com/facebook/buck/jvm/java/JarDirectoryStepTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static java.util.jar.Attributes.Name.IMPLEMENTATION_VERSION; import static java.util.jar.Attributes.Name.MANIFEST_VERSION; diff --git a/test/com/facebook/buck/java/JavaBinaryDescriptionTest.java b/test/com/facebook/buck/jvm/java/JavaBinaryDescriptionTest.java similarity index 98% rename from test/com/facebook/buck/java/JavaBinaryDescriptionTest.java rename to test/com/facebook/buck/jvm/java/JavaBinaryDescriptionTest.java index 6fc9e94fbd8..c63e0fbfeb9 100644 --- a/test/com/facebook/buck/java/JavaBinaryDescriptionTest.java +++ b/test/com/facebook/buck/jvm/java/JavaBinaryDescriptionTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.hamcrest.junit.MatcherAssert.assertThat; diff --git a/test/com/facebook/buck/java/JavaBinaryIntegrationTest.java b/test/com/facebook/buck/jvm/java/JavaBinaryIntegrationTest.java similarity index 98% rename from test/com/facebook/buck/java/JavaBinaryIntegrationTest.java rename to test/com/facebook/buck/jvm/java/JavaBinaryIntegrationTest.java index 1c191aa9d72..be4fc0bb533 100644 --- a/test/com/facebook/buck/java/JavaBinaryIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/JavaBinaryIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/JavaBinaryRuleBuilder.java b/test/com/facebook/buck/jvm/java/JavaBinaryRuleBuilder.java similarity index 92% rename from test/com/facebook/buck/java/JavaBinaryRuleBuilder.java rename to test/com/facebook/buck/jvm/java/JavaBinaryRuleBuilder.java index 4961624ebfe..55708b43741 100644 --- a/test/com/facebook/buck/java/JavaBinaryRuleBuilder.java +++ b/test/com/facebook/buck/jvm/java/JavaBinaryRuleBuilder.java @@ -14,9 +14,9 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import com.facebook.buck.cli.FakeBuckConfig; import com.facebook.buck.cxx.CxxBuckConfig; diff --git a/test/com/facebook/buck/java/JavaBinaryTest.java b/test/com/facebook/buck/jvm/java/JavaBinaryTest.java similarity index 99% rename from test/com/facebook/buck/java/JavaBinaryTest.java rename to test/com/facebook/buck/jvm/java/JavaBinaryTest.java index 089fea86b7a..eb831fa73a3 100644 --- a/test/com/facebook/buck/java/JavaBinaryTest.java +++ b/test/com/facebook/buck/jvm/java/JavaBinaryTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/com/facebook/buck/java/JavaBuckConfigTest.java b/test/com/facebook/buck/jvm/java/JavaBuckConfigTest.java similarity index 98% rename from test/com/facebook/buck/java/JavaBuckConfigTest.java rename to test/com/facebook/buck/jvm/java/JavaBuckConfigTest.java index 9f7cd67e303..bd1a300f0e6 100644 --- a/test/com/facebook/buck/java/JavaBuckConfigTest.java +++ b/test/com/facebook/buck/jvm/java/JavaBuckConfigTest.java @@ -14,10 +14,10 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; -import static com.facebook.buck.java.JavaBuckConfig.TARGETED_JAVA_VERSION; +import static com.facebook.buck.jvm.java.JavaBuckConfig.TARGETED_JAVA_VERSION; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/com/facebook/buck/java/JavaCompilationConstants.java b/test/com/facebook/buck/jvm/java/JavaCompilationConstants.java similarity index 96% rename from test/com/facebook/buck/java/JavaCompilationConstants.java rename to test/com/facebook/buck/jvm/java/JavaCompilationConstants.java index 932585bb53e..7632599bc21 100644 --- a/test/com/facebook/buck/java/JavaCompilationConstants.java +++ b/test/com/facebook/buck/jvm/java/JavaCompilationConstants.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; public class JavaCompilationConstants { diff --git a/test/com/facebook/buck/java/JavaFileParserTest.java b/test/com/facebook/buck/jvm/java/JavaFileParserTest.java similarity index 96% rename from test/com/facebook/buck/java/JavaFileParserTest.java rename to test/com/facebook/buck/jvm/java/JavaFileParserTest.java index bc6a4585c32..b07ba37649c 100644 --- a/test/com/facebook/buck/java/JavaFileParserTest.java +++ b/test/com/facebook/buck/jvm/java/JavaFileParserTest.java @@ -14,9 +14,9 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import static org.junit.Assert.assertEquals; import com.google.common.collect.ImmutableSortedSet; diff --git a/test/com/facebook/buck/java/JavaLibraryBuilder.java b/test/com/facebook/buck/jvm/java/JavaLibraryBuilder.java similarity index 96% rename from test/com/facebook/buck/java/JavaLibraryBuilder.java rename to test/com/facebook/buck/jvm/java/JavaLibraryBuilder.java index 3b2196cbe23..ca0688ba0e7 100644 --- a/test/com/facebook/buck/java/JavaLibraryBuilder.java +++ b/test/com/facebook/buck/jvm/java/JavaLibraryBuilder.java @@ -14,9 +14,9 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.Either; diff --git a/test/com/facebook/buck/java/JavaLibraryDescriptionTest.java b/test/com/facebook/buck/jvm/java/JavaLibraryDescriptionTest.java similarity index 99% rename from test/com/facebook/buck/java/JavaLibraryDescriptionTest.java rename to test/com/facebook/buck/jvm/java/JavaLibraryDescriptionTest.java index 78e3e0505c1..f95d6e799d9 100644 --- a/test/com/facebook/buck/java/JavaLibraryDescriptionTest.java +++ b/test/com/facebook/buck/jvm/java/JavaLibraryDescriptionTest.java @@ -14,9 +14,9 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; -import static com.facebook.buck.java.BuiltInJavac.DEFAULT; +import static com.facebook.buck.jvm.java.BuiltInJavac.DEFAULT; import static com.facebook.buck.rules.TestCellBuilder.createCellRoots; import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/JavaSourceJarTest.java b/test/com/facebook/buck/jvm/java/JavaSourceJarTest.java similarity index 99% rename from test/com/facebook/buck/java/JavaSourceJarTest.java rename to test/com/facebook/buck/jvm/java/JavaSourceJarTest.java index 3bd6727ba76..58606d709ff 100644 --- a/test/com/facebook/buck/java/JavaSourceJarTest.java +++ b/test/com/facebook/buck/jvm/java/JavaSourceJarTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.createNiceMock; diff --git a/test/com/facebook/buck/java/JavaSymbolFinderIntegrationTest.java b/test/com/facebook/buck/jvm/java/JavaSymbolFinderIntegrationTest.java similarity index 97% rename from test/com/facebook/buck/java/JavaSymbolFinderIntegrationTest.java rename to test/com/facebook/buck/jvm/java/JavaSymbolFinderIntegrationTest.java index 23ef96e100f..912b1c7375b 100644 --- a/test/com/facebook/buck/java/JavaSymbolFinderIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/JavaSymbolFinderIntegrationTest.java @@ -14,9 +14,9 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import static org.junit.Assert.assertEquals; import com.facebook.buck.cli.BuckConfig; diff --git a/test/com/facebook/buck/java/JavaTestBuilder.java b/test/com/facebook/buck/jvm/java/JavaTestBuilder.java similarity index 94% rename from test/com/facebook/buck/java/JavaTestBuilder.java rename to test/com/facebook/buck/jvm/java/JavaTestBuilder.java index ceb69d4e0b6..7fddf668ba1 100644 --- a/test/com/facebook/buck/java/JavaTestBuilder.java +++ b/test/com/facebook/buck/jvm/java/JavaTestBuilder.java @@ -14,9 +14,9 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.AbstractNodeBuilder; diff --git a/test/com/facebook/buck/java/JavaTestDescriptionTest.java b/test/com/facebook/buck/jvm/java/JavaTestDescriptionTest.java similarity index 98% rename from test/com/facebook/buck/java/JavaTestDescriptionTest.java rename to test/com/facebook/buck/jvm/java/JavaTestDescriptionTest.java index 2f9f7eaf9e5..96f669ce799 100644 --- a/test/com/facebook/buck/java/JavaTestDescriptionTest.java +++ b/test/com/facebook/buck/jvm/java/JavaTestDescriptionTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.hamcrest.junit.MatcherAssert.assertThat; diff --git a/test/com/facebook/buck/java/JavaTestGetClassNamesIntegrationTest.java b/test/com/facebook/buck/jvm/java/JavaTestGetClassNamesIntegrationTest.java similarity index 99% rename from test/com/facebook/buck/java/JavaTestGetClassNamesIntegrationTest.java rename to test/com/facebook/buck/jvm/java/JavaTestGetClassNamesIntegrationTest.java index dccf0f043ff..cc038d73591 100644 --- a/test/com/facebook/buck/java/JavaTestGetClassNamesIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/JavaTestGetClassNamesIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/JavaTestIntegrationTest.java b/test/com/facebook/buck/jvm/java/JavaTestIntegrationTest.java similarity index 99% rename from test/com/facebook/buck/java/JavaTestIntegrationTest.java rename to test/com/facebook/buck/jvm/java/JavaTestIntegrationTest.java index 524c08f83b9..3f5ad3c898f 100644 --- a/test/com/facebook/buck/java/JavaTestIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/JavaTestIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertThat; diff --git a/test/com/facebook/buck/java/JavaTestRuleTest.java b/test/com/facebook/buck/jvm/java/JavaTestRuleTest.java similarity index 99% rename from test/com/facebook/buck/java/JavaTestRuleTest.java rename to test/com/facebook/buck/jvm/java/JavaTestRuleTest.java index 4f01f8e1ed5..67c00582166 100644 --- a/test/com/facebook/buck/java/JavaTestRuleTest.java +++ b/test/com/facebook/buck/jvm/java/JavaTestRuleTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/test/com/facebook/buck/java/JavacErrorParserTest.java b/test/com/facebook/buck/jvm/java/JavacErrorParserTest.java similarity index 93% rename from test/com/facebook/buck/java/JavacErrorParserTest.java rename to test/com/facebook/buck/jvm/java/JavacErrorParserTest.java index eda6fb9c35f..c96cdd34efa 100644 --- a/test/com/facebook/buck/java/JavacErrorParserTest.java +++ b/test/com/facebook/buck/jvm/java/JavacErrorParserTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; @@ -59,21 +59,21 @@ public void shouldFindSymbolFromCannotFindSymbolError() { public void shouldFindSymbolFromCannotFindSymbolInCurrentPackageError() { String error = projectFilesystem.getRootPath().toAbsolutePath().normalize() + - "/src/com/facebook/buck/java/DefaultJavaLibrary.java:277: error: cannot find symbol\n" + + "/src/com/facebook/buck/jvm/java/DefaultJavaLibrary.java:277: error: cannot find symbol\n" + " final JavacStep javacStep;\n" + " ^\n" + " symbol: class JavacStep\n" + - " location: class com.facebook.buck.java.DefaultJavaLibrary"; + " location: class com.facebook.buck.jvm.java.DefaultJavaLibrary"; assertEquals( "JavacErrorParser didn't find the right symbol.", - Optional.of("com.facebook.buck.java.JavacStep"), + Optional.of("com.facebook.buck.jvm.java.JavacStep"), javacErrorParser.getMissingSymbolFromCompilerError(error)); String errorWithVariable = error.replace("class JavacStep", "variable JavacStep"); assertEquals( "JavacErrorParser didn't find the right symbol for a 'variable' error.", - Optional.of("com.facebook.buck.java.JavacStep"), + Optional.of("com.facebook.buck.jvm.java.JavacStep"), javacErrorParser.getMissingSymbolFromCompilerError(errorWithVariable)); } diff --git a/test/com/facebook/buck/java/JavacOptionsTest.java b/test/com/facebook/buck/jvm/java/JavacOptionsTest.java similarity index 99% rename from test/com/facebook/buck/java/JavacOptionsTest.java rename to test/com/facebook/buck/jvm/java/JavacOptionsTest.java index b01886d7011..f9e66199550 100644 --- a/test/com/facebook/buck/java/JavacOptionsTest.java +++ b/test/com/facebook/buck/jvm/java/JavacOptionsTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/JavacStepTest.java b/test/com/facebook/buck/jvm/java/JavacStepTest.java similarity index 97% rename from test/com/facebook/buck/java/JavacStepTest.java rename to test/com/facebook/buck/jvm/java/JavacStepTest.java index 2571c2f5019..7258351dc9e 100644 --- a/test/com/facebook/buck/java/JavacStepTest.java +++ b/test/com/facebook/buck/jvm/java/JavacStepTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/Jsr199JavacIntegrationTest.java b/test/com/facebook/buck/jvm/java/Jsr199JavacIntegrationTest.java similarity index 99% rename from test/com/facebook/buck/java/Jsr199JavacIntegrationTest.java rename to test/com/facebook/buck/jvm/java/Jsr199JavacIntegrationTest.java index 80be7b27c36..1b5556a12b4 100644 --- a/test/com/facebook/buck/java/Jsr199JavacIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/Jsr199JavacIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/com/facebook/buck/java/Jsr199JavacTest.java b/test/com/facebook/buck/jvm/java/Jsr199JavacTest.java similarity index 95% rename from test/com/facebook/buck/java/Jsr199JavacTest.java rename to test/com/facebook/buck/jvm/java/Jsr199JavacTest.java index edae336e16d..7d6ca359e48 100644 --- a/test/com/facebook/buck/java/Jsr199JavacTest.java +++ b/test/com/facebook/buck/jvm/java/Jsr199JavacTest.java @@ -14,9 +14,9 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; -import static com.facebook.buck.java.JavaBuckConfig.TARGETED_JAVA_VERSION; +import static com.facebook.buck.jvm.java.JavaBuckConfig.TARGETED_JAVA_VERSION; import static org.junit.Assert.assertEquals; import com.google.common.base.Optional; diff --git a/test/com/facebook/buck/java/KeystoreBuilder.java b/test/com/facebook/buck/jvm/java/KeystoreBuilder.java similarity index 97% rename from test/com/facebook/buck/java/KeystoreBuilder.java rename to test/com/facebook/buck/jvm/java/KeystoreBuilder.java index c6cad6ee7dd..20bc4373dd3 100644 --- a/test/com/facebook/buck/java/KeystoreBuilder.java +++ b/test/com/facebook/buck/jvm/java/KeystoreBuilder.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.AbstractNodeBuilder; diff --git a/test/com/facebook/buck/java/KeystoreTest.java b/test/com/facebook/buck/jvm/java/KeystoreTest.java similarity index 98% rename from test/com/facebook/buck/java/KeystoreTest.java rename to test/com/facebook/buck/jvm/java/KeystoreTest.java index 50cdcb6f105..1c6c2fa2a7b 100644 --- a/test/com/facebook/buck/java/KeystoreTest.java +++ b/test/com/facebook/buck/jvm/java/KeystoreTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.replay; diff --git a/test/com/facebook/buck/java/MissingSymbolsHandlerIntegrationTest.java b/test/com/facebook/buck/jvm/java/MissingSymbolsHandlerIntegrationTest.java similarity index 97% rename from test/com/facebook/buck/java/MissingSymbolsHandlerIntegrationTest.java rename to test/com/facebook/buck/jvm/java/MissingSymbolsHandlerIntegrationTest.java index 81258a2c768..1a0c47f78b4 100644 --- a/test/com/facebook/buck/java/MissingSymbolsHandlerIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/MissingSymbolsHandlerIntegrationTest.java @@ -14,9 +14,9 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/PrebuiltJarBuilder.java b/test/com/facebook/buck/jvm/java/PrebuiltJarBuilder.java similarity index 97% rename from test/com/facebook/buck/java/PrebuiltJarBuilder.java rename to test/com/facebook/buck/jvm/java/PrebuiltJarBuilder.java index 7519dfa76e6..ae792cba5d4 100644 --- a/test/com/facebook/buck/java/PrebuiltJarBuilder.java +++ b/test/com/facebook/buck/jvm/java/PrebuiltJarBuilder.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.AbstractNodeBuilder; diff --git a/test/com/facebook/buck/java/PrebuiltJarIntegrationTest.java b/test/com/facebook/buck/jvm/java/PrebuiltJarIntegrationTest.java similarity index 99% rename from test/com/facebook/buck/java/PrebuiltJarIntegrationTest.java rename to test/com/facebook/buck/jvm/java/PrebuiltJarIntegrationTest.java index b741eb6c045..eb9020ee2a6 100644 --- a/test/com/facebook/buck/java/PrebuiltJarIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/PrebuiltJarIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/PrebuiltJarTest.java b/test/com/facebook/buck/jvm/java/PrebuiltJarTest.java similarity index 98% rename from test/com/facebook/buck/java/PrebuiltJarTest.java rename to test/com/facebook/buck/jvm/java/PrebuiltJarTest.java index 3f5576fb4a1..01692d6d581 100644 --- a/test/com/facebook/buck/java/PrebuiltJarTest.java +++ b/test/com/facebook/buck/jvm/java/PrebuiltJarTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertTrue; diff --git a/test/com/facebook/buck/java/ResourcesRootIntegrationTest.java b/test/com/facebook/buck/jvm/java/ResourcesRootIntegrationTest.java similarity index 98% rename from test/com/facebook/buck/java/ResourcesRootIntegrationTest.java rename to test/com/facebook/buck/jvm/java/ResourcesRootIntegrationTest.java index 23e0e1e49e3..49526451547 100644 --- a/test/com/facebook/buck/java/ResourcesRootIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/ResourcesRootIntegrationTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/SrcRootsFinderIntegrationTest.java b/test/com/facebook/buck/jvm/java/SrcRootsFinderIntegrationTest.java similarity index 98% rename from test/com/facebook/buck/java/SrcRootsFinderIntegrationTest.java rename to test/com/facebook/buck/jvm/java/SrcRootsFinderIntegrationTest.java index be26f93472b..550b4cbda27 100644 --- a/test/com/facebook/buck/java/SrcRootsFinderIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/SrcRootsFinderIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java; +package com.facebook.buck.jvm.java; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertThat; diff --git a/test/com/facebook/buck/java/abi/AbiClass.java b/test/com/facebook/buck/jvm/java/abi/AbiClass.java similarity index 98% rename from test/com/facebook/buck/java/abi/AbiClass.java rename to test/com/facebook/buck/jvm/java/abi/AbiClass.java index 5d72b06eb34..93e6bd97ac1 100644 --- a/test/com/facebook/buck/java/abi/AbiClass.java +++ b/test/com/facebook/buck/jvm/java/abi/AbiClass.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import static org.junit.Assert.fail; diff --git a/test/com/facebook/buck/java/abi/BUCK b/test/com/facebook/buck/jvm/java/abi/BUCK similarity index 87% rename from test/com/facebook/buck/java/abi/BUCK rename to test/com/facebook/buck/jvm/java/abi/BUCK index d06c769e6b8..deab301b991 100644 --- a/test/com/facebook/buck/java/abi/BUCK +++ b/test/com/facebook/buck/jvm/java/abi/BUCK @@ -3,7 +3,7 @@ java_test( srcs = glob(['*.java']), deps = [ '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java/abi:abi', + '//src/com/facebook/buck/jvm/java/abi:abi', '//src/com/facebook/buck/zip:unzip', '//test/com/facebook/buck/testutil/integration:integration', '//third-party/java/asm:asm', diff --git a/test/com/facebook/buck/java/abi/MirrorTest.java b/test/com/facebook/buck/jvm/java/abi/MirrorTest.java similarity index 99% rename from test/com/facebook/buck/java/abi/MirrorTest.java rename to test/com/facebook/buck/jvm/java/abi/MirrorTest.java index 135d8910676..6e814d44655 100644 --- a/test/com/facebook/buck/java/abi/MirrorTest.java +++ b/test/com/facebook/buck/jvm/java/abi/MirrorTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/com/facebook/buck/java/abi/StubJarIntegrationTest.java b/test/com/facebook/buck/jvm/java/abi/StubJarIntegrationTest.java similarity index 98% rename from test/com/facebook/buck/java/abi/StubJarIntegrationTest.java rename to test/com/facebook/buck/jvm/java/abi/StubJarIntegrationTest.java index 333567c2455..d0e45e4f3e2 100644 --- a/test/com/facebook/buck/java/abi/StubJarIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/abi/StubJarIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.abi; +package com.facebook.buck.jvm.java.abi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/com/facebook/buck/java/abi/testdata/sample/android.jar b/test/com/facebook/buck/jvm/java/abi/testdata/sample/android.jar similarity index 100% rename from test/com/facebook/buck/java/abi/testdata/sample/android.jar rename to test/com/facebook/buck/jvm/java/abi/testdata/sample/android.jar diff --git a/test/com/facebook/buck/java/abi/testdata/sample/junit.jar b/test/com/facebook/buck/jvm/java/abi/testdata/sample/junit.jar similarity index 100% rename from test/com/facebook/buck/java/abi/testdata/sample/junit.jar rename to test/com/facebook/buck/jvm/java/abi/testdata/sample/junit.jar diff --git a/test/com/facebook/buck/java/abi/testdata/sample/unity.jar b/test/com/facebook/buck/jvm/java/abi/testdata/sample/unity.jar similarity index 100% rename from test/com/facebook/buck/java/abi/testdata/sample/unity.jar rename to test/com/facebook/buck/jvm/java/abi/testdata/sample/unity.jar diff --git a/test/com/facebook/buck/java/classes/BUCK b/test/com/facebook/buck/jvm/java/classes/BUCK similarity index 77% rename from test/com/facebook/buck/java/classes/BUCK rename to test/com/facebook/buck/jvm/java/classes/BUCK index f790ea59d91..1fed16b1cb2 100644 --- a/test/com/facebook/buck/java/classes/BUCK +++ b/test/com/facebook/buck/jvm/java/classes/BUCK @@ -2,7 +2,7 @@ java_test( name = 'classes', srcs = glob(['*.java']), deps = [ - '//src/com/facebook/buck/java/classes:classes', + '//src/com/facebook/buck/jvm/java/classes:classes', '//src/com/facebook/buck/io:io', '//third-party/java/guava:guava', '//third-party/java/junit:junit', diff --git a/test/com/facebook/buck/java/classes/ClasspathTraversalTest.java b/test/com/facebook/buck/jvm/java/classes/ClasspathTraversalTest.java similarity index 98% rename from test/com/facebook/buck/java/classes/ClasspathTraversalTest.java rename to test/com/facebook/buck/jvm/java/classes/ClasspathTraversalTest.java index ff5cb8945b6..0c12b129fd1 100644 --- a/test/com/facebook/buck/java/classes/ClasspathTraversalTest.java +++ b/test/com/facebook/buck/jvm/java/classes/ClasspathTraversalTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.classes; +package com.facebook.buck.jvm.java.classes; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/com/facebook/buck/java/classes/FileLikesTest.java b/test/com/facebook/buck/jvm/java/classes/FileLikesTest.java similarity index 98% rename from test/com/facebook/buck/java/classes/FileLikesTest.java rename to test/com/facebook/buck/jvm/java/classes/FileLikesTest.java index 782f4114305..3b2d56f368f 100644 --- a/test/com/facebook/buck/java/classes/FileLikesTest.java +++ b/test/com/facebook/buck/jvm/java/classes/FileLikesTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.classes; +package com.facebook.buck.jvm.java.classes; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/com/facebook/buck/java/intellij/BUCK b/test/com/facebook/buck/jvm/java/intellij/BUCK similarity index 79% rename from test/com/facebook/buck/java/intellij/BUCK rename to test/com/facebook/buck/jvm/java/intellij/BUCK index f7c96ac2b22..44242e82de8 100644 --- a/test/com/facebook/buck/java/intellij/BUCK +++ b/test/com/facebook/buck/jvm/java/intellij/BUCK @@ -7,11 +7,11 @@ java_test( '//src/com/facebook/buck/cli:config', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java/intellij:intellij', - '//src/com/facebook/buck/java:autodeps', - '//src/com/facebook/buck/java:packagefinder', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java/intellij:intellij', + '//src/com/facebook/buck/jvm/java:autodeps', + '//src/com/facebook/buck/jvm/java:packagefinder', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/rules:build_rule', '//src/com/facebook/buck/rules:rules', @@ -21,8 +21,8 @@ java_test( '//src/com/facebook/buck/util:exceptions', '//test/com/facebook/buck/android:testutil', '//test/com/facebook/buck/cli:FakeBuckConfig', - '//test/com/facebook/buck/java:fakepackagefinder', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:fakepackagefinder', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/rules:testutil', '//test/com/facebook/buck/shell:testutil', diff --git a/test/com/facebook/buck/java/intellij/DefaultIjLibraryFactoryTest.java b/test/com/facebook/buck/jvm/java/intellij/DefaultIjLibraryFactoryTest.java similarity index 96% rename from test/com/facebook/buck/java/intellij/DefaultIjLibraryFactoryTest.java rename to test/com/facebook/buck/jvm/java/intellij/DefaultIjLibraryFactoryTest.java index d9469765503..ba9f6c45720 100644 --- a/test/com/facebook/buck/java/intellij/DefaultIjLibraryFactoryTest.java +++ b/test/com/facebook/buck/jvm/java/intellij/DefaultIjLibraryFactoryTest.java @@ -14,13 +14,13 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import static org.junit.Assert.assertEquals; import com.facebook.buck.android.AndroidPrebuiltAarBuilder; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.PrebuiltJarBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.PrebuiltJarBuilder; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRuleResolver; import com.facebook.buck.rules.SourcePath; diff --git a/test/com/facebook/buck/java/intellij/IjFolderTest.java b/test/com/facebook/buck/jvm/java/intellij/IjFolderTest.java similarity index 98% rename from test/com/facebook/buck/java/intellij/IjFolderTest.java rename to test/com/facebook/buck/jvm/java/intellij/IjFolderTest.java index fe2ee8a3dcd..7436b5504fa 100644 --- a/test/com/facebook/buck/java/intellij/IjFolderTest.java +++ b/test/com/facebook/buck/jvm/java/intellij/IjFolderTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/intellij/IjModuleFactoryTest.java b/test/com/facebook/buck/jvm/java/intellij/IjModuleFactoryTest.java similarity index 99% rename from test/com/facebook/buck/java/intellij/IjModuleFactoryTest.java rename to test/com/facebook/buck/jvm/java/intellij/IjModuleFactoryTest.java index 0ca6640afd0..45ea46b5794 100644 --- a/test/com/facebook/buck/java/intellij/IjModuleFactoryTest.java +++ b/test/com/facebook/buck/jvm/java/intellij/IjModuleFactoryTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,8 +22,8 @@ import com.facebook.buck.android.AndroidBinaryBuilder; import com.facebook.buck.android.AndroidLibraryBuilder; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.JavaTestBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaTestBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.SourcePath; diff --git a/test/com/facebook/buck/java/intellij/IjModuleGraphTest.java b/test/com/facebook/buck/jvm/java/intellij/IjModuleGraphTest.java similarity index 98% rename from test/com/facebook/buck/java/intellij/IjModuleGraphTest.java rename to test/com/facebook/buck/jvm/java/intellij/IjModuleGraphTest.java index 4a3c128dabc..6676b11e9aa 100644 --- a/test/com/facebook/buck/java/intellij/IjModuleGraphTest.java +++ b/test/com/facebook/buck/jvm/java/intellij/IjModuleGraphTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -22,10 +22,10 @@ import static org.junit.Assert.assertTrue; import com.facebook.buck.android.AndroidLibraryBuilder; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.JavaTestBuilder; -import com.facebook.buck.java.KeystoreBuilder; -import com.facebook.buck.java.PrebuiltJarBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaTestBuilder; +import com.facebook.buck.jvm.java.KeystoreBuilder; +import com.facebook.buck.jvm.java.PrebuiltJarBuilder; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRuleResolver; import com.facebook.buck.rules.SourcePath; diff --git a/test/com/facebook/buck/java/intellij/IjModuleTest.java b/test/com/facebook/buck/jvm/java/intellij/IjModuleTest.java similarity index 94% rename from test/com/facebook/buck/java/intellij/IjModuleTest.java rename to test/com/facebook/buck/jvm/java/intellij/IjModuleTest.java index 146350796e4..bc4dca5944d 100644 --- a/test/com/facebook/buck/java/intellij/IjModuleTest.java +++ b/test/com/facebook/buck/jvm/java/intellij/IjModuleTest.java @@ -14,11 +14,11 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import static org.junit.Assert.assertEquals; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.TargetNode; import com.google.common.collect.ImmutableSet; diff --git a/test/com/facebook/buck/java/intellij/IjProjectDataPreparerTest.java b/test/com/facebook/buck/jvm/java/intellij/IjProjectDataPreparerTest.java similarity index 98% rename from test/com/facebook/buck/java/intellij/IjProjectDataPreparerTest.java rename to test/com/facebook/buck/jvm/java/intellij/IjProjectDataPreparerTest.java index 204555073b7..3af20ab00fc 100644 --- a/test/com/facebook/buck/java/intellij/IjProjectDataPreparerTest.java +++ b/test/com/facebook/buck/jvm/java/intellij/IjProjectDataPreparerTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.contains; @@ -25,11 +25,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; -import com.facebook.buck.java.DefaultJavaPackageFinder; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.JavaPackageFinder; -import com.facebook.buck.java.JavaTestBuilder; -import com.facebook.buck.java.PrebuiltJarBuilder; +import com.facebook.buck.jvm.java.DefaultJavaPackageFinder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaTestBuilder; +import com.facebook.buck.jvm.java.PrebuiltJarBuilder; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.TargetNode; import com.facebook.buck.shell.GenruleBuilder; diff --git a/test/com/facebook/buck/java/intellij/ParsingJavaPackageFinderTest.java b/test/com/facebook/buck/jvm/java/intellij/ParsingJavaPackageFinderTest.java similarity index 95% rename from test/com/facebook/buck/java/intellij/ParsingJavaPackageFinderTest.java rename to test/com/facebook/buck/jvm/java/intellij/ParsingJavaPackageFinderTest.java index 212747c3e39..e8271485604 100644 --- a/test/com/facebook/buck/java/intellij/ParsingJavaPackageFinderTest.java +++ b/test/com/facebook/buck/jvm/java/intellij/ParsingJavaPackageFinderTest.java @@ -14,13 +14,13 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import static org.junit.Assert.assertEquals; -import com.facebook.buck.java.JavaCompilationConstants; -import com.facebook.buck.java.JavaFileParser; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaCompilationConstants; +import com.facebook.buck.jvm.java.JavaFileParser; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.testutil.FakeProjectFilesystem; import com.facebook.buck.timing.FakeClock; diff --git a/test/com/facebook/buck/java/intellij/ProjectIntegrationTest.java b/test/com/facebook/buck/jvm/java/intellij/ProjectIntegrationTest.java similarity index 99% rename from test/com/facebook/buck/java/intellij/ProjectIntegrationTest.java rename to test/com/facebook/buck/jvm/java/intellij/ProjectIntegrationTest.java index cd4bf8e3477..c537bb20b7a 100644 --- a/test/com/facebook/buck/java/intellij/ProjectIntegrationTest.java +++ b/test/com/facebook/buck/jvm/java/intellij/ProjectIntegrationTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/intellij/ProjectTest.java b/test/com/facebook/buck/jvm/java/intellij/ProjectTest.java similarity index 98% rename from test/com/facebook/buck/java/intellij/ProjectTest.java rename to test/com/facebook/buck/jvm/java/intellij/ProjectTest.java index ebe3da42adc..4aa91dde4db 100644 --- a/test/com/facebook/buck/java/intellij/ProjectTest.java +++ b/test/com/facebook/buck/jvm/java/intellij/ProjectTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.intellij; +package com.facebook.buck.jvm.java.intellij; import static com.facebook.buck.testutil.MoreAsserts.assertListEquals; import static org.junit.Assert.assertEquals; @@ -29,13 +29,13 @@ import com.facebook.buck.android.NdkLibraryBuilder; import com.facebook.buck.cli.FakeBuckConfig; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.FakeJavaPackageFinder; -import com.facebook.buck.java.JavaLibraryBuilder; -import com.facebook.buck.java.JavaPackageFinder; -import com.facebook.buck.java.JavaTestBuilder; -import com.facebook.buck.java.KeystoreBuilder; -import com.facebook.buck.java.PrebuiltJarBuilder; -import com.facebook.buck.java.intellij.SerializableModule.SourceFolder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaTestBuilder; +import com.facebook.buck.jvm.java.KeystoreBuilder; +import com.facebook.buck.jvm.java.PrebuiltJarBuilder; +import com.facebook.buck.jvm.java.intellij.SerializableModule.SourceFolder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.model.InMemoryBuildFileTree; diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/app.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/app.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/app.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/app.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/keystore/debug.keystore b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/keystore/debug.keystore similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/keystore/debug.keystore rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/keystore/debug.keystore diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/keystore/debug.keystore.properties b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/keystore/debug.keystore.properties similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/keystore/debug.keystore.properties rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/keystore/debug.keystore.properties diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/AndroidManifest.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/AndroidManifest.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/AndroidManifest.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/AndroidManifest.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/assets/app_asset_index.txt b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/assets/app_asset_index.txt similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/assets/app_asset_index.txt rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/assets/app_asset_index.txt diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/java/com/example/MyActivity.java b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/java/com/example/MyActivity.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/java/com/example/MyActivity.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/java/com/example/MyActivity.java diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-hdpi/ic_launcher.png b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-hdpi/ic_launcher.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-ldpi/ic_launcher.png b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-ldpi/ic_launcher.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-mdpi/ic_launcher.png b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-mdpi/ic_launcher.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-xhdpi/ic_launcher.png b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-xhdpi/ic_launcher.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/layout/main.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/layout/main.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/layout/main.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/layout/main.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/values/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/values/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/values/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/app/src/main/res/values/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/libA.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/libA.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/libA.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/libA.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/AndroidManifest.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/AndroidManifest.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/AndroidManifest.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/AndroidManifest.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/assets/libA_asset_index.txt b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/assets/libA_asset_index.txt similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/assets/libA_asset_index.txt rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/assets/libA_asset_index.txt diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/java/com/example/ActivityA.java b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/java/com/example/ActivityA.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/java/com/example/ActivityA.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/java/com/example/ActivityA.java diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/res/layout/main.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/res/layout/main.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/res/layout/main.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/res/layout/main.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/res/values/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/res/values/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/res/values/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libA/src/main/res/values/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/libB.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/libB.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/libB.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/libB.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/AndroidManifest.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/AndroidManifest.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/AndroidManifest.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/AndroidManifest.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/java/com/example/ActivityB.java b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/java/com/example/ActivityB.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/java/com/example/ActivityB.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/java/com/example/ActivityB.java diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/res/layout/main.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/res/layout/main.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/res/layout/main.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/res/layout/main.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/res/values/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/res/values/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/res/values/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/android_project_with_gradle_conventions/libB/src/main/res/values/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/lib/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/lib/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/lib/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/lib/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/lib/junit-4.11.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/lib/junit-4.11.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/lib/junit-4.11.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/lib/junit-4.11.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/src/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/src/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/src/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/src/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/test/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/test/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/test/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/test/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/test/module_test.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/test/module_test.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/test/module_test.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/buck_project_multiple_libraries_in_one_build_file/test/module_test.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_generated.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_generated.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_generated.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_generated.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_guava.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_guava.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_guava.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_guava.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_jsr305.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_jsr305.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_jsr305.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_jsr305.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_junit.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_junit.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_junit.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/libraries/library_libs_junit.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/libraries/library_modules_dep1_generated.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/libraries/library_modules_dep1_generated.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/libraries/library_modules_dep1_generated.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/libraries/library_modules_dep1_generated.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/modules/modules_dep1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/modules/modules_dep1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/modules/modules_dep1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/modules/modules_dep1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/modules/modules_tip.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/modules/modules_tip.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/modules/modules_tip.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/modules/modules_tip.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/modules/project_root.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/modules/project_root.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/.idea/modules/project_root.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/.idea/modules/project_root.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/libs/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/libs/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/libs/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/libs/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/libs/guava.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/libs/guava.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/libs/guava.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/libs/guava.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/libs/jsr305.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/libs/jsr305.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/libs/jsr305.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/libs/jsr305.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/libs/junit.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/libs/junit.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/libs/junit.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/libs/junit.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/modules/dep1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/modules/dep1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/modules/dep1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/modules/dep1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/modules/dep1/src/Foo.java b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/modules/dep1/src/Foo.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/modules/dep1/src/Foo.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/modules/dep1/src/Foo.java diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project1/modules/tip/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/modules/tip/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project1/modules/tip/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project1/modules/tip/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/.idea/modules/modules_dep1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/.idea/modules/modules_dep1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/.idea/modules/modules_dep1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/.idea/modules/modules_dep1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/.idea/modules/modules_dep2.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/.idea/modules/modules_dep2.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/.idea/modules/modules_dep2.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/.idea/modules/modules_dep2.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/.idea/modules/project_root.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/.idea/modules/project_root.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/.idea/modules/project_root.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/.idea/modules/project_root.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/modules/dep1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/modules/dep1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/modules/dep1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/modules/dep1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/modules/dep1/src/Foo.java b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/modules/dep1/src/Foo.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/modules/dep1/src/Foo.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/modules/dep1/src/Foo.java diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/modules/dep2/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/modules/dep2/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/modules/dep2/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/modules/dep2/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/modules/dep2/src/Foo.java b/test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/modules/dep2/src/Foo.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/experimental_project_slice/modules/dep2/src/Foo.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/experimental_project_slice/modules/dep2/src/Foo.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/libs/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/libs/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/libs/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/libs/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/libs/guava.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/libs/guava.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/libs/guava.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/libs/guava.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/libs/jsr305.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/libs/jsr305.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/libs/jsr305.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/libs/jsr305.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/libs/junit.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/libs/junit.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/libs/junit.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/libs/junit.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/modules/dep1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/modules/dep1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/modules/dep1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/modules/dep1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/modules/dep1/module_modules_dep1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/modules/dep1/module_modules_dep1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/modules/dep1/module_modules_dep1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/modules/dep1/module_modules_dep1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/modules/dep1/src/Foo.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/modules/dep1/src/Foo.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/modules/dep1/src/Foo.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/modules/dep1/src/Foo.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/modules/tip/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/modules/tip/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/modules/tip/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/modules/tip/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/modules/tip/module_modules_tip.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/modules/tip/module_modules_tip.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/modules/tip/module_modules_tip.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/modules/tip/module_modules_tip.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project1/root.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project1/root.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project1/root.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project1/root.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/libs/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/libs/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/libs/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/libs/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/libs/guava.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/libs/guava.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/libs/guava.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/libs/guava.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/libs/jsr305.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/libs/jsr305.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/libs/jsr305.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/libs/jsr305.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/libs/junit.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/libs/junit.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/libs/junit.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/libs/junit.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/modules/dep1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/dep1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/modules/dep1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/dep1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/modules/dep1/ignore/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/dep1/ignore/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/modules/dep1/ignore/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/dep1/ignore/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/modules/dep1/module_modules_dep1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/dep1/module_modules_dep1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/modules/dep1/module_modules_dep1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/dep1/module_modules_dep1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/modules/dep1/src/Foo.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/dep1/src/Foo.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/modules/dep1/src/Foo.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/dep1/src/Foo.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/modules/tip/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/tip/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/modules/tip/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/tip/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/modules/tip/module_modules_tip.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/tip/module_modules_tip.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/modules/tip/module_modules_tip.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/modules/tip/module_modules_tip.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project2/root.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project2/root.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project2/root.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project2/root.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/apps/myapp/AndroidManifest.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/apps/myapp/AndroidManifest.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/apps/myapp/AndroidManifest.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/apps/myapp/AndroidManifest.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/apps/myapp/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/apps/myapp/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/apps/myapp/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/apps/myapp/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/apps/myapp/app.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/apps/myapp/app.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/apps/myapp/app.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/apps/myapp/app.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/apps/myapp/debug.keystore b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/apps/myapp/debug.keystore similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/apps/myapp/debug.keystore rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/apps/myapp/debug.keystore diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/apps/myapp/debug.keystore.properties b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/apps/myapp/debug.keystore.properties similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/apps/myapp/debug.keystore.properties rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/apps/myapp/debug.keystore.properties diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/java/com/example/activity/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/java/com/example/activity/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/java/com/example/activity/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/java/com/example/activity/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/java/com/example/activity/MyFirstActivity.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/java/com/example/activity/MyFirstActivity.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/java/com/example/activity/MyFirstActivity.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/java/com/example/activity/MyFirstActivity.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/java/com/example/activity/module_java_com_example_activity.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/java/com/example/activity/module_java_com_example_activity.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/java/com/example/activity/module_java_com_example_activity.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/java/com/example/activity/module_java_com_example_activity.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/res/AndroidManifest.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/res/AndroidManifest.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/res/AndroidManifest.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/res/AndroidManifest.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/res/com/example/activity/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/res/com/example/activity/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/res/com/example/activity/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/res/com/example/activity/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/res/com/example/activity/module_res_com_example_activity.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/res/com/example/activity/module_res_com_example_activity.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/res/com/example/activity/module_res_com_example_activity.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/res/com/example/activity/module_res_com_example_activity.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/res/com/example/activity/res/layout/main.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/res/com/example/activity/res/layout/main.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/res/com/example/activity/res/layout/main.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/res/com/example/activity/res/layout/main.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_001/res/com/example/activity/res/values/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/res/com/example/activity/res/values/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_001/res/com/example/activity/res/values/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_001/res/com/example/activity/res/values/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/apps/myapp/AndroidManifest.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/apps/myapp/AndroidManifest.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/apps/myapp/AndroidManifest.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/apps/myapp/AndroidManifest.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/apps/myapp/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/apps/myapp/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/apps/myapp/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/apps/myapp/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/apps/myapp/debug.keystore b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/apps/myapp/debug.keystore similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/apps/myapp/debug.keystore rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/apps/myapp/debug.keystore diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/apps/myapp/debug.keystore.properties b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/apps/myapp/debug.keystore.properties similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/apps/myapp/debug.keystore.properties rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/apps/myapp/debug.keystore.properties diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/java/com/example/activity/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/java/com/example/activity/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/java/com/example/activity/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/java/com/example/activity/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/java/com/example/activity/MyFirstActivity.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/java/com/example/activity/MyFirstActivity.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/java/com/example/activity/MyFirstActivity.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/java/com/example/activity/MyFirstActivity.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/res/AndroidManifest.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/res/AndroidManifest.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/res/AndroidManifest.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/res/AndroidManifest.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/res/com/example/activity/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/res/com/example/activity/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/res/com/example/activity/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/res/com/example/activity/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/res/com/example/activity/res/layout/main.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/res/com/example/activity/res/layout/main.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/res/com/example/activity/res/layout/main.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/res/com/example/activity/res/layout/main.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_r_002/res/com/example/activity/res/values/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/res/com/example/activity/res/values/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_r_002/res/com/example/activity/res/values/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_r_002/res/com/example/activity/res/values/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/libs/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/libs/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/libs/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/libs/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/libs/guava.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/libs/guava.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/libs/guava.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/libs/guava.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/libs/jsr305.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/libs/jsr305.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/libs/jsr305.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/libs/jsr305.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/libs/junit.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/libs/junit.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/libs/junit.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/libs/junit.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/module_.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/module_.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/module_.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/module_.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/modules/dep1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/modules/dep1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/modules/dep1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/modules/dep1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/modules/dep1/dep2/world.txt b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/modules/dep1/dep2/world.txt similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/modules/dep1/dep2/world.txt rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/modules/dep1/dep2/world.txt diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/modules/dep1/module_modules_dep1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/modules/dep1/module_modules_dep1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/modules/dep1/module_modules_dep1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/modules/dep1/module_modules_dep1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/modules/tip/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/modules/tip/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/modules/tip/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/modules/tip/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice/tests/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/tests/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice/tests/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice/tests/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/module_.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/module_.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/module_.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/module_.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/dep1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/dep1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/dep1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/dep1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/module_modules_dep1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/module_modules_dep1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/module_modules_dep1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_project_in_different_buck_file/modules/module_modules_dep1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/libs/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/libs/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/libs/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/libs/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/libs/guava.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/libs/guava.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/libs/guava.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/libs/guava.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/libs/jsr305.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/libs/jsr305.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/libs/jsr305.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/libs/jsr305.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/libs/junit.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/libs/junit.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/libs/junit.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/libs/junit.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/modules/dep1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/modules/dep1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/modules/dep1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/modules/dep1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/modules/dep1/module_modules_dep1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/modules/dep1/module_modules_dep1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/modules/dep1/module_modules_dep1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/modules/dep1/module_modules_dep1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/modules/tip/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/modules/tip/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/modules/tip/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/modules/tip/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/modules/tip/module_modules_tip.iml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/modules/tip/module_modules_tip.iml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/modules/tip/module_modules_tip.iml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/modules/tip/module_modules_tip.iml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/tests/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/tests/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/tests/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/tests/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/tests/module_tests.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/tests/module_tests.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests/tests/module_tests.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests/tests/module_tests.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep1/module_modules_dep1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep1/module_modules_dep1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep1/module_modules_dep1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep1/module_modules_dep1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep2/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep2/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep2/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep2/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep2/module_modules_dep2.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep2/module_modules_dep2.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep2/module_modules_dep2.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/modules/dep2/module_modules_dep2.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/tests/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/tests/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/tests/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/tests/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/tests/module_tests.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/tests/module_tests.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/tests/module_tests.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_dependencies_in_different_buck_file/tests/module_tests.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/modules/dep1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/modules/dep1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/modules/dep1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/modules/dep1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/modules/dep1/module_modules_dep1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/modules/dep1/module_modules_dep1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/modules/dep1/module_modules_dep1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/modules/dep1/module_modules_dep1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/module_tests_test1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/module_tests_test1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/module_tests_test1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/module_tests_test1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/test1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/test1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/test1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_slice_with_tests_project_in_different_buck_file/tests/test1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/.idea/compiler.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/.idea/compiler.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/.idea/compiler.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/.idea/compiler.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/.idea/runConfigurations/Debug_Buck_test.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/.idea/runConfigurations/Debug_Buck_test.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/.idea/runConfigurations/Debug_Buck_test.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/.idea/runConfigurations/Debug_Buck_test.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/apps/sample/AndroidManifest.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/apps/sample/AndroidManifest.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/apps/sample/AndroidManifest.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/apps/sample/AndroidManifest.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/apps/sample/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/apps/sample/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/apps/sample/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/apps/sample/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/apps/sample/module_apps_sample.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/apps/sample/module_apps_sample.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/apps/sample/module_apps_sample.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/apps/sample/module_apps_sample.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample2.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample2.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample2.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample2.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample3.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample3.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample3.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/Sample3.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/module_java_com_sample_lib.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/module_java_com_sample_lib.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/module_java_com_sample_lib.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/java/com/sample/lib/module_java_com_sample_lib.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/keystores/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/keystores/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/keystores/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/keystores/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/keystores/debug.keystore b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/keystores/debug.keystore similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/keystores/debug.keystore rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/keystores/debug.keystore diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/keystores/debug.keystore.properties b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/keystores/debug.keystore.properties similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/keystores/debug.keystore.properties rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/keystores/debug.keystore.properties diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/assets/asset_file.txt b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/assets/asset_file.txt similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/assets/asset_file.txt rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/assets/asset_file.txt diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/module_res_com_sample_asset_only.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/module_res_com_sample_asset_only.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/module_res_com_sample_asset_only.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/asset_only/module_res_com_sample_asset_only.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/buck-assets/hilarity.txt b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/buck-assets/hilarity.txt similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/buck-assets/hilarity.txt rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/buck-assets/hilarity.txt diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/module_res_com_sample_base.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/module_res_com_sample_base.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/module_res_com_sample_base.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/module_res_com_sample_base.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-hdpi/app_icon.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-hdpi/app_icon.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-hdpi/app_icon.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-hdpi/app_icon.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-mdpi/app_icon.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-mdpi/app_icon.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-mdpi/app_icon.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-mdpi/app_icon.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-xhdpi/app_icon.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-xhdpi/app_icon.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-xhdpi/app_icon.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/drawable-xhdpi/app_icon.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/values-fr/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/values-fr/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/values-fr/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/values-fr/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/values/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/values/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/values/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/base/res/values/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/title/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/title/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/title/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/title/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/title/module_res_com_sample_title.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/title/module_res_com_sample_title.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/title/module_res_com_sample_title.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/title/module_res_com_sample_title.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/title/res/values/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/title/res/values/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/title/res/values/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/title/res/values/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/module_res_com_sample_top.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/module_res_com_sample_top.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/module_res_com_sample_top.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/module_res_com_sample_top.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_black.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_black.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_black.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_black.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_something.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_something.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_something.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_something.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_white.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_white.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_white.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/drawable/tiny_white.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/layout/top_layout.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/layout/top_layout.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/layout/top_layout.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary/res/com/sample/top/res/layout/top_layout.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/compiler.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/compiler.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/compiler.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/compiler.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/runConfigurations/Debug_Buck_test.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/runConfigurations/Debug_Buck_test.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/runConfigurations/Debug_Buck_test.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/.idea/runConfigurations/Debug_Buck_test.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/AndroidManifest.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/AndroidManifest.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/AndroidManifest.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/AndroidManifest.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/module_apps_sample.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/module_apps_sample.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/module_apps_sample.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/apps/sample/module_apps_sample.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample2.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample2.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample2.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample2.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample3.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample3.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample3.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/Sample3.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/module_java_com_sample_lib.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/module_java_com_sample_lib.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/module_java_com_sample_lib.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/java/com/sample/lib/module_java_com_sample_lib.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/debug.keystore b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/debug.keystore similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/debug.keystore rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/debug.keystore diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/debug.keystore.properties b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/debug.keystore.properties similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/debug.keystore.properties rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/keystores/debug.keystore.properties diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/assets/asset_file.txt b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/assets/asset_file.txt similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/assets/asset_file.txt rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/assets/asset_file.txt diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/module_res_com_sample_asset_only.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/module_res_com_sample_asset_only.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/module_res_com_sample_asset_only.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/asset_only/module_res_com_sample_asset_only.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/buck-assets/hilarity.txt b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/buck-assets/hilarity.txt similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/buck-assets/hilarity.txt rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/buck-assets/hilarity.txt diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/module_res_com_sample_base.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/module_res_com_sample_base.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/module_res_com_sample_base.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/module_res_com_sample_base.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-hdpi/app_icon.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-hdpi/app_icon.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-hdpi/app_icon.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-hdpi/app_icon.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-mdpi/app_icon.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-mdpi/app_icon.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-mdpi/app_icon.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-mdpi/app_icon.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-xhdpi/app_icon.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-xhdpi/app_icon.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-xhdpi/app_icon.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/drawable-xhdpi/app_icon.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/values-fr/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/values-fr/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/values-fr/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/values-fr/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/values/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/values/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/values/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/base/res/values/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/module_res_com_sample_title.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/module_res_com_sample_title.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/module_res_com_sample_title.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/module_res_com_sample_title.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/res/values/strings.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/res/values/strings.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/res/values/strings.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/title/res/values/strings.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/module_res_com_sample_top.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/module_res_com_sample_top.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/module_res_com_sample_top.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/module_res_com_sample_top.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_black.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_black.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_black.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_black.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_something.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_something.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_something.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_something.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_white.png b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_white.png similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_white.png rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/drawable/tiny_white.png diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/layout/top_layout.xml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/layout/top_layout.xml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/layout/top_layout.xml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_android_binary_autogeneration_disabled/res/com/sample/top/res/layout/top_layout.xml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/.buckconfig b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/.buckconfig rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/.buckconfig diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/.idea/libraries/buck_out_gen_libs_generated_jar.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/.idea/modules.xml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/.idea/modules.xml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/.idea/modules.xml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/.idea/modules.xml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/libs/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/libs/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/libs/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/libs/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/libs/guava.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/libs/guava.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/libs/guava.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/libs/guava.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/libs/jsr305.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/libs/jsr305.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/libs/jsr305.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/libs/jsr305.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/libs/junit.jar b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/libs/junit.jar similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/libs/junit.jar rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/libs/junit.jar diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/module_modules_dep1.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/module_modules_dep1.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/module_modules_dep1.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/module_modules_dep1.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/src/Foo.java b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/src/Foo.java similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/src/Foo.java rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/modules/dep1/src/Foo.java diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/modules/tip/BUCK.fixture b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/modules/tip/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/modules/tip/BUCK.fixture rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/modules/tip/BUCK.fixture diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/modules/tip/module_modules_tip.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/modules/tip/module_modules_tip.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/modules/tip/module_modules_tip.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/modules/tip/module_modules_tip.iml.expected diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/root.iml b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/root.iml similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/root.iml rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/root.iml diff --git a/test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/root.iml.expected b/test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/root.iml.expected similarity index 100% rename from test/com/facebook/buck/java/intellij/testdata/project_with_root_iml_already_present/root.iml.expected rename to test/com/facebook/buck/jvm/java/intellij/testdata/project_with_root_iml_already_present/root.iml.expected diff --git a/test/com/facebook/buck/java/runner/BUCK b/test/com/facebook/buck/jvm/java/runner/BUCK similarity index 73% rename from test/com/facebook/buck/java/runner/BUCK rename to test/com/facebook/buck/jvm/java/runner/BUCK index 92b009dcf43..a69aa5a19e6 100644 --- a/test/com/facebook/buck/java/runner/BUCK +++ b/test/com/facebook/buck/jvm/java/runner/BUCK @@ -2,7 +2,7 @@ java_test( name = 'runner', srcs = glob(['*.java']), deps = [ - '//src/com/facebook/buck/java/runner:runner', + '//src/com/facebook/buck/jvm/java/runner:runner', '//third-party/java/guava:guava', '//third-party/java/junit:junit', ], diff --git a/test/com/facebook/buck/java/runner/FileClassPathRunnerTest.java b/test/com/facebook/buck/jvm/java/runner/FileClassPathRunnerTest.java similarity index 99% rename from test/com/facebook/buck/java/runner/FileClassPathRunnerTest.java rename to test/com/facebook/buck/jvm/java/runner/FileClassPathRunnerTest.java index 488f05fe8fd..5b57a41d04e 100644 --- a/test/com/facebook/buck/java/runner/FileClassPathRunnerTest.java +++ b/test/com/facebook/buck/jvm/java/runner/FileClassPathRunnerTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.runner; +package com.facebook.buck.jvm.java.runner; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/testdata/abi/.buckconfig b/test/com/facebook/buck/jvm/java/testdata/abi/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/testdata/abi/.buckconfig rename to test/com/facebook/buck/jvm/java/testdata/abi/.buckconfig diff --git a/test/com/facebook/buck/java/testdata/abi/.gitignore b/test/com/facebook/buck/jvm/java/testdata/abi/.gitignore similarity index 100% rename from test/com/facebook/buck/java/testdata/abi/.gitignore rename to test/com/facebook/buck/jvm/java/testdata/abi/.gitignore diff --git a/test/com/facebook/buck/java/testdata/abi/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/abi/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/abi/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/abi/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/abi/buck-out/bin/.no_srcs/metadata/ABI_KEY.expected b/test/com/facebook/buck/jvm/java/testdata/abi/buck-out/bin/.no_srcs/metadata/ABI_KEY.expected similarity index 100% rename from test/com/facebook/buck/java/testdata/abi/buck-out/bin/.no_srcs/metadata/ABI_KEY.expected rename to test/com/facebook/buck/jvm/java/testdata/abi/buck-out/bin/.no_srcs/metadata/ABI_KEY.expected diff --git a/test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/LameGenfile.java b/test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/LameGenfile.java similarity index 100% rename from test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/LameGenfile.java rename to test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/LameGenfile.java diff --git a/test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/LameTest.java b/test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/LameTest.java similarity index 100% rename from test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/LameTest.java rename to test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/LameTest.java diff --git a/test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/hamcrest-core-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/hamcrest-core-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/hamcrest-core-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/hamcrest-core-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/hamcrest-library-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/hamcrest-library-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/hamcrest-library-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/hamcrest-library-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/junit-4.11.jar b/test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/junit-4.11.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/junit-4.11.jar rename to test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/junit-4.11.jar diff --git a/test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/resource.base.txt b/test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/resource.base.txt similarity index 100% rename from test/com/facebook/buck/java/testdata/build_rule_source_path_as_src_test/resource.base.txt rename to test/com/facebook/buck/jvm/java/testdata/build_rule_source_path_as_src_test/resource.base.txt diff --git a/test/com/facebook/buck/java/testdata/cached_test/.buckconfig b/test/com/facebook/buck/jvm/java/testdata/cached_test/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/testdata/cached_test/.buckconfig rename to test/com/facebook/buck/jvm/java/testdata/cached_test/.buckconfig diff --git a/test/com/facebook/buck/java/testdata/cached_test/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/cached_test/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/cached_test/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/cached_test/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/cached_test/LameTest.java b/test/com/facebook/buck/jvm/java/testdata/cached_test/LameTest.java similarity index 100% rename from test/com/facebook/buck/java/testdata/cached_test/LameTest.java rename to test/com/facebook/buck/jvm/java/testdata/cached_test/LameTest.java diff --git a/test/com/facebook/buck/java/testdata/cached_test/hamcrest-core-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/cached_test/hamcrest-core-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/cached_test/hamcrest-core-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/cached_test/hamcrest-core-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/cached_test/hamcrest-library-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/cached_test/hamcrest-library-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/cached_test/hamcrest-library-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/cached_test/hamcrest-library-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/cached_test/junit-4.11.jar b/test/com/facebook/buck/jvm/java/testdata/cached_test/junit-4.11.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/cached_test/junit-4.11.jar rename to test/com/facebook/buck/jvm/java/testdata/cached_test/junit-4.11.jar diff --git a/test/com/facebook/buck/java/testdata/classpath_corruption_regression/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/classpath_corruption_regression/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/classpath_corruption_regression/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/classpath_corruption_regression/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/classpath_corruption_regression/Bar.java b/test/com/facebook/buck/jvm/java/testdata/classpath_corruption_regression/Bar.java similarity index 100% rename from test/com/facebook/buck/java/testdata/classpath_corruption_regression/Bar.java rename to test/com/facebook/buck/jvm/java/testdata/classpath_corruption_regression/Bar.java diff --git a/test/com/facebook/buck/java/testdata/classpath_corruption_regression/Foo.java b/test/com/facebook/buck/jvm/java/testdata/classpath_corruption_regression/Foo.java similarity index 100% rename from test/com/facebook/buck/java/testdata/classpath_corruption_regression/Foo.java rename to test/com/facebook/buck/jvm/java/testdata/classpath_corruption_regression/Foo.java diff --git a/test/com/facebook/buck/java/testdata/deadlock/.buckconfig b/test/com/facebook/buck/jvm/java/testdata/deadlock/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/testdata/deadlock/.buckconfig rename to test/com/facebook/buck/jvm/java/testdata/deadlock/.buckconfig diff --git a/test/com/facebook/buck/java/testdata/deadlock/AllTests.java b/test/com/facebook/buck/jvm/java/testdata/deadlock/AllTests.java similarity index 100% rename from test/com/facebook/buck/java/testdata/deadlock/AllTests.java rename to test/com/facebook/buck/jvm/java/testdata/deadlock/AllTests.java diff --git a/test/com/facebook/buck/java/testdata/deadlock/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/deadlock/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/deadlock/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/deadlock/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/deadlock/Junit4BlockTest.java b/test/com/facebook/buck/jvm/java/testdata/deadlock/Junit4BlockTest.java similarity index 100% rename from test/com/facebook/buck/java/testdata/deadlock/Junit4BlockTest.java rename to test/com/facebook/buck/jvm/java/testdata/deadlock/Junit4BlockTest.java diff --git a/test/com/facebook/buck/java/testdata/deadlock/hamcrest.jar b/test/com/facebook/buck/jvm/java/testdata/deadlock/hamcrest.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/deadlock/hamcrest.jar rename to test/com/facebook/buck/jvm/java/testdata/deadlock/hamcrest.jar diff --git a/test/com/facebook/buck/java/testdata/deadlock/junit.jar b/test/com/facebook/buck/jvm/java/testdata/deadlock/junit.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/deadlock/junit.jar rename to test/com/facebook/buck/jvm/java/testdata/deadlock/junit.jar diff --git a/test/com/facebook/buck/java/testdata/empty_test/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/empty_test/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/empty_test/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/empty_test/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/export_directory_entries/.buckconfig b/test/com/facebook/buck/jvm/java/testdata/export_directory_entries/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/testdata/export_directory_entries/.buckconfig rename to test/com/facebook/buck/jvm/java/testdata/export_directory_entries/.buckconfig diff --git a/test/com/facebook/buck/java/testdata/export_directory_entries/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/export_directory_entries/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/export_directory_entries/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/export_directory_entries/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/export_directory_entries/some_directory/swag.txt b/test/com/facebook/buck/jvm/java/testdata/export_directory_entries/some_directory/swag.txt similarity index 100% rename from test/com/facebook/buck/java/testdata/export_directory_entries/some_directory/swag.txt rename to test/com/facebook/buck/jvm/java/testdata/export_directory_entries/some_directory/swag.txt diff --git a/test/com/facebook/buck/java/testdata/export_directory_entries/some_directory/yolo.txt b/test/com/facebook/buck/jvm/java/testdata/export_directory_entries/some_directory/yolo.txt similarity index 100% rename from test/com/facebook/buck/java/testdata/export_directory_entries/some_directory/yolo.txt rename to test/com/facebook/buck/jvm/java/testdata/export_directory_entries/some_directory/yolo.txt diff --git a/test/com/facebook/buck/java/testdata/external_javac/.buckconfig b/test/com/facebook/buck/jvm/java/testdata/external_javac/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac/.buckconfig rename to test/com/facebook/buck/jvm/java/testdata/external_javac/.buckconfig diff --git a/test/com/facebook/buck/java/testdata/external_javac/check_env.sh b/test/com/facebook/buck/jvm/java/testdata/external_javac/check_env.sh similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac/check_env.sh rename to test/com/facebook/buck/jvm/java/testdata/external_javac/check_env.sh diff --git a/test/com/facebook/buck/java/testdata/external_javac/error.sh b/test/com/facebook/buck/jvm/java/testdata/external_javac/error.sh similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac/error.sh rename to test/com/facebook/buck/jvm/java/testdata/external_javac/error.sh diff --git a/test/com/facebook/buck/java/testdata/external_javac/java/com/example/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/external_javac/java/com/example/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac/java/com/example/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/external_javac/java/com/example/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/external_javac/java/com/example/Example.java b/test/com/facebook/buck/jvm/java/testdata/external_javac/java/com/example/Example.java similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac/java/com/example/Example.java rename to test/com/facebook/buck/jvm/java/testdata/external_javac/java/com/example/Example.java diff --git a/test/com/facebook/buck/java/testdata/external_javac/javac.sh b/test/com/facebook/buck/jvm/java/testdata/external_javac/javac.sh similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac/javac.sh rename to test/com/facebook/buck/jvm/java/testdata/external_javac/javac.sh diff --git a/test/com/facebook/buck/java/testdata/external_javac_src_zip/.buckconfig b/test/com/facebook/buck/jvm/java/testdata/external_javac_src_zip/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac_src_zip/.buckconfig rename to test/com/facebook/buck/jvm/java/testdata/external_javac_src_zip/.buckconfig diff --git a/test/com/facebook/buck/java/testdata/external_javac_src_zip/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/external_javac_src_zip/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac_src_zip/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/external_javac_src_zip/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/external_javac_src_zip/Yin.java b/test/com/facebook/buck/jvm/java/testdata/external_javac_src_zip/Yin.java similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac_src_zip/Yin.java rename to test/com/facebook/buck/jvm/java/testdata/external_javac_src_zip/Yin.java diff --git a/test/com/facebook/buck/java/testdata/external_javac_src_zip/Zip.java b/test/com/facebook/buck/jvm/java/testdata/external_javac_src_zip/Zip.java similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac_src_zip/Zip.java rename to test/com/facebook/buck/jvm/java/testdata/external_javac_src_zip/Zip.java diff --git a/test/com/facebook/buck/java/testdata/external_javac_src_zip/javac.sh b/test/com/facebook/buck/jvm/java/testdata/external_javac_src_zip/javac.sh similarity index 100% rename from test/com/facebook/buck/java/testdata/external_javac_src_zip/javac.sh rename to test/com/facebook/buck/jvm/java/testdata/external_javac_src_zip/javac.sh diff --git a/test/com/facebook/buck/java/testdata/fat_jar/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/fat_jar/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/fat_jar/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/fat_jar/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/fat_jar/Dep.cpp b/test/com/facebook/buck/jvm/java/testdata/fat_jar/Dep.cpp similarity index 100% rename from test/com/facebook/buck/java/testdata/fat_jar/Dep.cpp rename to test/com/facebook/buck/jvm/java/testdata/fat_jar/Dep.cpp diff --git a/test/com/facebook/buck/java/testdata/fat_jar/Dep.h b/test/com/facebook/buck/jvm/java/testdata/fat_jar/Dep.h similarity index 100% rename from test/com/facebook/buck/java/testdata/fat_jar/Dep.h rename to test/com/facebook/buck/jvm/java/testdata/fat_jar/Dep.h diff --git a/test/com/facebook/buck/java/testdata/fat_jar/Lib.java b/test/com/facebook/buck/jvm/java/testdata/fat_jar/Lib.java similarity index 100% rename from test/com/facebook/buck/java/testdata/fat_jar/Lib.java rename to test/com/facebook/buck/jvm/java/testdata/fat_jar/Lib.java diff --git a/test/com/facebook/buck/java/testdata/fat_jar/LibExitCode.java b/test/com/facebook/buck/jvm/java/testdata/fat_jar/LibExitCode.java similarity index 100% rename from test/com/facebook/buck/java/testdata/fat_jar/LibExitCode.java rename to test/com/facebook/buck/jvm/java/testdata/fat_jar/LibExitCode.java diff --git a/test/com/facebook/buck/java/testdata/fat_jar/LibOutput.java b/test/com/facebook/buck/jvm/java/testdata/fat_jar/LibOutput.java similarity index 100% rename from test/com/facebook/buck/java/testdata/fat_jar/LibOutput.java rename to test/com/facebook/buck/jvm/java/testdata/fat_jar/LibOutput.java diff --git a/test/com/facebook/buck/java/testdata/fat_jar/Native.cpp b/test/com/facebook/buck/jvm/java/testdata/fat_jar/Native.cpp similarity index 100% rename from test/com/facebook/buck/java/testdata/fat_jar/Native.cpp rename to test/com/facebook/buck/jvm/java/testdata/fat_jar/Native.cpp diff --git a/test/com/facebook/buck/java/testdata/fat_jar/print_lib_path.py b/test/com/facebook/buck/jvm/java/testdata/fat_jar/print_lib_path.py similarity index 100% rename from test/com/facebook/buck/java/testdata/fat_jar/print_lib_path.py rename to test/com/facebook/buck/jvm/java/testdata/fat_jar/print_lib_path.py diff --git a/test/com/facebook/buck/java/testdata/generated_resources/.buckconfig b/test/com/facebook/buck/jvm/java/testdata/generated_resources/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/testdata/generated_resources/.buckconfig rename to test/com/facebook/buck/jvm/java/testdata/generated_resources/.buckconfig diff --git a/test/com/facebook/buck/java/testdata/generated_resources/java/com/example/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/generated_resources/java/com/example/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/generated_resources/java/com/example/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/generated_resources/java/com/example/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/generated_resources/java/com/example/HelloWorld.java b/test/com/facebook/buck/jvm/java/testdata/generated_resources/java/com/example/HelloWorld.java similarity index 100% rename from test/com/facebook/buck/java/testdata/generated_resources/java/com/example/HelloWorld.java rename to test/com/facebook/buck/jvm/java/testdata/generated_resources/java/com/example/HelloWorld.java diff --git a/test/com/facebook/buck/java/testdata/generated_resources/java/com/example/res/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/generated_resources/java/com/example/res/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/generated_resources/java/com/example/res/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/generated_resources/java/com/example/res/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/genrule_test/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/genrule_test/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/genrule_test/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/genrule_test/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/genrule_test/LameTest.java b/test/com/facebook/buck/jvm/java/testdata/genrule_test/LameTest.java similarity index 100% rename from test/com/facebook/buck/java/testdata/genrule_test/LameTest.java rename to test/com/facebook/buck/jvm/java/testdata/genrule_test/LameTest.java diff --git a/test/com/facebook/buck/java/testdata/genrule_test/LibraryClass.java b/test/com/facebook/buck/jvm/java/testdata/genrule_test/LibraryClass.java similarity index 100% rename from test/com/facebook/buck/java/testdata/genrule_test/LibraryClass.java rename to test/com/facebook/buck/jvm/java/testdata/genrule_test/LibraryClass.java diff --git a/test/com/facebook/buck/java/testdata/genrule_test/hamcrest-core-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/genrule_test/hamcrest-core-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/genrule_test/hamcrest-core-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/genrule_test/hamcrest-core-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/genrule_test/hamcrest-library-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/genrule_test/hamcrest-library-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/genrule_test/hamcrest-library-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/genrule_test/hamcrest-library-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/genrule_test/junit-4.11.jar b/test/com/facebook/buck/jvm/java/testdata/genrule_test/junit-4.11.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/genrule_test/junit-4.11.jar rename to test/com/facebook/buck/jvm/java/testdata/genrule_test/junit-4.11.jar diff --git a/test/com/facebook/buck/java/testdata/genrule_test/resource.base.txt b/test/com/facebook/buck/jvm/java/testdata/genrule_test/resource.base.txt similarity index 100% rename from test/com/facebook/buck/java/testdata/genrule_test/resource.base.txt rename to test/com/facebook/buck/jvm/java/testdata/genrule_test/resource.base.txt diff --git a/test/com/facebook/buck/java/testdata/guava_no_deps/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/guava_no_deps/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/guava_no_deps/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/guava_no_deps/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/guava_no_deps/Bar.java b/test/com/facebook/buck/jvm/java/testdata/guava_no_deps/Bar.java similarity index 100% rename from test/com/facebook/buck/java/testdata/guava_no_deps/Bar.java rename to test/com/facebook/buck/jvm/java/testdata/guava_no_deps/Bar.java diff --git a/test/com/facebook/buck/java/testdata/guava_no_deps/Foo.java b/test/com/facebook/buck/jvm/java/testdata/guava_no_deps/Foo.java similarity index 100% rename from test/com/facebook/buck/java/testdata/guava_no_deps/Foo.java rename to test/com/facebook/buck/jvm/java/testdata/guava_no_deps/Foo.java diff --git a/test/com/facebook/buck/java/testdata/java_test_broken_test/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/java_test_broken_test/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_broken_test/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/java_test_broken_test/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/java_test_broken_test/SimpleTest.java b/test/com/facebook/buck/jvm/java/testdata/java_test_broken_test/SimpleTest.java similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_broken_test/SimpleTest.java rename to test/com/facebook/buck/jvm/java/testdata/java_test_broken_test/SimpleTest.java diff --git a/test/com/facebook/buck/java/testdata/java_test_broken_test/hamcrest-core-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/java_test_broken_test/hamcrest-core-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_broken_test/hamcrest-core-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/java_test_broken_test/hamcrest-core-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/java_test_broken_test/hamcrest-library-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/java_test_broken_test/hamcrest-library-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_broken_test/hamcrest-library-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/java_test_broken_test/hamcrest-library-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/java_test_broken_test/junit-4.11.jar b/test/com/facebook/buck/jvm/java/testdata/java_test_broken_test/junit-4.11.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_broken_test/junit-4.11.jar rename to test/com/facebook/buck/jvm/java/testdata/java_test_broken_test/junit-4.11.jar diff --git a/test/com/facebook/buck/java/testdata/java_test_get_class_names/case1.jar b/test/com/facebook/buck/jvm/java/testdata/java_test_get_class_names/case1.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_get_class_names/case1.jar rename to test/com/facebook/buck/jvm/java/testdata/java_test_get_class_names/case1.jar diff --git a/test/com/facebook/buck/java/testdata/java_test_get_class_names/case2.jar b/test/com/facebook/buck/jvm/java/testdata/java_test_get_class_names/case2.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_get_class_names/case2.jar rename to test/com/facebook/buck/jvm/java/testdata/java_test_get_class_names/case2.jar diff --git a/test/com/facebook/buck/java/testdata/java_test_get_class_names/case2fail.jar b/test/com/facebook/buck/jvm/java/testdata/java_test_get_class_names/case2fail.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_get_class_names/case2fail.jar rename to test/com/facebook/buck/jvm/java/testdata/java_test_get_class_names/case2fail.jar diff --git a/test/com/facebook/buck/java/testdata/java_test_get_class_names/default.jar b/test/com/facebook/buck/jvm/java/testdata/java_test_get_class_names/default.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_get_class_names/default.jar rename to test/com/facebook/buck/jvm/java/testdata/java_test_get_class_names/default.jar diff --git a/test/com/facebook/buck/java/testdata/java_test_missing_result_file/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/java_test_missing_result_file/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_missing_result_file/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/java_test_missing_result_file/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/java_test_missing_result_file/SimpleTest.java b/test/com/facebook/buck/jvm/java/testdata/java_test_missing_result_file/SimpleTest.java similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_missing_result_file/SimpleTest.java rename to test/com/facebook/buck/jvm/java/testdata/java_test_missing_result_file/SimpleTest.java diff --git a/test/com/facebook/buck/java/testdata/java_test_missing_result_file/hamcrest-core-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/java_test_missing_result_file/hamcrest-core-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_missing_result_file/hamcrest-core-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/java_test_missing_result_file/hamcrest-core-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/java_test_missing_result_file/hamcrest-library-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/java_test_missing_result_file/hamcrest-library-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_missing_result_file/hamcrest-library-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/java_test_missing_result_file/hamcrest-library-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/java_test_missing_result_file/junit-4.11.jar b/test/com/facebook/buck/jvm/java/testdata/java_test_missing_result_file/junit-4.11.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/java_test_missing_result_file/junit-4.11.jar rename to test/com/facebook/buck/jvm/java/testdata/java_test_missing_result_file/junit-4.11.jar diff --git a/test/com/facebook/buck/java/testdata/missing_test_deps/A.java b/test/com/facebook/buck/jvm/java/testdata/missing_test_deps/A.java similarity index 100% rename from test/com/facebook/buck/java/testdata/missing_test_deps/A.java rename to test/com/facebook/buck/jvm/java/testdata/missing_test_deps/A.java diff --git a/test/com/facebook/buck/java/testdata/missing_test_deps/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/missing_test_deps/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/missing_test_deps/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/missing_test_deps/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/missing_test_deps/hamcrest.jar b/test/com/facebook/buck/jvm/java/testdata/missing_test_deps/hamcrest.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/missing_test_deps/hamcrest.jar rename to test/com/facebook/buck/jvm/java/testdata/missing_test_deps/hamcrest.jar diff --git a/test/com/facebook/buck/java/testdata/missing_test_deps/junit.jar b/test/com/facebook/buck/jvm/java/testdata/missing_test_deps/junit.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/missing_test_deps/junit.jar rename to test/com/facebook/buck/jvm/java/testdata/missing_test_deps/junit.jar diff --git a/test/com/facebook/buck/java/testdata/missing_test_deps/testng.jar b/test/com/facebook/buck/jvm/java/testdata/missing_test_deps/testng.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/missing_test_deps/testng.jar rename to test/com/facebook/buck/jvm/java/testdata/missing_test_deps/testng.jar diff --git a/test/com/facebook/buck/java/testdata/prebuilt/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/prebuilt/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/prebuilt/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/prebuilt/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/prebuilt/junit.jar b/test/com/facebook/buck/jvm/java/testdata/prebuilt/junit.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/prebuilt/junit.jar rename to test/com/facebook/buck/jvm/java/testdata/prebuilt/junit.jar diff --git a/test/com/facebook/buck/java/testdata/provided_deps/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/provided_deps/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/provided_deps/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/provided_deps/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/provided_deps/Example.java b/test/com/facebook/buck/jvm/java/testdata/provided_deps/Example.java similarity index 100% rename from test/com/facebook/buck/java/testdata/provided_deps/Example.java rename to test/com/facebook/buck/jvm/java/testdata/provided_deps/Example.java diff --git a/test/com/facebook/buck/java/testdata/provided_deps/guava.jar b/test/com/facebook/buck/jvm/java/testdata/provided_deps/guava.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/provided_deps/guava.jar rename to test/com/facebook/buck/jvm/java/testdata/provided_deps/guava.jar diff --git a/test/com/facebook/buck/java/testdata/provided_deps/junit.jar b/test/com/facebook/buck/jvm/java/testdata/provided_deps/junit.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/provided_deps/junit.jar rename to test/com/facebook/buck/jvm/java/testdata/provided_deps/junit.jar diff --git a/test/com/facebook/buck/java/testdata/resource_change_causes_repack/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/resource_change_causes_repack/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/resource_change_causes_repack/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/resource_change_causes_repack/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/resource_change_causes_repack/LibClass.java b/test/com/facebook/buck/jvm/java/testdata/resource_change_causes_repack/LibClass.java similarity index 100% rename from test/com/facebook/buck/java/testdata/resource_change_causes_repack/LibClass.java rename to test/com/facebook/buck/jvm/java/testdata/resource_change_causes_repack/LibClass.java diff --git a/test/com/facebook/buck/java/testdata/resource_change_causes_repack/ResClass.java b/test/com/facebook/buck/jvm/java/testdata/resource_change_causes_repack/ResClass.java similarity index 100% rename from test/com/facebook/buck/java/testdata/resource_change_causes_repack/ResClass.java rename to test/com/facebook/buck/jvm/java/testdata/resource_change_causes_repack/ResClass.java diff --git a/test/com/facebook/buck/java/testdata/resource_change_causes_repack/ResClass.java.new b/test/com/facebook/buck/jvm/java/testdata/resource_change_causes_repack/ResClass.java.new similarity index 100% rename from test/com/facebook/buck/java/testdata/resource_change_causes_repack/ResClass.java.new rename to test/com/facebook/buck/jvm/java/testdata/resource_change_causes_repack/ResClass.java.new diff --git a/test/com/facebook/buck/java/testdata/resources_root/.buckconfig b/test/com/facebook/buck/jvm/java/testdata/resources_root/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/testdata/resources_root/.buckconfig rename to test/com/facebook/buck/jvm/java/testdata/resources_root/.buckconfig diff --git a/test/com/facebook/buck/java/testdata/resources_root/java/com/example/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/resources_root/java/com/example/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/resources_root/java/com/example/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/resources_root/java/com/example/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/resources_root/java/com/example/SupWorld.java b/test/com/facebook/buck/jvm/java/testdata/resources_root/java/com/example/SupWorld.java similarity index 100% rename from test/com/facebook/buck/java/testdata/resources_root/java/com/example/SupWorld.java rename to test/com/facebook/buck/jvm/java/testdata/resources_root/java/com/example/SupWorld.java diff --git a/test/com/facebook/buck/java/testdata/resources_root/java/com/example/res/com/another/supworld.txt b/test/com/facebook/buck/jvm/java/testdata/resources_root/java/com/example/res/com/another/supworld.txt similarity index 100% rename from test/com/facebook/buck/java/testdata/resources_root/java/com/example/res/com/another/supworld.txt rename to test/com/facebook/buck/jvm/java/testdata/resources_root/java/com/example/res/com/another/supworld.txt diff --git a/test/com/facebook/buck/java/testdata/rulekey_changed_while_abi_stable/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/rulekey_changed_while_abi_stable/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/rulekey_changed_while_abi_stable/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/rulekey_changed_while_abi_stable/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/rulekey_changed_while_abi_stable/SeriousBusiness.java b/test/com/facebook/buck/jvm/java/testdata/rulekey_changed_while_abi_stable/SeriousBusiness.java similarity index 100% rename from test/com/facebook/buck/java/testdata/rulekey_changed_while_abi_stable/SeriousBusiness.java rename to test/com/facebook/buck/jvm/java/testdata/rulekey_changed_while_abi_stable/SeriousBusiness.java diff --git a/test/com/facebook/buck/java/testdata/rulekey_changed_while_abi_stable/Util.java b/test/com/facebook/buck/jvm/java/testdata/rulekey_changed_while_abi_stable/Util.java similarity index 100% rename from test/com/facebook/buck/java/testdata/rulekey_changed_while_abi_stable/Util.java rename to test/com/facebook/buck/jvm/java/testdata/rulekey_changed_while_abi_stable/Util.java diff --git a/test/com/facebook/buck/java/testdata/slow_tests/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/slow_tests/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/slow_tests/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/slow_tests/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/slow_tests/SlowTest.java b/test/com/facebook/buck/jvm/java/testdata/slow_tests/SlowTest.java similarity index 100% rename from test/com/facebook/buck/java/testdata/slow_tests/SlowTest.java rename to test/com/facebook/buck/jvm/java/testdata/slow_tests/SlowTest.java diff --git a/test/com/facebook/buck/java/testdata/slow_tests/SpinningTest.java b/test/com/facebook/buck/jvm/java/testdata/slow_tests/SpinningTest.java similarity index 100% rename from test/com/facebook/buck/java/testdata/slow_tests/SpinningTest.java rename to test/com/facebook/buck/jvm/java/testdata/slow_tests/SpinningTest.java diff --git a/test/com/facebook/buck/java/testdata/slow_tests/hamcrest-core-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/slow_tests/hamcrest-core-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/slow_tests/hamcrest-core-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/slow_tests/hamcrest-core-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/slow_tests/hamcrest-library-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/slow_tests/hamcrest-library-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/slow_tests/hamcrest-library-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/slow_tests/hamcrest-library-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/slow_tests/junit-4.11.jar b/test/com/facebook/buck/jvm/java/testdata/slow_tests/junit-4.11.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/slow_tests/junit-4.11.jar rename to test/com/facebook/buck/jvm/java/testdata/slow_tests/junit-4.11.jar diff --git a/test/com/facebook/buck/java/testdata/sourcepath/A.java b/test/com/facebook/buck/jvm/java/testdata/sourcepath/A.java similarity index 100% rename from test/com/facebook/buck/java/testdata/sourcepath/A.java rename to test/com/facebook/buck/jvm/java/testdata/sourcepath/A.java diff --git a/test/com/facebook/buck/java/testdata/sourcepath/B.java b/test/com/facebook/buck/jvm/java/testdata/sourcepath/B.java similarity index 100% rename from test/com/facebook/buck/java/testdata/sourcepath/B.java rename to test/com/facebook/buck/jvm/java/testdata/sourcepath/B.java diff --git a/test/com/facebook/buck/java/testdata/sourcepath/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/sourcepath/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/sourcepath/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/sourcepath/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/src_zip/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/src_zip/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/src_zip/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/src_zip/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/src_zip/Yin.java b/test/com/facebook/buck/jvm/java/testdata/src_zip/Yin.java similarity index 100% rename from test/com/facebook/buck/java/testdata/src_zip/Yin.java rename to test/com/facebook/buck/jvm/java/testdata/src_zip/Yin.java diff --git a/test/com/facebook/buck/java/testdata/src_zip/Zip.java b/test/com/facebook/buck/jvm/java/testdata/src_zip/Zip.java similarity index 100% rename from test/com/facebook/buck/java/testdata/src_zip/Zip.java rename to test/com/facebook/buck/jvm/java/testdata/src_zip/Zip.java diff --git a/test/com/facebook/buck/java/testdata/static_initialization_test/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/static_initialization_test/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/static_initialization_test/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/static_initialization_test/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/static_initialization_test/StaticErrorTest.java b/test/com/facebook/buck/jvm/java/testdata/static_initialization_test/StaticErrorTest.java similarity index 100% rename from test/com/facebook/buck/java/testdata/static_initialization_test/StaticErrorTest.java rename to test/com/facebook/buck/jvm/java/testdata/static_initialization_test/StaticErrorTest.java diff --git a/test/com/facebook/buck/java/testdata/static_initialization_test/hamcrest-core-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/static_initialization_test/hamcrest-core-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/static_initialization_test/hamcrest-core-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/static_initialization_test/hamcrest-core-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/static_initialization_test/hamcrest-library-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/static_initialization_test/hamcrest-library-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/static_initialization_test/hamcrest-library-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/static_initialization_test/hamcrest-library-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/static_initialization_test/junit-4.11.jar b/test/com/facebook/buck/jvm/java/testdata/static_initialization_test/junit-4.11.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/static_initialization_test/junit-4.11.jar rename to test/com/facebook/buck/jvm/java/testdata/static_initialization_test/junit-4.11.jar diff --git a/test/com/facebook/buck/java/testdata/symbol_finder/.buckconfig b/test/com/facebook/buck/jvm/java/testdata/symbol_finder/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/testdata/symbol_finder/.buckconfig rename to test/com/facebook/buck/jvm/java/testdata/symbol_finder/.buckconfig diff --git a/test/com/facebook/buck/java/testdata/symbol_finder/java/com/example/a/A.java b/test/com/facebook/buck/jvm/java/testdata/symbol_finder/java/com/example/a/A.java similarity index 100% rename from test/com/facebook/buck/java/testdata/symbol_finder/java/com/example/a/A.java rename to test/com/facebook/buck/jvm/java/testdata/symbol_finder/java/com/example/a/A.java diff --git a/test/com/facebook/buck/java/testdata/symbol_finder/java/com/example/a/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/symbol_finder/java/com/example/a/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/symbol_finder/java/com/example/a/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/symbol_finder/java/com/example/a/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/symbol_finder/java/com/example/b/B.java b/test/com/facebook/buck/jvm/java/testdata/symbol_finder/java/com/example/b/B.java similarity index 100% rename from test/com/facebook/buck/java/testdata/symbol_finder/java/com/example/b/B.java rename to test/com/facebook/buck/jvm/java/testdata/symbol_finder/java/com/example/b/B.java diff --git a/test/com/facebook/buck/java/testdata/symbol_finder/java/com/example/b/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/symbol_finder/java/com/example/b/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/symbol_finder/java/com/example/b/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/symbol_finder/java/com/example/b/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/symbol_finder/java/com/example/b/MoreB.java b/test/com/facebook/buck/jvm/java/testdata/symbol_finder/java/com/example/b/MoreB.java similarity index 100% rename from test/com/facebook/buck/java/testdata/symbol_finder/java/com/example/b/MoreB.java rename to test/com/facebook/buck/jvm/java/testdata/symbol_finder/java/com/example/b/MoreB.java diff --git a/test/com/facebook/buck/java/testdata/test_with_jni/.buckconfig b/test/com/facebook/buck/jvm/java/testdata/test_with_jni/.buckconfig similarity index 100% rename from test/com/facebook/buck/java/testdata/test_with_jni/.buckconfig rename to test/com/facebook/buck/jvm/java/testdata/test_with_jni/.buckconfig diff --git a/test/com/facebook/buck/java/testdata/test_with_jni/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/test_with_jni/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/test_with_jni/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/test_with_jni/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/test_with_jni/JLib.java b/test/com/facebook/buck/jvm/java/testdata/test_with_jni/JLib.java similarity index 100% rename from test/com/facebook/buck/java/testdata/test_with_jni/JLib.java rename to test/com/facebook/buck/jvm/java/testdata/test_with_jni/JLib.java diff --git a/test/com/facebook/buck/java/testdata/test_with_jni/JTest.java b/test/com/facebook/buck/jvm/java/testdata/test_with_jni/JTest.java similarity index 100% rename from test/com/facebook/buck/java/testdata/test_with_jni/JTest.java rename to test/com/facebook/buck/jvm/java/testdata/test_with_jni/JTest.java diff --git a/test/com/facebook/buck/java/testdata/test_with_jni/hamcrest-core-1.3.jar b/test/com/facebook/buck/jvm/java/testdata/test_with_jni/hamcrest-core-1.3.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/test_with_jni/hamcrest-core-1.3.jar rename to test/com/facebook/buck/jvm/java/testdata/test_with_jni/hamcrest-core-1.3.jar diff --git a/test/com/facebook/buck/java/testdata/test_with_jni/jlib.c b/test/com/facebook/buck/jvm/java/testdata/test_with_jni/jlib.c similarity index 100% rename from test/com/facebook/buck/java/testdata/test_with_jni/jlib.c rename to test/com/facebook/buck/jvm/java/testdata/test_with_jni/jlib.c diff --git a/test/com/facebook/buck/java/testdata/test_with_jni/junit-4.11.jar b/test/com/facebook/buck/jvm/java/testdata/test_with_jni/junit-4.11.jar similarity index 100% rename from test/com/facebook/buck/java/testdata/test_with_jni/junit-4.11.jar rename to test/com/facebook/buck/jvm/java/testdata/test_with_jni/junit-4.11.jar diff --git a/test/com/facebook/buck/java/testdata/warn_on_transitive/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/warn_on_transitive/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/warn_on_transitive/Bar.java b/test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/Bar.java similarity index 100% rename from test/com/facebook/buck/java/testdata/warn_on_transitive/Bar.java rename to test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/Bar.java diff --git a/test/com/facebook/buck/java/testdata/warn_on_transitive/Blargh.java b/test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/Blargh.java similarity index 100% rename from test/com/facebook/buck/java/testdata/warn_on_transitive/Blargh.java rename to test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/Blargh.java diff --git a/test/com/facebook/buck/java/testdata/warn_on_transitive/Foo.java b/test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/Foo.java similarity index 100% rename from test/com/facebook/buck/java/testdata/warn_on_transitive/Foo.java rename to test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/Foo.java diff --git a/test/com/facebook/buck/java/testdata/warn_on_transitive/Meh.java b/test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/Meh.java similarity index 100% rename from test/com/facebook/buck/java/testdata/warn_on_transitive/Meh.java rename to test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/Meh.java diff --git a/test/com/facebook/buck/java/testdata/warn_on_transitive/Raz.java b/test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/Raz.java similarity index 100% rename from test/com/facebook/buck/java/testdata/warn_on_transitive/Raz.java rename to test/com/facebook/buck/jvm/java/testdata/warn_on_transitive/Raz.java diff --git a/test/com/facebook/buck/java/testdata/wont_delete/java/com/example/BUCK.fixture b/test/com/facebook/buck/jvm/java/testdata/wont_delete/java/com/example/BUCK.fixture similarity index 100% rename from test/com/facebook/buck/java/testdata/wont_delete/java/com/example/BUCK.fixture rename to test/com/facebook/buck/jvm/java/testdata/wont_delete/java/com/example/BUCK.fixture diff --git a/test/com/facebook/buck/java/testdata/wont_delete/java/com/example/data/acceptance.dmp b/test/com/facebook/buck/jvm/java/testdata/wont_delete/java/com/example/data/acceptance.dmp similarity index 100% rename from test/com/facebook/buck/java/testdata/wont_delete/java/com/example/data/acceptance.dmp rename to test/com/facebook/buck/jvm/java/testdata/wont_delete/java/com/example/data/acceptance.dmp diff --git a/test/com/facebook/buck/java/testdata/wont_delete/java/com/example/data/looping.data b/test/com/facebook/buck/jvm/java/testdata/wont_delete/java/com/example/data/looping.data similarity index 100% rename from test/com/facebook/buck/java/testdata/wont_delete/java/com/example/data/looping.data rename to test/com/facebook/buck/jvm/java/testdata/wont_delete/java/com/example/data/looping.data diff --git a/test/com/facebook/buck/java/tracing/BUCK b/test/com/facebook/buck/jvm/java/tracing/BUCK similarity index 71% rename from test/com/facebook/buck/java/tracing/BUCK rename to test/com/facebook/buck/jvm/java/tracing/BUCK index d925fb41c5b..a7fa5c24c47 100644 --- a/test/com/facebook/buck/java/tracing/BUCK +++ b/test/com/facebook/buck/jvm/java/tracing/BUCK @@ -4,9 +4,9 @@ java_test( deps = [ '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/model:model', - '//src/com/facebook/buck/java/tracing:api', - '//src/com/facebook/buck/java/tracing:compiler-plugin', - '//src/com/facebook/buck/java/tracing:tracing', + '//src/com/facebook/buck/jvm/java/tracing:api', + '//src/com/facebook/buck/jvm/java/tracing:compiler-plugin', + '//src/com/facebook/buck/jvm/java/tracing:tracing', '//test/com/facebook/buck/event:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//third-party/java/easymock:easymock', diff --git a/test/com/facebook/buck/java/tracing/JavacPhaseEventTest.java b/test/com/facebook/buck/jvm/java/tracing/JavacPhaseEventTest.java similarity index 98% rename from test/com/facebook/buck/java/tracing/JavacPhaseEventTest.java rename to test/com/facebook/buck/jvm/java/tracing/JavacPhaseEventTest.java index 0c506e277df..4c331fe1e7a 100644 --- a/test/com/facebook/buck/java/tracing/JavacPhaseEventTest.java +++ b/test/com/facebook/buck/jvm/java/tracing/JavacPhaseEventTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.tracing; +package com.facebook.buck.jvm.java.tracing; import static com.facebook.buck.event.TestEventConfigerator.configureTestEvent; import static org.junit.Assert.assertEquals; diff --git a/test/com/facebook/buck/java/tracing/TracingTaskListenerCleanerTest.java b/test/com/facebook/buck/jvm/java/tracing/TracingTaskListenerCleanerTest.java similarity index 98% rename from test/com/facebook/buck/java/tracing/TracingTaskListenerCleanerTest.java rename to test/com/facebook/buck/jvm/java/tracing/TracingTaskListenerCleanerTest.java index 988455e50ec..90d5793df82 100644 --- a/test/com/facebook/buck/java/tracing/TracingTaskListenerCleanerTest.java +++ b/test/com/facebook/buck/jvm/java/tracing/TracingTaskListenerCleanerTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.tracing; +package com.facebook.buck.jvm.java.tracing; import com.google.common.collect.ImmutableList; diff --git a/test/com/facebook/buck/java/tracing/TranslatingJavacPhaseTracerTest.java b/test/com/facebook/buck/jvm/java/tracing/TranslatingJavacPhaseTracerTest.java similarity index 99% rename from test/com/facebook/buck/java/tracing/TranslatingJavacPhaseTracerTest.java rename to test/com/facebook/buck/jvm/java/tracing/TranslatingJavacPhaseTracerTest.java index c7d433d691e..8d2481af93d 100644 --- a/test/com/facebook/buck/java/tracing/TranslatingJavacPhaseTracerTest.java +++ b/test/com/facebook/buck/jvm/java/tracing/TranslatingJavacPhaseTracerTest.java @@ -14,7 +14,7 @@ * under the License. */ -package com.facebook.buck.java.tracing; +package com.facebook.buck.jvm.java.tracing; import org.easymock.EasyMockRunner; import org.easymock.Mock; diff --git a/test/com/facebook/buck/maven/BUCK b/test/com/facebook/buck/maven/BUCK index cd9c549326f..92f6424df39 100644 --- a/test/com/facebook/buck/maven/BUCK +++ b/test/com/facebook/buck/maven/BUCK @@ -12,9 +12,9 @@ java_test( '//src/com/facebook/buck/file:downloader', '//src/com/facebook/buck/file:file', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/json:json', '//src/com/facebook/buck/maven:maven', '//src/com/facebook/buck/model:model', diff --git a/test/com/facebook/buck/maven/PomIntegrationTest.java b/test/com/facebook/buck/maven/PomIntegrationTest.java index f26fb2d0591..8ffef0b9adc 100644 --- a/test/com/facebook/buck/maven/PomIntegrationTest.java +++ b/test/com/facebook/buck/maven/PomIntegrationTest.java @@ -22,8 +22,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import com.facebook.buck.java.HasMavenCoordinates; -import com.facebook.buck.java.MavenPublishable; +import com.facebook.buck.jvm.java.HasMavenCoordinates; +import com.facebook.buck.jvm.java.MavenPublishable; import com.facebook.buck.testutil.integration.DebuggableTemporaryFolder; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSortedSet; diff --git a/test/com/facebook/buck/maven/ResolverIntegrationTest.java b/test/com/facebook/buck/maven/ResolverIntegrationTest.java index 01493d454ec..5b2fe298ce9 100644 --- a/test/com/facebook/buck/maven/ResolverIntegrationTest.java +++ b/test/com/facebook/buck/maven/ResolverIntegrationTest.java @@ -32,7 +32,7 @@ import com.facebook.buck.io.ExecutableFinder; import com.facebook.buck.io.MorePaths; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.PrebuiltJarDescription; +import com.facebook.buck.jvm.java.PrebuiltJarDescription; import com.facebook.buck.json.BuildFileParseException; import com.facebook.buck.json.DefaultProjectBuildFileParserFactory; import com.facebook.buck.json.ProjectBuildFileParser; diff --git a/test/com/facebook/buck/model/BUCK b/test/com/facebook/buck/model/BUCK index 72986b85b6a..457348f223e 100644 --- a/test/com/facebook/buck/model/BUCK +++ b/test/com/facebook/buck/model/BUCK @@ -6,14 +6,14 @@ java_test( ':BuildTargetFactory', '//src/com/facebook/buck/cli:config', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:rules', + '//src/com/facebook/buck/jvm/java:rules', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:parser', '//src/com/facebook/buck/rules:build_rule', '//src/com/facebook/buck/rules:rules', '//src/com/facebook/buck/util:exceptions', '//src/com/facebook/buck/util:util', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/rules:testutil', '//test/com/facebook/buck/testutil/integration:integration', '//third-party/java/easymock:easymock', diff --git a/test/com/facebook/buck/parser/BUCK b/test/com/facebook/buck/parser/BUCK index 66fce2ee06c..69018120315 100644 --- a/test/com/facebook/buck/parser/BUCK +++ b/test/com/facebook/buck/parser/BUCK @@ -8,10 +8,10 @@ java_test( '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', '//src/com/facebook/buck/io:watchman', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:steps', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:classhash', + '//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/json:json', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:config', diff --git a/test/com/facebook/buck/parser/FlavoredTargetsParserIntegrationTest.java b/test/com/facebook/buck/parser/FlavoredTargetsParserIntegrationTest.java index 84f72facdcc..0f5f83d1df7 100644 --- a/test/com/facebook/buck/parser/FlavoredTargetsParserIntegrationTest.java +++ b/test/com/facebook/buck/parser/FlavoredTargetsParserIntegrationTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; import com.facebook.buck.io.MorePaths; -import com.facebook.buck.java.Javac; +import com.facebook.buck.jvm.java.Javac; import com.facebook.buck.testutil.Zip; import com.facebook.buck.testutil.integration.DebuggableTemporaryFolder; import com.facebook.buck.testutil.integration.ProjectWorkspace; diff --git a/test/com/facebook/buck/parser/ParserTest.java b/test/com/facebook/buck/parser/ParserTest.java index 0526ee07d05..a9c53f448d1 100644 --- a/test/com/facebook/buck/parser/ParserTest.java +++ b/test/com/facebook/buck/parser/ParserTest.java @@ -39,7 +39,7 @@ import com.facebook.buck.io.ExecutableFinder; import com.facebook.buck.io.MorePaths; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaLibrary; +import com.facebook.buck.jvm.java.JavaLibrary; import com.facebook.buck.json.BuildFileParseException; import com.facebook.buck.json.DefaultProjectBuildFileParserFactory; import com.facebook.buck.json.ProjectBuildFileParser; diff --git a/test/com/facebook/buck/python/BUCK b/test/com/facebook/buck/python/BUCK index c46b531f72d..99ae23ee440 100644 --- a/test/com/facebook/buck/python/BUCK +++ b/test/com/facebook/buck/python/BUCK @@ -42,7 +42,7 @@ java_test( '//src/com/facebook/buck/cxx:rules', '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:rules', + '//src/com/facebook/buck/jvm/java:rules', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:rule_pattern', '//src/com/facebook/buck/python:rules', @@ -63,7 +63,7 @@ java_test( '//test/com/facebook/buck/cli:FakeBuckConfig', '//test/com/facebook/buck/cxx:testutil', '//test/com/facebook/buck/io:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/rules:testutil', '//test/com/facebook/buck/step:testutil', diff --git a/test/com/facebook/buck/rules/BUCK b/test/com/facebook/buck/rules/BUCK index 3f71a1c0daf..9847018808a 100644 --- a/test/com/facebook/buck/rules/BUCK +++ b/test/com/facebook/buck/rules/BUCK @@ -27,7 +27,7 @@ java_library( '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', '//src/com/facebook/buck/io:watchman', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/json:json', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:rule_pattern', @@ -53,8 +53,8 @@ java_library( '//test/com/facebook/buck/artifact_cache:testutil', '//test/com/facebook/buck/cli:FakeBuckConfig', '//test/com/facebook/buck/event:testutil', - '//test/com/facebook/buck/java:fakepackagefinder', - '//test/com/facebook/buck/java:javac-env', + '//test/com/facebook/buck/jvm/java:fakepackagefinder', + '//test/com/facebook/buck/jvm/java:javac-env', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/step:testutil', '//test/com/facebook/buck/testutil:testutil', @@ -88,10 +88,10 @@ java_test( '//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:config', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:config', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/log:log', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:parser', @@ -124,7 +124,7 @@ java_test( '//test/com/facebook/buck/cxx:testutil', '//test/com/facebook/buck/event:testutil', '//test/com/facebook/buck/io:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/shell:testutil', '//test/com/facebook/buck/step:testutil', diff --git a/test/com/facebook/buck/rules/BuildContextTest.java b/test/com/facebook/buck/rules/BuildContextTest.java index 153e3867a29..2365396b772 100644 --- a/test/com/facebook/buck/rules/BuildContextTest.java +++ b/test/com/facebook/buck/rules/BuildContextTest.java @@ -31,7 +31,7 @@ import com.facebook.buck.event.BuckEventBusFactory; import com.facebook.buck.event.BuckEventBusFactory.CapturingConsoleEventListener; import com.facebook.buck.io.MorePaths; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.model.BuildId; import com.facebook.buck.step.StepRunner; import com.facebook.buck.timing.Clock; diff --git a/test/com/facebook/buck/rules/BuildRuleResolverTest.java b/test/com/facebook/buck/rules/BuildRuleResolverTest.java index 5d8c3a092fe..4185b2b114a 100644 --- a/test/com/facebook/buck/rules/BuildRuleResolverTest.java +++ b/test/com/facebook/buck/rules/BuildRuleResolverTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.google.common.collect.ImmutableSortedSet; diff --git a/test/com/facebook/buck/rules/CachingBuildEngineTest.java b/test/com/facebook/buck/rules/CachingBuildEngineTest.java index 64ec0b5a092..9c6d311c0f8 100644 --- a/test/com/facebook/buck/rules/CachingBuildEngineTest.java +++ b/test/com/facebook/buck/rules/CachingBuildEngineTest.java @@ -40,8 +40,8 @@ import com.facebook.buck.event.FakeBuckEventListener; import com.facebook.buck.file.WriteFile; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.FakeJavaPackageFinder; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.model.BuildId; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; diff --git a/test/com/facebook/buck/rules/FakeBuildContext.java b/test/com/facebook/buck/rules/FakeBuildContext.java index c0f416f0b59..cceaf9c9828 100644 --- a/test/com/facebook/buck/rules/FakeBuildContext.java +++ b/test/com/facebook/buck/rules/FakeBuildContext.java @@ -18,7 +18,7 @@ import com.facebook.buck.artifact_cache.NoopArtifactCache; import com.facebook.buck.event.BuckEventBusFactory; -import com.facebook.buck.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; import com.facebook.buck.model.BuildId; import com.facebook.buck.step.DefaultStepRunner; import com.facebook.buck.step.ExecutionContext; @@ -44,7 +44,7 @@ private FakeBuildContext() {} /** * User still needs to invoke {@link ImmutableBuildContext.Builder#setActionGraph(ActionGraph)} * and {@link ImmutableBuildContext.Builder#setJavaPackageFinder( - * com.facebook.buck.java.JavaPackageFinder)} + * com.facebook.buck.jvm.java.JavaPackageFinder)} * before the {@link ImmutableBuildContext.Builder#build()} method of the builder can be invoked. */ public static ImmutableBuildContext.Builder newBuilder() { diff --git a/test/com/facebook/buck/rules/KnownBuildRuleTypesTest.java b/test/com/facebook/buck/rules/KnownBuildRuleTypesTest.java index 08b9cd57d98..3c4cd4eb4ab 100644 --- a/test/com/facebook/buck/rules/KnownBuildRuleTypesTest.java +++ b/test/com/facebook/buck/rules/KnownBuildRuleTypesTest.java @@ -29,11 +29,11 @@ import com.facebook.buck.cxx.CxxPlatform; import com.facebook.buck.cxx.CxxPlatformUtils; import com.facebook.buck.io.MorePaths; -import com.facebook.buck.java.DefaultJavaLibrary; -import com.facebook.buck.java.ExternalJavac; -import com.facebook.buck.java.JavaLibraryDescription; -import com.facebook.buck.java.Javac; -import com.facebook.buck.java.Jsr199Javac; +import com.facebook.buck.jvm.java.DefaultJavaLibrary; +import com.facebook.buck.jvm.java.ExternalJavac; +import com.facebook.buck.jvm.java.JavaLibraryDescription; +import com.facebook.buck.jvm.java.Javac; +import com.facebook.buck.jvm.java.Jsr199Javac; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.model.Flavor; diff --git a/test/com/facebook/buck/rules/ProjectConfigTest.java b/test/com/facebook/buck/rules/ProjectConfigTest.java index 0b0d912a2a3..84bc91e9710 100644 --- a/test/com/facebook/buck/rules/ProjectConfigTest.java +++ b/test/com/facebook/buck/rules/ProjectConfigTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.step.Step; diff --git a/test/com/facebook/buck/rules/RuleKeyTest.java b/test/com/facebook/buck/rules/RuleKeyTest.java index d5ec12926e5..0c33d73ee1d 100644 --- a/test/com/facebook/buck/rules/RuleKeyTest.java +++ b/test/com/facebook/buck/rules/RuleKeyTest.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.keys.DefaultRuleKeyBuilderFactory; diff --git a/test/com/facebook/buck/rules/TargetGraphHashingTest.java b/test/com/facebook/buck/rules/TargetGraphHashingTest.java index c6324e45ad7..c543064bcaf 100644 --- a/test/com/facebook/buck/rules/TargetGraphHashingTest.java +++ b/test/com/facebook/buck/rules/TargetGraphHashingTest.java @@ -23,7 +23,7 @@ import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertThat; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.testutil.FakeFileHashCache; diff --git a/test/com/facebook/buck/rules/TargetGraphTest.java b/test/com/facebook/buck/rules/TargetGraphTest.java index 620dbe98100..ce2430a2869 100644 --- a/test/com/facebook/buck/rules/TargetGraphTest.java +++ b/test/com/facebook/buck/rules/TargetGraphTest.java @@ -18,7 +18,7 @@ import static org.junit.Assert.assertEquals; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.testutil.TargetGraphFactory; diff --git a/test/com/facebook/buck/rules/keys/BUCK b/test/com/facebook/buck/rules/keys/BUCK index 475b10c124d..80ab6e72fbd 100644 --- a/test/com/facebook/buck/rules/keys/BUCK +++ b/test/com/facebook/buck/rules/keys/BUCK @@ -11,7 +11,7 @@ java_test( '//src/com/facebook/buck/util:util', '//src/com/facebook/buck/util/cache:cache', '//test/com/facebook/buck/io:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/rules:testutil', '//test/com/facebook/buck/shell:testutil', diff --git a/test/com/facebook/buck/rules/macros/BUCK b/test/com/facebook/buck/rules/macros/BUCK index 81f4c11c620..2705cc85a7a 100644 --- a/test/com/facebook/buck/rules/macros/BUCK +++ b/test/com/facebook/buck/rules/macros/BUCK @@ -11,7 +11,7 @@ java_test( '//src/com/facebook/buck/timing:timing', '//src/com/facebook/buck/util:constants', '//test/com/facebook/buck/io:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/rules:testutil', '//test/com/facebook/buck/shell:testutil', diff --git a/test/com/facebook/buck/rules/macros/ClasspathMacroExpanderTest.java b/test/com/facebook/buck/rules/macros/ClasspathMacroExpanderTest.java index f725b71323e..ecabf908550 100644 --- a/test/com/facebook/buck/rules/macros/ClasspathMacroExpanderTest.java +++ b/test/com/facebook/buck/rules/macros/ClasspathMacroExpanderTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertThat; import com.facebook.buck.io.MorePathsForTests; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRule; diff --git a/test/com/facebook/buck/rules/macros/ExecutableMacroExpanderTest.java b/test/com/facebook/buck/rules/macros/ExecutableMacroExpanderTest.java index ba1e92a5b81..c8bfc300c24 100644 --- a/test/com/facebook/buck/rules/macros/ExecutableMacroExpanderTest.java +++ b/test/com/facebook/buck/rules/macros/ExecutableMacroExpanderTest.java @@ -22,8 +22,8 @@ import static org.junit.Assert.assertThat; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaBinaryRuleBuilder; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaBinaryRuleBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BinaryBuildRule; diff --git a/test/com/facebook/buck/rules/macros/LocationMacroExpanderTest.java b/test/com/facebook/buck/rules/macros/LocationMacroExpanderTest.java index 8187bf4d870..72b53757bfa 100644 --- a/test/com/facebook/buck/rules/macros/LocationMacroExpanderTest.java +++ b/test/com/facebook/buck/rules/macros/LocationMacroExpanderTest.java @@ -22,8 +22,8 @@ import static org.junit.Assert.fail; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaBinaryRuleBuilder; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaBinaryRuleBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.rules.BuildRule; diff --git a/test/com/facebook/buck/shell/BUCK b/test/com/facebook/buck/shell/BUCK index aef30e152c2..04025c773ff 100644 --- a/test/com/facebook/buck/shell/BUCK +++ b/test/com/facebook/buck/shell/BUCK @@ -11,10 +11,10 @@ java_test( '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/graph:graph', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:packagefinder', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:packagefinder', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:rule_pattern', '//src/com/facebook/buck/rules:build_rule', @@ -35,7 +35,7 @@ java_test( '//src/com/facebook/buck/util/environment:environment', '//src/com/facebook/buck/util/environment:platform', '//test/com/facebook/buck/event:testutil', - '//test/com/facebook/buck/java:testutil', + '//test/com/facebook/buck/jvm/java:testutil', '//test/com/facebook/buck/rules:testutil', '//test/com/facebook/buck/step:testutil', '//test/com/facebook/buck/testutil:testutil', diff --git a/test/com/facebook/buck/shell/ExportFileTest.java b/test/com/facebook/buck/shell/ExportFileTest.java index e8bebfe5d61..f63f0672a00 100644 --- a/test/com/facebook/buck/shell/ExportFileTest.java +++ b/test/com/facebook/buck/shell/ExportFileTest.java @@ -23,7 +23,7 @@ import com.facebook.buck.event.BuckEventBusFactory; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaPackageFinder; +import com.facebook.buck.jvm.java.JavaPackageFinder; import com.facebook.buck.model.BuildId; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; diff --git a/test/com/facebook/buck/shell/GenruleDescriptionTest.java b/test/com/facebook/buck/shell/GenruleDescriptionTest.java index 4f61d456b8e..ef32bc121fb 100644 --- a/test/com/facebook/buck/shell/GenruleDescriptionTest.java +++ b/test/com/facebook/buck/shell/GenruleDescriptionTest.java @@ -24,7 +24,7 @@ import static org.junit.Assert.fail; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.model.BuildTargetPattern; diff --git a/test/com/facebook/buck/shell/GenruleTest.java b/test/com/facebook/buck/shell/GenruleTest.java index 7a67b08d65d..7180fa687d4 100644 --- a/test/com/facebook/buck/shell/GenruleTest.java +++ b/test/com/facebook/buck/shell/GenruleTest.java @@ -25,9 +25,9 @@ import com.facebook.buck.android.AndroidPlatformTarget; import com.facebook.buck.io.ProjectFilesystem; -import com.facebook.buck.java.JavaBinaryRuleBuilder; -import com.facebook.buck.java.JavaLibrary; -import com.facebook.buck.java.JavaLibraryBuilder; +import com.facebook.buck.jvm.java.JavaBinaryRuleBuilder; +import com.facebook.buck.jvm.java.JavaLibrary; +import com.facebook.buck.jvm.java.JavaLibraryBuilder; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.parser.NoSuchBuildTargetException; diff --git a/test/com/facebook/buck/step/BUCK b/test/com/facebook/buck/step/BUCK index e6ebdc18954..648b3c3301a 100644 --- a/test/com/facebook/buck/step/BUCK +++ b/test/com/facebook/buck/step/BUCK @@ -14,7 +14,7 @@ java_library( '//src/com/facebook/buck/util:util', '//src/com/facebook/buck/util/environment:platform', '//test/com/facebook/buck/event:testutil', - '//test/com/facebook/buck/java:fakepackagefinder', + '//test/com/facebook/buck/jvm/java:fakepackagefinder', '//test/com/facebook/buck/testutil:testutil', '//third-party/java/guava:guava', '//third-party/java/jackson:jackson', diff --git a/test/com/facebook/buck/step/TestExecutionContext.java b/test/com/facebook/buck/step/TestExecutionContext.java index 4dccf3a836e..e0a15ac8edf 100644 --- a/test/com/facebook/buck/step/TestExecutionContext.java +++ b/test/com/facebook/buck/step/TestExecutionContext.java @@ -17,7 +17,7 @@ package com.facebook.buck.step; import com.facebook.buck.event.BuckEventBusFactory; -import com.facebook.buck.java.FakeJavaPackageFinder; +import com.facebook.buck.jvm.java.FakeJavaPackageFinder; import com.facebook.buck.testutil.TestConsole; import com.facebook.buck.util.ClassLoaderCache; import com.facebook.buck.util.environment.Platform; diff --git a/test/com/facebook/buck/thrift/BUCK b/test/com/facebook/buck/thrift/BUCK index 226b7029295..a796304d2ee 100644 --- a/test/com/facebook/buck/thrift/BUCK +++ b/test/com/facebook/buck/thrift/BUCK @@ -7,9 +7,9 @@ java_test( '//src/com/facebook/buck/cxx:platform', '//src/com/facebook/buck/cxx:rules', '//src/com/facebook/buck/io:io', - '//src/com/facebook/buck/java:classhash', - '//src/com/facebook/buck/java:rules', - '//src/com/facebook/buck/java:support', + '//src/com/facebook/buck/jvm/java:classhash', + '//src/com/facebook/buck/jvm/java:rules', + '//src/com/facebook/buck/jvm/java:support', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:rule_pattern', '//src/com/facebook/buck/python:rules', @@ -27,7 +27,7 @@ java_test( '//src/com/facebook/buck/util:exceptions', '//src/com/facebook/buck/util:util', '//test/com/facebook/buck/cli:FakeBuckConfig', - '//test/com/facebook/buck/java:javac-env', + '//test/com/facebook/buck/jvm/java:javac-env', '//test/com/facebook/buck/model:BuildTargetFactory', '//test/com/facebook/buck/python:testutil', '//test/com/facebook/buck/rules:testutil', diff --git a/test/com/facebook/buck/thrift/ThriftJavaEnhancerTest.java b/test/com/facebook/buck/thrift/ThriftJavaEnhancerTest.java index c592a54b147..550572631ae 100644 --- a/test/com/facebook/buck/thrift/ThriftJavaEnhancerTest.java +++ b/test/com/facebook/buck/thrift/ThriftJavaEnhancerTest.java @@ -16,7 +16,7 @@ package com.facebook.buck.thrift; -import static com.facebook.buck.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; +import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -24,7 +24,7 @@ import com.facebook.buck.cli.BuckConfig; import com.facebook.buck.cli.FakeBuckConfig; -import com.facebook.buck.java.DefaultJavaLibrary; +import com.facebook.buck.jvm.java.DefaultJavaLibrary; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.model.BuildTargetFactory; import com.facebook.buck.model.ImmutableFlavor; diff --git a/test/com/facebook/buck/util/LicenseCheckTest.java b/test/com/facebook/buck/util/LicenseCheckTest.java index 76b2c7c241d..323eca5c5c2 100644 --- a/test/com/facebook/buck/util/LicenseCheckTest.java +++ b/test/com/facebook/buck/util/LicenseCheckTest.java @@ -38,7 +38,7 @@ public class LicenseCheckTest { // exclude all files under "test/**/testdata/" private static final Set NON_APACHE_LICENSE_WHITELIST = ImmutableSet.of( // Because it's not originally our code. - "com/facebook/buck/java/coverage/ReportGenerator.java", + "com/facebook/buck/jvm/java/coverage/ReportGenerator.java", "com/facebook/buck/util/WindowsCreateProcessEscape.java", "com/facebook/buck/util/WindowsCreateProcessEscapeTest.java"); diff --git a/third-party/java/eclipse/BUCK b/third-party/java/eclipse/BUCK index dc426234389..2cd1f28dd31 100644 --- a/third-party/java/eclipse/BUCK +++ b/third-party/java/eclipse/BUCK @@ -10,7 +10,7 @@ java_library( ':equinox-preferences', ':osgi', ], - visibility = ['//src/com/facebook/buck/java:autodeps'] + visibility = ['//src/com/facebook/buck/jvm/java:autodeps'] ) prebuilt_jar( diff --git a/third-party/java/jackson/BUCK b/third-party/java/jackson/BUCK index 52411286d43..2b6edf7413f 100644 --- a/third-party/java/jackson/BUCK +++ b/third-party/java/jackson/BUCK @@ -12,7 +12,7 @@ java_library( '//src/com/facebook/buck/d:d', '//src/com/facebook/buck/event:event', '//src/com/facebook/buck/io:watchman', - '//src/com/facebook/buck/java:rules', + '//src/com/facebook/buck/jvm/java:rules', '//src/com/facebook/buck/python:rules', '//src/com/facebook/buck/rules/...', '//src/com/facebook/buck/step:step', @@ -63,7 +63,7 @@ prebuilt_jar( '//src/com/facebook/buck/command:command', '//src/com/facebook/buck/event/listener:listener', '//src/com/facebook/buck/httpserver:httpserver', - '//src/com/facebook/buck/java/intellij:intellij', + '//src/com/facebook/buck/jvm/java/intellij:intellij', '//src/com/facebook/buck/model:model', '//src/com/facebook/buck/parser:parser', '//src/com/facebook/buck/rules:rules', diff --git a/third-party/java/jacoco/BUCK b/third-party/java/jacoco/BUCK index 98d0100e2cc..1633addb8a8 100644 --- a/third-party/java/jacoco/BUCK +++ b/third-party/java/jacoco/BUCK @@ -8,7 +8,7 @@ java_library( '//third-party/java/asm:asm', ], visibility = [ - '//src/com/facebook/buck/java/coverage:coverage', + '//src/com/facebook/buck/jvm/java/coverage:coverage', ], ) diff --git a/third-party/java/jdk/BUCK b/third-party/java/jdk/BUCK index 5596aced5b6..02d4cf305b3 100644 --- a/third-party/java/jdk/BUCK +++ b/third-party/java/jdk/BUCK @@ -1,15 +1,15 @@ # This is a stub jar for the Compiler Tree API # (http://docs.oracle.com/javase/7/docs/jdk/api/javac/tree/overview-summary.html) # It was created as follows: -# buck build src/com/facebook/buck/java/abi:api-stubber -# java -jar buck-out/gen/src/com/facebook/buck/java/abi/api-stubber.jar ${JAVA_HOME}/lib/tools.jar stub-compiler-tree-api.jar +# buck build src/com/facebook/buck/jvm/java/abi:api-stubber +# java -jar buck-out/gen/src/com/facebook/buck/jvm/java/abi/api-stubber.jar ${JAVA_HOME}/lib/tools.jar stub-compiler-tree-api.jar # prebuilt_jar( name = 'compiler-tree-api', binary_jar = 'stub-compiler-tree-api.jar', visibility = [ - '//src/com/facebook/buck/java/tracing:compiler-plugin', - '//test/com/facebook/buck/java/tracing:tracing', + '//src/com/facebook/buck/jvm/java/tracing:compiler-plugin', + '//test/com/facebook/buck/jvm/java/tracing:tracing', ], )