From 0e25e9a57f752b2e97405bf210a7ee587e606c9a Mon Sep 17 00:00:00 2001 From: Aleksey Kononov Date: Wed, 12 Sep 2018 11:05:20 -0700 Subject: [PATCH] Fix building of xctool in Xcode 10. Major changes: - iOS 7 support has been dropped; - i386 support on OX has been dropped. --- Configurations/iOS.xcconfig | 2 +- .../otest-query.xcodeproj/project.pbxproj | 10 ++++++- .../otest-shim.xcodeproj/project.pbxproj | 8 +++-- reporters/reporters.xcodeproj/project.pbxproj | 30 +++++++++---------- .../xcodebuild-shim.xcodeproj/project.pbxproj | 2 +- xctool/xctool.xcconfig | 1 + xctool/xctool.xcodeproj/project.pbxproj | 18 ++++++----- .../xcshareddata/xcschemes/xctool.xcscheme | 2 +- 8 files changed, 43 insertions(+), 30 deletions(-) diff --git a/Configurations/iOS.xcconfig b/Configurations/iOS.xcconfig index c6764fe2f..08eeb1eb4 100644 --- a/Configurations/iOS.xcconfig +++ b/Configurations/iOS.xcconfig @@ -14,7 +14,7 @@ // limitations under the License. // -IPHONEOS_DEPLOYMENT_TARGET = 7.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 SDKROOT_IOS_OVERRIDE_ = iphonesimulator SDKROOT_IOS_OVERRIDE_NO = $(SDKROOT_IOS_OVERRIDE_) diff --git a/otest-query/otest-query.xcodeproj/project.pbxproj b/otest-query/otest-query.xcodeproj/project.pbxproj index d444e8517..2d1272269 100644 --- a/otest-query/otest-query.xcodeproj/project.pbxproj +++ b/otest-query/otest-query.xcodeproj/project.pbxproj @@ -450,7 +450,7 @@ CD9048F61756C5B1006CF16D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = Facebook; }; buildConfigurationList = CD9048F91756C5B1006CF16D /* Build configuration list for PBXProject "otest-query" */; @@ -663,6 +663,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 28660768183474D6000ACB87 /* otest-query-lib-osx.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; @@ -678,6 +679,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNUSED_FUNCTION = YES; PRODUCT_NAME = "$(TARGET_NAME)"; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -685,6 +687,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 28660768183474D6000ACB87 /* otest-query-lib-osx.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; @@ -697,6 +700,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNUSED_FUNCTION = YES; PRODUCT_NAME = "$(TARGET_NAME)"; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -752,8 +756,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = CD666138175D1B090057DF4D /* otest-query-osx.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREFIX_HEADER = "otest-query-osx/otest-query-osx-Prefix.pch"; PRODUCT_NAME = "$(TARGET_NAME)"; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -761,8 +767,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = CD666138175D1B090057DF4D /* otest-query-osx.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREFIX_HEADER = "otest-query-osx/otest-query-osx-Prefix.pch"; PRODUCT_NAME = "$(TARGET_NAME)"; + VALID_ARCHS = x86_64; }; name = Release; }; diff --git a/otest-shim/otest-shim.xcodeproj/project.pbxproj b/otest-shim/otest-shim.xcodeproj/project.pbxproj index 193f73d87..21f0f00ec 100644 --- a/otest-shim/otest-shim.xcodeproj/project.pbxproj +++ b/otest-shim/otest-shim.xcodeproj/project.pbxproj @@ -358,7 +358,7 @@ 283CCA8416C2EE4C00F2E343 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Facebook, Inc."; }; buildConfigurationList = 283CCA8716C2EE4C00F2E343 /* Build configuration list for PBXProject "otest-shim" */; @@ -490,12 +490,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = 282BFE29171602F80022F9FF /* otest-shim-osx.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; GCC_PREFIX_HEADER = "otest-shim/otest-shim-Prefix.pch"; PRODUCT_NAME = "otest-shim-osx"; SDKROOT = macosx; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -503,12 +505,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = 282BFE29171602F80022F9FF /* otest-shim-osx.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; GCC_PREFIX_HEADER = "otest-shim/otest-shim-Prefix.pch"; PRODUCT_NAME = "otest-shim-osx"; SDKROOT = macosx; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -583,7 +587,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; GCC_PREFIX_HEADER = "otest-shim/otest-shim-Prefix.pch"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; PRODUCT_NAME = "otest-shim-ios"; }; name = Debug; @@ -596,7 +599,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; GCC_PREFIX_HEADER = "otest-shim/otest-shim-Prefix.pch"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; PRODUCT_NAME = "otest-shim-ios"; }; name = Release; diff --git a/reporters/reporters.xcodeproj/project.pbxproj b/reporters/reporters.xcodeproj/project.pbxproj index 3936a9aa4..27e580272 100644 --- a/reporters/reporters.xcodeproj/project.pbxproj +++ b/reporters/reporters.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 285C16D317CD1788007FFC0C /* OCHamcrest.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28F48A01179742CA00068E00 /* OCHamcrest.framework */; }; - 285C16D417CD1788007FFC0C /* OCMockito.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28F48A02179742CA00068E00 /* OCMockito.framework */; }; 2893A95217960CD400EFBD28 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2893A95117960CD400EFBD28 /* Cocoa.framework */; }; 2893A95C17960CD400EFBD28 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2893A95A17960CD400EFBD28 /* InfoPlist.strings */; }; 2893A96B17960D2000EFBD28 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2893A96A17960D2000EFBD28 /* Foundation.framework */; }; @@ -95,6 +93,8 @@ CCC0AAFB18EC8AC4004FD861 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2893A96A17960D2000EFBD28 /* Foundation.framework */; }; CCC0AB0218EC8C6A004FD861 /* UserNotificationsReporter.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC0AAF318EC8A92004FD861 /* UserNotificationsReporter.m */; }; CCC0AB0518EC931C004FD861 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC0AAED18EC8A1F004FD861 /* main.m */; }; + CCED88F42149AD6B0093DF02 /* OCHamcrest.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28F48A01179742CA00068E00 /* OCHamcrest.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + CCED88F52149AD6E0093DF02 /* OCMockito.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28F48A02179742CA00068E00 /* OCMockito.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; EE61734717E284DD00F02C91 /* Reporter.m in Sources */ = {isa = PBXBuildFile; fileRef = EE61734617E284DD00F02C91 /* Reporter.m */; }; EE61734817E284DD00F02C91 /* Reporter.m in Sources */ = {isa = PBXBuildFile; fileRef = EE61734617E284DD00F02C91 /* Reporter.m */; }; EE61734917E284DD00F02C91 /* Reporter.m in Sources */ = {isa = PBXBuildFile; fileRef = EE61734617E284DD00F02C91 /* Reporter.m */; }; @@ -117,17 +117,6 @@ /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - 285C16D217CD1721007FFC0C /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 16; - files = ( - 285C16D317CD1788007FFC0C /* OCHamcrest.framework in CopyFiles */, - 285C16D417CD1788007FFC0C /* OCMockito.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 2893A96717960D2000EFBD28 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -191,6 +180,17 @@ ); runOnlyForDeploymentPostprocessing = 1; }; + CCED88F32149AD640093DF02 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + CCED88F52149AD6E0093DF02 /* OCMockito.framework in CopyFiles */, + CCED88F42149AD6B0093DF02 /* OCHamcrest.framework in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; FD023B231959ADA800947C28 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -558,7 +558,7 @@ 2893A94717960CD400EFBD28 /* Sources */, 2893A94817960CD400EFBD28 /* Frameworks */, 2893A94917960CD400EFBD28 /* Resources */, - 285C16D217CD1721007FFC0C /* CopyFiles */, + CCED88F32149AD640093DF02 /* CopyFiles */, ); buildRules = ( ); @@ -712,7 +712,7 @@ isa = PBXProject; attributes = { LastTestingUpgradeCheck = 0700; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1000; }; buildConfigurationList = 2893A94117960CAD00EFBD28 /* Build configuration list for PBXProject "reporters" */; compatibilityVersion = "Xcode 3.2"; diff --git a/xcodebuild-shim/xcodebuild-shim.xcodeproj/project.pbxproj b/xcodebuild-shim/xcodebuild-shim.xcodeproj/project.pbxproj index b9cd9c573..ecdb868dc 100644 --- a/xcodebuild-shim/xcodebuild-shim.xcodeproj/project.pbxproj +++ b/xcodebuild-shim/xcodebuild-shim.xcodeproj/project.pbxproj @@ -223,7 +223,7 @@ 283CCAA116C2EE7200F2E343 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Facebook, Inc."; }; buildConfigurationList = 283CCAA416C2EE7200F2E343 /* Build configuration list for PBXProject "xcodebuild-shim" */; diff --git a/xctool/xctool.xcconfig b/xctool/xctool.xcconfig index 69f460e83..69e88e841 100644 --- a/xctool/xctool.xcconfig +++ b/xctool/xctool.xcconfig @@ -34,6 +34,7 @@ FRAMEWORK_SEARCH_PATHS_0600 = "$(DEVELOPER_LIBRARY_DIR)/Frameworks" "$(SHARED_FR FRAMEWORK_SEARCH_PATHS_0700 = $(FRAMEWORK_SEARCH_PATHS_0600) "$(MIGRATION_FRAMEWORKS_DIR)" FRAMEWORK_SEARCH_PATHS_0800 = $(FRAMEWORK_SEARCH_PATHS_0600) FRAMEWORK_SEARCH_PATHS_0900 = $(FRAMEWORK_SEARCH_PATHS_0600) "/Library/Developer/PrivateFrameworks/" +FRAMEWORK_SEARCH_PATHS_1000 = $(FRAMEWORK_SEARCH_PATHS_0900) "$(DEVELOPER_FRAMEWORKS_DIR)" FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(XCODE_VERSION_MAJOR)) MACOSX_DEPLOYMENT_TARGET = 10.7 diff --git a/xctool/xctool.xcodeproj/project.pbxproj b/xctool/xctool.xcodeproj/project.pbxproj index 82928a834..fc0935b2b 100644 --- a/xctool/xctool.xcodeproj/project.pbxproj +++ b/xctool/xctool.xcodeproj/project.pbxproj @@ -70,9 +70,7 @@ 28E28FBD1797099E0072376C /* ReporterTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 28E28FBB1797099E0072376C /* ReporterTask.m */; }; 28E28FC01797193F0072376C /* ReporterTaskTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 28E28FBF1797193F0072376C /* ReporterTaskTests.m */; }; 28E9B98B16C2FDA700A52E4D /* OCMockito.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28E9B98A16C2FDA700A52E4D /* OCMockito.framework */; }; - 28E9B98C16C2FDB200A52E4D /* OCMockito.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28E9B98A16C2FDA700A52E4D /* OCMockito.framework */; }; 28E9B98E16C2FE4800A52E4D /* OCHamcrest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28E9B98D16C2FE4800A52E4D /* OCHamcrest.framework */; }; - 28E9B98F16C2FE4C00A52E4D /* OCHamcrest.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28E9B98D16C2FE4800A52E4D /* OCHamcrest.framework */; }; 28E9B99216C3037E00A52E4D /* FakeTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 28E9B99116C3037E00A52E4D /* FakeTask.m */; }; 28E9B9D716C3275200A52E4D /* OCUnitIOSAppTestRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 28E9B9D216C3275200A52E4D /* OCUnitIOSAppTestRunner.m */; }; 28E9B9D816C3275200A52E4D /* OCUnitIOSAppTestRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 28E9B9D216C3275200A52E4D /* OCUnitIOSAppTestRunner.m */; }; @@ -140,6 +138,8 @@ CCEB0F26195F2D9E00878E25 /* SimulatorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = CCF6EE48195BA918005BA335 /* SimulatorInfo.m */; }; CCEB0F28195F2D9E00878E25 /* SimulatorWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC55AD5195BCDD90051A50B /* SimulatorWrapper.m */; }; CCEB0F29195F2D9E00878E25 /* SimulatorWrapperXcode6.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC55AD1195BCD7D0051A50B /* SimulatorWrapperXcode6.m */; }; + CCED88F12149AC5C0093DF02 /* OCHamcrest.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28E9B98D16C2FE4800A52E4D /* OCHamcrest.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + CCED88F22149AC610093DF02 /* OCMockito.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28E9B98A16C2FDA700A52E4D /* OCMockito.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CCF6EE49195BA918005BA335 /* SimulatorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = CCF6EE48195BA918005BA335 /* SimulatorInfo.m */; }; CCF980331B38D1C900E4E0B0 /* XCTestConfigurationUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = CCF980321B38D1C900E4E0B0 /* XCTestConfigurationUnarchiver.m */; }; CD098A2A175EBD20002E0CAC /* AnalyzeAction.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD098A29175EBD20002E0CAC /* AnalyzeAction.mm */; }; @@ -181,14 +181,14 @@ ); runOnlyForDeploymentPostprocessing = 1; }; - 28E9B98816C2F59F00A52E4D /* CopyFiles */ = { + CCED88F02149AC550093DF02 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; - dstSubfolderSpec = 16; + dstSubfolderSpec = 10; files = ( - 28E9B98C16C2FDB200A52E4D /* OCMockito.framework in CopyFiles */, - 28E9B98F16C2FE4C00A52E4D /* OCHamcrest.framework in CopyFiles */, + CCED88F22149AC610093DF02 /* OCMockito.framework in CopyFiles */, + CCED88F12149AC5C0093DF02 /* OCHamcrest.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -808,7 +808,7 @@ 283CCABD16C2EE9900F2E343 /* Sources */, 283CCABE16C2EE9900F2E343 /* Frameworks */, 283CCABF16C2EE9900F2E343 /* Resources */, - 28E9B98816C2F59F00A52E4D /* CopyFiles */, + CCED88F02149AC550093DF02 /* CopyFiles */, ); buildRules = ( ); @@ -826,7 +826,7 @@ isa = PBXProject; attributes = { LastTestingUpgradeCheck = 0700; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Facebook, Inc."; }; buildConfigurationList = 283CCA3D16C2EA3700F2E343 /* Build configuration list for PBXProject "xctool" */; @@ -1173,6 +1173,7 @@ GCC_WARN_SIGN_COMPARE = NO; GCC_WARN_STRICT_SELECTOR_MATCH = NO; INFOPLIST_FILE = "xctool-tests/xctool-tests-Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "xctool-tests"; SKIP_INSTALL = YES; @@ -1196,6 +1197,7 @@ GCC_WARN_SIGN_COMPARE = NO; GCC_WARN_STRICT_SELECTOR_MATCH = NO; INFOPLIST_FILE = "xctool-tests/xctool-tests-Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "xctool-tests"; SKIP_INSTALL = YES; diff --git a/xctool/xctool.xcodeproj/xcshareddata/xcschemes/xctool.xcscheme b/xctool/xctool.xcodeproj/xcshareddata/xcschemes/xctool.xcscheme index d986cc5fc..8c62428c9 100644 --- a/xctool/xctool.xcodeproj/xcshareddata/xcschemes/xctool.xcscheme +++ b/xctool/xctool.xcodeproj/xcshareddata/xcschemes/xctool.xcscheme @@ -1,6 +1,6 @@