Remove XcodeProjectConfigDescription
Summary:
Since we are not using `XcodeProjectConfigDescription` anymore, delete it,
update integration test to stop using it and delete integration tests that
are no longer relevant.
Test Plan:
* `buck test`
* `buck project` in a repository with Apple targets.
diff --git a/src/com/facebook/buck/apple/XcodeProjectConfigDescription.java b/src/com/facebook/buck/apple/XcodeProjectConfigDescription.java
deleted file mode 100644
index 589e4e7..0000000
--- a/src/com/facebook/buck/apple/XcodeProjectConfigDescription.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2012-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.apple;
-
-import com.facebook.buck.model.BuildTarget;
-import com.facebook.buck.rules.BuildRuleParams;
-import com.facebook.buck.rules.BuildRuleResolver;
-import com.facebook.buck.rules.BuildRuleType;
-import com.facebook.buck.rules.Description;
-import com.facebook.buck.rules.ImmutableBuildRuleType;
-import com.facebook.buck.rules.SourcePathResolver;
-import com.facebook.infer.annotation.SuppressFieldNotInitialized;
-import com.google.common.collect.ImmutableSortedSet;
-
-public class XcodeProjectConfigDescription
- implements Description<XcodeProjectConfigDescription.Arg> {
- public static final BuildRuleType TYPE = ImmutableBuildRuleType.of("xcode_project_config");
-
- @Override
- public BuildRuleType getBuildRuleType() {
- return TYPE;
- }
-
- @Override
- public Arg createUnpopulatedConstructorArg() {
- return new Arg();
- }
-
- @Override
- public <A extends Arg> XcodeProjectConfig createBuildRule(
- BuildRuleParams params,
- BuildRuleResolver resolver,
- A args) {
- return new XcodeProjectConfig(params, new SourcePathResolver(resolver));
- }
-
- @SuppressFieldNotInitialized
- public static class Arg {
- public String projectName;
- public ImmutableSortedSet<BuildTarget> rules;
- }
-}
diff --git a/src/com/facebook/buck/cli/ProjectPredicates.java b/src/com/facebook/buck/cli/ProjectPredicates.java
index 1d23b2b..7dc7cf9 100644
--- a/src/com/facebook/buck/cli/ProjectPredicates.java
+++ b/src/com/facebook/buck/cli/ProjectPredicates.java
@@ -16,7 +16,6 @@
package com.facebook.buck.cli;
-import com.facebook.buck.apple.XcodeProjectConfigDescription;
import com.facebook.buck.apple.XcodeWorkspaceConfigDescription;
import com.facebook.buck.model.BuildTarget;
import com.facebook.buck.rules.AssociatedTargetNodePredicate;
@@ -98,19 +97,6 @@
@Override
public boolean apply(
TargetNode<?> targetNode, TargetGraph targetGraph) {
- XcodeProjectConfigDescription.Arg projectArg;
- if (targetNode.getType() == XcodeProjectConfigDescription.TYPE) {
- projectArg = (XcodeProjectConfigDescription.Arg) targetNode.getConstructorArg();
- } else {
- return false;
- }
-
- for (BuildTarget includedBuildTarget : projectArg.rules) {
- if (targetGraph.get(includedBuildTarget) != null) {
- return true;
- }
- }
-
return false;
}
};
diff --git a/src/com/facebook/buck/rules/KnownBuildRuleTypes.java b/src/com/facebook/buck/rules/KnownBuildRuleTypes.java
index c4fef81..47742070 100644
--- a/src/com/facebook/buck/rules/KnownBuildRuleTypes.java
+++ b/src/com/facebook/buck/rules/KnownBuildRuleTypes.java
@@ -48,7 +48,6 @@
import com.facebook.buck.apple.AppleToolchainDiscovery;
import com.facebook.buck.apple.CoreDataModelDescription;
import com.facebook.buck.apple.IosPostprocessResourcesDescription;
-import com.facebook.buck.apple.XcodeProjectConfigDescription;
import com.facebook.buck.apple.XcodeWorkspaceConfigDescription;
import com.facebook.buck.cli.BuckConfig;
import com.facebook.buck.cxx.CxxBinaryDescription;
@@ -496,7 +495,6 @@
/* cpp2 */ true),
new ThriftPythonEnhancer(thriftBuckConfig, ThriftPythonEnhancer.Type.NORMAL),
new ThriftPythonEnhancer(thriftBuckConfig, ThriftPythonEnhancer.Type.TWISTED))));
- builder.register(new XcodeProjectConfigDescription());
builder.register(new XcodeWorkspaceConfigDescription());
return builder;
diff --git a/test/com/facebook/buck/apple/testdata/ios-project/Apps/Weather/BUCK b/test/com/facebook/buck/apple/testdata/ios-project/Apps/Weather/BUCK
index f35c53a..f1e1b2f 100644
--- a/test/com/facebook/buck/apple/testdata/ios-project/Apps/Weather/BUCK
+++ b/test/com/facebook/buck/apple/testdata/ios-project/Apps/Weather/BUCK
@@ -16,14 +16,6 @@
],
)
-xcode_project_config(
- name = 'project',
- project_name = 'Weather',
- rules = [
- ':Weather',
- ],
-)
-
xcode_workspace_config(
name = 'workspace',
src_target = ':Weather',
diff --git a/test/com/facebook/buck/apple/testdata/ios-project/Libraries/EXExample/BUCK b/test/com/facebook/buck/apple/testdata/ios-project/Libraries/EXExample/BUCK
index edcd754..73f6032 100644
--- a/test/com/facebook/buck/apple/testdata/ios-project/Libraries/EXExample/BUCK
+++ b/test/com/facebook/buck/apple/testdata/ios-project/Libraries/EXExample/BUCK
@@ -18,11 +18,3 @@
'PUBLIC',
],
)
-
-xcode_project_config(
- name = 'project',
- project_name = 'EXExample',
- rules = [
- ':EXExample',
- ],
-)
diff --git a/test/com/facebook/buck/java/intellij/ProjectIntegrationTest.java b/test/com/facebook/buck/java/intellij/ProjectIntegrationTest.java
index d6e4e8f..fe12d9d 100644
--- a/test/com/facebook/buck/java/intellij/ProjectIntegrationTest.java
+++ b/test/com/facebook/buck/java/intellij/ProjectIntegrationTest.java
@@ -468,34 +468,6 @@
}
@Test
- public void projectRulesCanReferenceTargetsInOtherBuckFiles() throws IOException {
- ProjectWorkspace workspace = TestDataHelper.createProjectWorkspaceForScenario(
- this,
- "project_rules_can_reference_targets_in_other_buck_files",
- temporaryFolder);
- workspace.setUp();
-
- ProcessResult result = workspace.runBuckCommand("project");
- result.assertSuccess();
-
- workspace.verify();
- }
-
- @Test
- public void allTargetsInAProjectRuleCanBeInOtherBuckFiles() throws IOException {
- ProjectWorkspace workspace = TestDataHelper.createProjectWorkspaceForScenario(
- this,
- "all_targets_in_a_project_rule_can_be_in_other_buck_files",
- temporaryFolder);
- workspace.setUp();
-
- ProcessResult result = workspace.runBuckCommand("project");
- result.assertSuccess();
-
- workspace.verify();
- }
-
- @Test
public void generatingAllWorkspacesWillNotIncludeAllProjectsInEachOfThem() throws IOException {
ProjectWorkspace workspace = TestDataHelper.createProjectWorkspaceForScenario(
this,
diff --git a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/.buckconfig b/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/.buckconfig
deleted file mode 100644
index 8e80641..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/.buckconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-[project]
- ide = xcode
diff --git a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/BUCK b/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/BUCK
deleted file mode 100644
index 5963aee..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/BUCK
+++ /dev/null
@@ -1,13 +0,0 @@
-xcode_project_config(
- name = 'project',
- project_name = 'TestApp',
- rules = [
- '//Apps/TestApp:TestApp',
- '//Libraries/Dep1:Dep1',
- ],
-)
-
-xcode_workspace_config(
- name = 'workspace',
- src_target = '//Apps/TestApp:TestApp',
-)
diff --git a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/TestApp.xcworkspace/contents.xcworkspacedata.expected b/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/TestApp.xcworkspace/contents.xcworkspacedata.expected
deleted file mode 100644
index e4cca98..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/TestApp.xcworkspace/contents.xcworkspacedata.expected
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><Workspace version="1.0"><Group location="container:" name="Apps"><FileRef location="container:TestApp/TestApp.xcodeproj"/></Group><Group location="container:" name="Libraries"><FileRef location="container:../Libraries/Dep1/Dep1.xcodeproj"/></Group></Workspace>
\ No newline at end of file
diff --git a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/TestApp.xcworkspace/xcshareddata/xcschemes/TestApp.xcscheme.expected b/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/TestApp.xcworkspace/xcshareddata/xcschemes/TestApp.xcscheme.expected
deleted file mode 100644
index e69da13..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/TestApp.xcworkspace/xcshareddata/xcschemes/TestApp.xcscheme.expected
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><Scheme LastUpgradeVersion="9999" version="1.7"><BuildAction buildImplicitDependencies="NO" parallelizeBuildables="NO"><BuildActionEntries><BuildActionEntry buildForAnalyzing="YES" buildForArchiving="YES" buildForProfiling="YES" buildForRunning="YES" buildForTesting="YES"><BuildableReference BlueprintIdentifier="E66DC04E0020722200000000" BlueprintName="Dep1" BuildableIdentifier="primary" BuildableName="libDep1.a" ReferencedContainer="container:../Libraries/Dep1/Dep1.xcodeproj"/></BuildActionEntry><BuildActionEntry buildForAnalyzing="YES" buildForArchiving="YES" buildForProfiling="YES" buildForRunning="YES" buildForTesting="YES"><BuildableReference BlueprintIdentifier="E66DC04E0E6F340F00000000" BlueprintName="TestApp" BuildableIdentifier="primary" BuildableName="TestApp.app" ReferencedContainer="container:TestApp/TestApp.xcodeproj"/></BuildActionEntry></BuildActionEntries></BuildAction><TestAction buildConfiguration="Debug" shouldUseLaunchSchemeArgsEnv="YES"><Testables/></TestAction><LaunchAction buildConfiguration="Debug"><BuildableProductRunnable><BuildableReference BlueprintIdentifier="E66DC04E0E6F340F00000000" BlueprintName="TestApp" BuildableIdentifier="primary" BuildableName="TestApp.app" ReferencedContainer="container:TestApp/TestApp.xcodeproj"/></BuildableProductRunnable></LaunchAction><ProfileAction buildConfiguration="Release"><BuildableProductRunnable><BuildableReference BlueprintIdentifier="E66DC04E0E6F340F00000000" BlueprintName="TestApp" BuildableIdentifier="primary" BuildableName="TestApp.app" ReferencedContainer="container:TestApp/TestApp.xcodeproj"/></BuildableProductRunnable></ProfileAction><AnalyzeAction buildConfiguration="Debug"/><ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"/></Scheme>
\ No newline at end of file
diff --git a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/TestApp/BUCK b/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/TestApp/BUCK
deleted file mode 100644
index 5c61cc9..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Apps/TestApp/BUCK
+++ /dev/null
@@ -1,22 +0,0 @@
-EMPTY_CONFIGS = {
- 'Debug': {},
- 'Release': {},
-}
-
-apple_binary(
- name = 'TestAppBinary',
- configs = EMPTY_CONFIGS,
- srcs = [],
- frameworks = [],
- deps = [
- '//Libraries/Dep1:Dep1',
- ],
-)
-
-apple_bundle(
- name = 'TestApp',
- deps = [':TestAppBinary'],
- binary = ':TestAppBinary',
- extension = 'app',
- visibility = ['PUBLIC'],
-)
diff --git a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Libraries/Dep1/BUCK b/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Libraries/Dep1/BUCK
deleted file mode 100644
index 7f42213..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/all_targets_in_a_project_rule_can_be_in_other_buck_files/Libraries/Dep1/BUCK
+++ /dev/null
@@ -1,13 +0,0 @@
-EMPTY_CONFIGS = {
- 'Debug': {},
- 'Release': {},
-}
-
-apple_library(
- name = 'Dep1',
- configs = EMPTY_CONFIGS,
- srcs = [],
- frameworks = [],
- deps = [],
- visibility = ['PUBLIC'],
-)
diff --git a/test/com/facebook/buck/java/intellij/testdata/generating_all_workspaces_will_not_include_all_projects_in_each_of_them/Apps/BUCK b/test/com/facebook/buck/java/intellij/testdata/generating_all_workspaces_will_not_include_all_projects_in_each_of_them/Apps/BUCK
index e76a0e2..5c35a85 100644
--- a/test/com/facebook/buck/java/intellij/testdata/generating_all_workspaces_will_not_include_all_projects_in_each_of_them/Apps/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/generating_all_workspaces_will_not_include_all_projects_in_each_of_them/Apps/BUCK
@@ -21,14 +21,6 @@
extension = 'app',
)
-xcode_project_config(
- name = 'project1',
- project_name = 'TestApp1',
- rules = [
- ':TestApp1',
- ],
-)
-
xcode_workspace_config(
name = 'workspace1',
src_target = '//Apps:TestApp1'
@@ -52,14 +44,6 @@
extension = 'app',
)
-xcode_project_config(
- name = 'project2',
- project_name = 'TestApp2',
- rules = [
- ':TestApp2',
- ],
-)
-
xcode_workspace_config(
name = 'workspace2',
src_target = '//Apps:TestApp2'
diff --git a/test/com/facebook/buck/java/intellij/testdata/generating_all_workspaces_will_not_include_all_projects_in_each_of_them/Libraries/BUCK b/test/com/facebook/buck/java/intellij/testdata/generating_all_workspaces_will_not_include_all_projects_in_each_of_them/Libraries/BUCK
index 50bfe0b..4882df1 100644
--- a/test/com/facebook/buck/java/intellij/testdata/generating_all_workspaces_will_not_include_all_projects_in_each_of_them/Libraries/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/generating_all_workspaces_will_not_include_all_projects_in_each_of_them/Libraries/BUCK
@@ -29,27 +29,3 @@
deps = [],
visibility = ['PUBLIC'],
)
-
-xcode_project_config(
- name = 'project1',
- project_name = 'Dep1',
- rules = [
- ':Dep1',
- ],
-)
-
-xcode_project_config(
- name = 'project2',
- project_name = 'Dep2',
- rules = [
- ':Dep2',
- ],
-)
-
-xcode_project_config(
- name = 'project3',
- project_name = 'Dep3',
- rules = [
- ':Dep3',
- ],
-)
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies/Apps/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies/Apps/BUCK
index 9a22028..62c1a4c 100644
--- a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies/Apps/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies/Apps/BUCK
@@ -35,15 +35,6 @@
],
)
-xcode_project_config(
- name = 'project',
- project_name = 'TestApp',
- rules = [
- ':TestApp',
- ':TestAppTests',
- ],
-)
-
xcode_workspace_config(
name = 'workspace',
src_target = '//Apps:TestApp'
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies/Libraries/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies/Libraries/BUCK
index 5b05357..f4d0cf1 100644
--- a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies/Libraries/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies/Libraries/BUCK
@@ -65,16 +65,3 @@
':Dep3',
],
)
-
-xcode_project_config(
- name = 'project',
- project_name = 'Libraries',
- rules = [
- ':Dep1',
- ':Dep2',
- ':Dep3',
- ':Dep1Tests',
- ':Dep2Tests',
- ':Dep3Tests',
- ],
-)
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Apps/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Apps/BUCK
index 6f31e0e..c9ed98a 100644
--- a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Apps/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Apps/BUCK
@@ -34,15 +34,6 @@
],
)
-xcode_project_config(
- name = 'project',
- project_name = 'TestApp',
- rules = [
- ':TestApp',
- ':TestAppTests',
- ],
-)
-
xcode_workspace_config(
name = 'workspace',
src_target = '//Apps:TestApp'
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep1/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep1/BUCK
index 1f3f9d8..6e6e28f 100644
--- a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep1/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep1/BUCK
@@ -23,12 +23,3 @@
':Dep1',
],
)
-
-xcode_project_config(
- name = 'project',
- project_name = 'Libraries',
- rules = [
- ':Dep1',
- ':Dep1Tests',
- ],
-)
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep2/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep2/BUCK
index 38da212..131926f 100644
--- a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep2/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep2/BUCK
@@ -23,12 +23,3 @@
':Dep2',
],
)
-
-xcode_project_config(
- name = 'project',
- project_name = 'Libraries',
- rules = [
- ':Dep2',
- ':Dep2Tests',
- ],
-)
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep3/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep3/BUCK
index c3d1114..ccc5036 100644
--- a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep3/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_includes_tests_and_dependencies_in_a_different_buck_file/Libraries/Dep3/BUCK
@@ -23,12 +23,3 @@
':Dep3',
],
)
-
-xcode_project_config(
- name = 'project',
- project_name = 'Libraries',
- rules = [
- ':Dep3',
- ':Dep3Tests',
- ],
-)
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_only_includes_dependencies/Apps/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_only_includes_dependencies/Apps/BUCK
index 121e7a4..79c9ae6 100644
--- a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_only_includes_dependencies/Apps/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_only_includes_dependencies/Apps/BUCK
@@ -34,15 +34,6 @@
],
)
-xcode_project_config(
- name = 'project',
- project_name = 'TestApp',
- rules = [
- ':TestApp',
- ':TestAppTests',
- ],
-)
-
xcode_workspace_config(
name = 'workspace',
src_target = '//Apps:TestApp'
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_only_includes_dependencies/Libraries/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_only_includes_dependencies/Libraries/BUCK
index 5b05357..f4d0cf1 100644
--- a/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_only_includes_dependencies/Libraries/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/project_generated_scheme_only_includes_dependencies/Libraries/BUCK
@@ -65,16 +65,3 @@
':Dep3',
],
)
-
-xcode_project_config(
- name = 'project',
- project_name = 'Libraries',
- rules = [
- ':Dep1',
- ':Dep2',
- ':Dep3',
- ':Dep1Tests',
- ':Dep2Tests',
- ':Dep3Tests',
- ],
-)
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_generated_schemes_do_not_include_other_tests/Apps/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_generated_schemes_do_not_include_other_tests/Apps/BUCK
index 121e7a4..79c9ae6 100644
--- a/test/com/facebook/buck/java/intellij/testdata/project_generated_schemes_do_not_include_other_tests/Apps/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/project_generated_schemes_do_not_include_other_tests/Apps/BUCK
@@ -34,15 +34,6 @@
],
)
-xcode_project_config(
- name = 'project',
- project_name = 'TestApp',
- rules = [
- ':TestApp',
- ':TestAppTests',
- ],
-)
-
xcode_workspace_config(
name = 'workspace',
src_target = '//Apps:TestApp'
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_generated_schemes_do_not_include_other_tests/Libraries/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_generated_schemes_do_not_include_other_tests/Libraries/BUCK
index 19d7a4a..162804a 100644
--- a/test/com/facebook/buck/java/intellij/testdata/project_generated_schemes_do_not_include_other_tests/Libraries/BUCK
+++ b/test/com/facebook/buck/java/intellij/testdata/project_generated_schemes_do_not_include_other_tests/Libraries/BUCK
@@ -85,20 +85,6 @@
],
)
-xcode_project_config(
- name = 'project',
- project_name = 'Libraries',
- rules = [
- ':TestDep',
- ':Dep1',
- ':Dep2',
- ':Dep3',
- ':Dep1Tests',
- ':Dep2Tests',
- ':Dep3Tests',
- ],
-)
-
xcode_workspace_config(
name = 'workspace',
src_target = ':TestDep'
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/.buckconfig b/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/.buckconfig
deleted file mode 100644
index 8e80641..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/.buckconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-[project]
- ide = xcode
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Apps/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Apps/BUCK
deleted file mode 100644
index 6f81afc..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Apps/BUCK
+++ /dev/null
@@ -1,35 +0,0 @@
-EMPTY_CONFIGS = {
- 'Debug': {},
- 'Release': {},
-}
-
-apple_binary(
- name = 'TestAppBinary',
- configs = EMPTY_CONFIGS,
- srcs = [],
- frameworks = [],
- deps = [
- '//Libraries/Dep1:Dep1',
- ],
-)
-
-apple_bundle(
- name = 'TestApp',
- deps = [':TestAppBinary'],
- binary = ':TestAppBinary',
- extension = 'app',
-)
-
-xcode_project_config(
- name = 'project',
- project_name = 'TestApp',
- rules = [
- ':TestApp',
- '//Libraries/Dep1:Dep1',
- ],
-)
-
-xcode_workspace_config(
- name = 'workspace',
- src_target = '//Apps:TestApp'
-)
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Apps/TestApp.xcworkspace/contents.xcworkspacedata.expected b/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Apps/TestApp.xcworkspace/contents.xcworkspacedata.expected
deleted file mode 100644
index d89bcef..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Apps/TestApp.xcworkspace/contents.xcworkspacedata.expected
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><Workspace version="1.0"><FileRef location="container:Apps.xcodeproj"/><Group location="container:" name="Libraries"><FileRef location="container:../Libraries/Dep1/Dep1.xcodeproj"/></Group></Workspace>
\ No newline at end of file
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Apps/TestApp.xcworkspace/xcshareddata/xcschemes/TestApp.xcscheme.expected b/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Apps/TestApp.xcworkspace/xcshareddata/xcschemes/TestApp.xcscheme.expected
deleted file mode 100644
index ec4205a..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Apps/TestApp.xcworkspace/xcshareddata/xcschemes/TestApp.xcscheme.expected
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><Scheme LastUpgradeVersion="9999" version="1.7"><BuildAction buildImplicitDependencies="NO" parallelizeBuildables="NO"><BuildActionEntries><BuildActionEntry buildForAnalyzing="YES" buildForArchiving="YES" buildForProfiling="YES" buildForRunning="YES" buildForTesting="YES"><BuildableReference BlueprintIdentifier="E66DC04E0020722200000000" BlueprintName="Dep1" BuildableIdentifier="primary" BuildableName="libDep1.a" ReferencedContainer="container:../Libraries/Dep1/Dep1.xcodeproj"/></BuildActionEntry><BuildActionEntry buildForAnalyzing="YES" buildForArchiving="YES" buildForProfiling="YES" buildForRunning="YES" buildForTesting="YES"><BuildableReference BlueprintIdentifier="E66DC04E0E6F340F00000000" BlueprintName="TestApp" BuildableIdentifier="primary" BuildableName="TestApp.app" ReferencedContainer="container:Apps.xcodeproj"/></BuildActionEntry></BuildActionEntries></BuildAction><TestAction buildConfiguration="Debug" shouldUseLaunchSchemeArgsEnv="YES"><Testables/></TestAction><LaunchAction buildConfiguration="Debug"><BuildableProductRunnable><BuildableReference BlueprintIdentifier="E66DC04E0E6F340F00000000" BlueprintName="TestApp" BuildableIdentifier="primary" BuildableName="TestApp.app" ReferencedContainer="container:Apps.xcodeproj"/></BuildableProductRunnable></LaunchAction><ProfileAction buildConfiguration="Release"><BuildableProductRunnable><BuildableReference BlueprintIdentifier="E66DC04E0E6F340F00000000" BlueprintName="TestApp" BuildableIdentifier="primary" BuildableName="TestApp.app" ReferencedContainer="container:Apps.xcodeproj"/></BuildableProductRunnable></ProfileAction><AnalyzeAction buildConfiguration="Debug"/><ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"/></Scheme>
\ No newline at end of file
diff --git a/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Libraries/Dep1/BUCK b/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Libraries/Dep1/BUCK
deleted file mode 100644
index 7f42213..0000000
--- a/test/com/facebook/buck/java/intellij/testdata/project_rules_can_reference_targets_in_other_buck_files/Libraries/Dep1/BUCK
+++ /dev/null
@@ -1,13 +0,0 @@
-EMPTY_CONFIGS = {
- 'Debug': {},
- 'Release': {},
-}
-
-apple_library(
- name = 'Dep1',
- configs = EMPTY_CONFIGS,
- srcs = [],
- frameworks = [],
- deps = [],
- visibility = ['PUBLIC'],
-)
