From 12c72339313872378cb2dc08c45230654756ef43 Mon Sep 17 00:00:00 2001 From: Cameron Mc Gorian Date: Wed, 2 Oct 2019 14:26:02 +0200 Subject: [PATCH] Fix Carthage Build --- Concurrency.xcodeproj/project.pbxproj | 563 ++++++++++-------- Package.xcconfig | 2 + .../Concurrency/Concurrency-Bridging-Header.h | 23 + 3 files changed, 342 insertions(+), 246 deletions(-) create mode 100644 Package.xcconfig create mode 100644 Sources/Concurrency/Concurrency-Bridging-Header.h diff --git a/Concurrency.xcodeproj/project.pbxproj b/Concurrency.xcodeproj/project.pbxproj index 34dba73..b1c01df 100644 --- a/Concurrency.xcodeproj/project.pbxproj +++ b/Concurrency.xcodeproj/project.pbxproj @@ -5,13 +5,13 @@ objects = { "Concurrency::Concurrency" = { isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_38"; + buildConfigurationList = "OBJ_47"; buildPhases = ( - "OBJ_41", - "OBJ_51" + "OBJ_50", + "OBJ_60" ); dependencies = ( - "OBJ_53" + "OBJ_62" ); name = "Concurrency"; productName = "Concurrency"; @@ -25,25 +25,25 @@ }; "Concurrency::ConcurrencyPackageTests::ProductTarget" = { isa = "PBXAggregateTarget"; - buildConfigurationList = "OBJ_62"; + buildConfigurationList = "OBJ_71"; buildPhases = ( ); dependencies = ( - "OBJ_65" + "OBJ_74" ); name = "ConcurrencyPackageTests"; productName = "ConcurrencyPackageTests"; }; "Concurrency::ConcurrencyTests" = { isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_67"; + buildConfigurationList = "OBJ_76"; buildPhases = ( - "OBJ_70", - "OBJ_77" + "OBJ_79", + "OBJ_86" ); dependencies = ( - "OBJ_80", - "OBJ_81" + "OBJ_89", + "OBJ_90" ); name = "ConcurrencyTests"; productName = "ConcurrencyTests"; @@ -57,10 +57,10 @@ }; "Concurrency::ObjCBridges" = { isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_82"; + buildConfigurationList = "OBJ_91"; buildPhases = ( - "OBJ_85", - "OBJ_87" + "OBJ_94", + "OBJ_96" ); dependencies = ( ); @@ -76,9 +76,9 @@ }; "Concurrency::SwiftPMPackageDescription" = { isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_56"; + buildConfigurationList = "OBJ_65"; buildPhases = ( - "OBJ_59" + "OBJ_68" ); dependencies = ( ); @@ -89,6 +89,7 @@ "OBJ_1" = { isa = "PBXProject"; attributes = { + LastSwiftMigration = "9999"; LastUpgradeCheck = "9999"; }; buildConfigurationList = "OBJ_2"; @@ -99,7 +100,7 @@ "en" ); mainGroup = "OBJ_5"; - productRefGroup = "OBJ_33"; + productRefGroup = "OBJ_36"; projectDirPath = "."; targets = ( "Concurrency::Concurrency", @@ -113,74 +114,69 @@ isa = "PBXGroup"; children = ( "OBJ_11", - "OBJ_12" - ); - name = "include"; - path = "include"; - sourceTree = ""; - }; - "OBJ_11" = { - isa = "PBXFileReference"; - path = "AtomicBridges.h"; - sourceTree = ""; - }; - "OBJ_12" = { - isa = "PBXFileReference"; - name = "module.modulemap"; - path = "/Users/yiw/Uber/GitHub/swift-concurrency/Concurrency.xcodeproj/GeneratedModuleMap/ObjCBridges/module.modulemap"; - sourceTree = ""; - }; - "OBJ_13" = { - isa = "PBXGroup"; - children = ( + "OBJ_12", + "OBJ_13", "OBJ_14", "OBJ_15", "OBJ_16", - "OBJ_17", - "OBJ_18", - "OBJ_19" + "OBJ_17" ); name = "Concurrency"; path = "Sources/Concurrency"; sourceTree = "SOURCE_ROOT"; }; - "OBJ_14" = { + "OBJ_11" = { + isa = "PBXFileReference"; + path = "Concurrency-Bridging-Header.h"; + sourceTree = ""; + }; + "OBJ_12" = { isa = "PBXFileReference"; path = "AtomicBool.swift"; sourceTree = ""; }; - "OBJ_15" = { + "OBJ_13" = { isa = "PBXFileReference"; path = "AtomicInt.swift"; sourceTree = ""; }; - "OBJ_16" = { + "OBJ_14" = { isa = "PBXFileReference"; path = "AtomicReference.swift"; sourceTree = ""; }; - "OBJ_17" = { + "OBJ_15" = { isa = "PBXFileReference"; path = "AutoReleasingSemaphore.swift"; sourceTree = ""; }; - "OBJ_18" = { + "OBJ_16" = { isa = "PBXFileReference"; path = "CountDownLatch.swift"; sourceTree = ""; }; - "OBJ_19" = { + "OBJ_17" = { isa = "PBXGroup"; children = ( + "OBJ_18", + "OBJ_19", "OBJ_20", - "OBJ_21", - "OBJ_22", - "OBJ_23" + "OBJ_21" ); name = "Executor"; path = "Executor"; sourceTree = ""; }; + "OBJ_18" = { + isa = "PBXFileReference"; + path = "ConcurrentSequenceExecutor.swift"; + sourceTree = ""; + }; + "OBJ_19" = { + isa = "PBXFileReference"; + path = "ImmediateSerialSequenceExecutor.swift"; + sourceTree = ""; + }; "OBJ_2" = { isa = "XCConfigurationList"; buildConfigurations = ( @@ -192,65 +188,76 @@ }; "OBJ_20" = { isa = "PBXFileReference"; - path = "ConcurrentSequenceExecutor.swift"; + path = "SequenceExecutor.swift"; sourceTree = ""; }; "OBJ_21" = { isa = "PBXFileReference"; - path = "ImmediateSerialSequenceExecutor.swift"; + path = "Task.swift"; sourceTree = ""; }; "OBJ_22" = { - isa = "PBXFileReference"; - path = "SequenceExecutor.swift"; - sourceTree = ""; + isa = "PBXGroup"; + children = ( + "OBJ_23", + "OBJ_24" + ); + name = "ObjCBridges"; + path = "Sources/ObjCBridges"; + sourceTree = "SOURCE_ROOT"; }; "OBJ_23" = { isa = "PBXFileReference"; - path = "Task.swift"; + path = "AtomicBridges.m"; sourceTree = ""; }; "OBJ_24" = { isa = "PBXGroup"; children = ( - "OBJ_25" + "OBJ_25", + "OBJ_26" + ); + name = "include"; + path = "include"; + sourceTree = ""; + }; + "OBJ_25" = { + isa = "PBXFileReference"; + path = "AtomicBridges.h"; + sourceTree = ""; + }; + "OBJ_26" = { + isa = "PBXFileReference"; + name = "module.modulemap"; + path = "/Users/cameronmcgorian/Documents/dev/swift-concurrency/Concurrency.xcodeproj/GeneratedModuleMap/ObjCBridges/module.modulemap"; + sourceTree = ""; + }; + "OBJ_27" = { + isa = "PBXGroup"; + children = ( + "OBJ_28" ); name = "Tests"; path = ""; sourceTree = "SOURCE_ROOT"; }; - "OBJ_25" = { + "OBJ_28" = { isa = "PBXGroup"; children = ( - "OBJ_26", - "OBJ_27", - "OBJ_28", "OBJ_29", "OBJ_30", - "OBJ_31" + "OBJ_31", + "OBJ_32", + "OBJ_33", + "OBJ_34" ); name = "ConcurrencyTests"; path = "Tests/ConcurrencyTests"; sourceTree = "SOURCE_ROOT"; }; - "OBJ_26" = { - isa = "PBXFileReference"; - path = "AtomicBoolTests.swift"; - sourceTree = ""; - }; - "OBJ_27" = { - isa = "PBXFileReference"; - path = "AtomicIntTests.swift"; - sourceTree = ""; - }; - "OBJ_28" = { - isa = "PBXFileReference"; - path = "AtomicReferenceTests.swift"; - sourceTree = ""; - }; "OBJ_29" = { isa = "PBXFileReference"; - path = "AutoReleasingSemaphoreTests.swift"; + path = "AtomicBoolTests.swift"; sourceTree = ""; }; "OBJ_3" = { @@ -264,8 +271,9 @@ ENABLE_NS_ASSERTIONS = "YES"; GCC_OPTIMIZATION_LEVEL = "0"; GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)" + "$(inherited)", + "SWIFT_PACKAGE=1", + "DEBUG=1" ); MACOSX_DEPLOYMENT_TARGET = "10.10"; ONLY_ACTIVE_ARCH = "YES"; @@ -284,6 +292,7 @@ "watchsimulator" ); SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( + "$(inherited)", "SWIFT_PACKAGE", "DEBUG" ); @@ -294,45 +303,128 @@ }; "OBJ_30" = { isa = "PBXFileReference"; - path = "CountDownLatchTests.swift"; + path = "AtomicIntTests.swift"; sourceTree = ""; }; "OBJ_31" = { + isa = "PBXFileReference"; + path = "AtomicReferenceTests.swift"; + sourceTree = ""; + }; + "OBJ_32" = { + isa = "PBXFileReference"; + path = "AutoReleasingSemaphoreTests.swift"; + sourceTree = ""; + }; + "OBJ_33" = { + isa = "PBXFileReference"; + path = "CountDownLatchTests.swift"; + sourceTree = ""; + }; + "OBJ_34" = { isa = "PBXGroup"; children = ( - "OBJ_32" + "OBJ_35" ); name = "Executor"; path = "Executor"; sourceTree = ""; }; - "OBJ_32" = { + "OBJ_35" = { isa = "PBXFileReference"; path = "ConcurrentSequenceExecutorTests.swift"; sourceTree = ""; }; - "OBJ_33" = { + "OBJ_36" = { isa = "PBXGroup"; children = ( - "Concurrency::ConcurrencyTests::Product", "Concurrency::Concurrency::Product", + "Concurrency::ConcurrencyTests::Product", "Concurrency::ObjCBridges::Product" ); name = "Products"; path = ""; sourceTree = "BUILT_PRODUCTS_DIR"; }; - "OBJ_38" = { + "OBJ_4" = { + isa = "XCBuildConfiguration"; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = "YES"; + COMBINE_HIDPI_IMAGES = "YES"; + COPY_PHASE_STRIP = "YES"; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_OPTIMIZATION_LEVEL = "s"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "SWIFT_PACKAGE=1" + ); + MACOSX_DEPLOYMENT_TARGET = "10.10"; + OTHER_SWIFT_FLAGS = ( + "-DXcode" + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = "macosx"; + SUPPORTED_PLATFORMS = ( + "macosx", + "iphoneos", + "iphonesimulator", + "appletvos", + "appletvsimulator", + "watchos", + "watchsimulator" + ); + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( + "$(inherited)", + "SWIFT_PACKAGE" + ); + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + USE_HEADERMAP = "NO"; + }; + name = "Release"; + }; + "OBJ_40" = { + isa = "PBXFileReference"; + path = "CODE_OF_CONDUCT.md"; + sourceTree = ""; + }; + "OBJ_41" = { + isa = "PBXFileReference"; + path = "Package.xcconfig"; + sourceTree = ""; + }; + "OBJ_42" = { + isa = "PBXFileReference"; + path = "README.md"; + sourceTree = ""; + }; + "OBJ_43" = { + isa = "PBXFileReference"; + path = "NOTICE.txt"; + sourceTree = ""; + }; + "OBJ_44" = { + isa = "PBXFileReference"; + path = "CONTRIBUTING.md"; + sourceTree = ""; + }; + "OBJ_45" = { + isa = "PBXFileReference"; + path = "LICENSE.txt"; + sourceTree = ""; + }; + "OBJ_47" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_39", - "OBJ_40" + "OBJ_48", + "OBJ_49" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_39" = { + "OBJ_48" = { isa = "XCBuildConfiguration"; + baseConfigurationReference = "OBJ_8"; buildSettings = { ENABLE_TESTABILITY = "YES"; FRAMEWORK_SEARCH_PATHS = ( @@ -372,40 +464,9 @@ }; name = "Debug"; }; - "OBJ_4" = { - isa = "XCBuildConfiguration"; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = "YES"; - COMBINE_HIDPI_IMAGES = "YES"; - COPY_PHASE_STRIP = "YES"; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_OPTIMIZATION_LEVEL = "s"; - MACOSX_DEPLOYMENT_TARGET = "10.10"; - OTHER_SWIFT_FLAGS = ( - "-DXcode" - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = "macosx"; - SUPPORTED_PLATFORMS = ( - "macosx", - "iphoneos", - "iphonesimulator", - "appletvos", - "appletvsimulator", - "watchos", - "watchsimulator" - ); - SWIFT_ACTIVE_COMPILATION_CONDITIONS = ( - "SWIFT_PACKAGE" - ); - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - USE_HEADERMAP = "NO"; - }; - name = "Release"; - }; - "OBJ_40" = { + "OBJ_49" = { isa = "XCBuildConfiguration"; + baseConfigurationReference = "OBJ_8"; buildSettings = { ENABLE_TESTABILITY = "YES"; FRAMEWORK_SEARCH_PATHS = ( @@ -445,91 +506,104 @@ }; name = "Release"; }; - "OBJ_41" = { - isa = "PBXSourcesBuildPhase"; - files = ( + "OBJ_5" = { + isa = "PBXGroup"; + children = ( + "OBJ_6", + "OBJ_7", + "OBJ_9", + "OBJ_27", + "OBJ_36", + "OBJ_40", + "OBJ_41", "OBJ_42", "OBJ_43", "OBJ_44", - "OBJ_45", - "OBJ_46", - "OBJ_47", - "OBJ_48", - "OBJ_49", - "OBJ_50" + "OBJ_45" ); + path = ""; + sourceTree = ""; }; - "OBJ_42" = { + "OBJ_50" = { + isa = "PBXSourcesBuildPhase"; + files = ( + "OBJ_51", + "OBJ_52", + "OBJ_53", + "OBJ_54", + "OBJ_55", + "OBJ_56", + "OBJ_57", + "OBJ_58", + "OBJ_59" + ); + }; + "OBJ_51" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_12"; + }; + "OBJ_52" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_13"; + }; + "OBJ_53" = { isa = "PBXBuildFile"; fileRef = "OBJ_14"; }; - "OBJ_43" = { + "OBJ_54" = { isa = "PBXBuildFile"; fileRef = "OBJ_15"; }; - "OBJ_44" = { + "OBJ_55" = { isa = "PBXBuildFile"; fileRef = "OBJ_16"; }; - "OBJ_45" = { + "OBJ_56" = { isa = "PBXBuildFile"; - fileRef = "OBJ_17"; + fileRef = "OBJ_18"; }; - "OBJ_46" = { + "OBJ_57" = { isa = "PBXBuildFile"; - fileRef = "OBJ_18"; + fileRef = "OBJ_19"; }; - "OBJ_47" = { + "OBJ_58" = { isa = "PBXBuildFile"; fileRef = "OBJ_20"; }; - "OBJ_48" = { + "OBJ_59" = { isa = "PBXBuildFile"; fileRef = "OBJ_21"; }; - "OBJ_49" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_22"; - }; - "OBJ_5" = { - isa = "PBXGroup"; - children = ( - "OBJ_6", - "OBJ_7", - "OBJ_24", - "OBJ_33" - ); - path = ""; + "OBJ_6" = { + isa = "PBXFileReference"; + explicitFileType = "sourcecode.swift"; + path = "Package.swift"; sourceTree = ""; }; - "OBJ_50" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_23"; - }; - "OBJ_51" = { + "OBJ_60" = { isa = "PBXFrameworksBuildPhase"; files = ( - "OBJ_52" + "OBJ_61" ); }; - "OBJ_52" = { + "OBJ_61" = { isa = "PBXBuildFile"; fileRef = "Concurrency::ObjCBridges::Product"; }; - "OBJ_53" = { + "OBJ_62" = { isa = "PBXTargetDependency"; target = "Concurrency::ObjCBridges"; }; - "OBJ_56" = { + "OBJ_65" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_57", - "OBJ_58" + "OBJ_66", + "OBJ_67" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_57" = { + "OBJ_66" = { isa = "XCBuildConfiguration"; buildSettings = { LD = "/usr/bin/true"; @@ -541,13 +615,13 @@ "-target", "x86_64-apple-macosx10.10", "-sdk", - "/Applications/Xcode.10.1.0.10B61.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk" + "/Applications/Xcode.10.2.1.10E1001.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk" ); SWIFT_VERSION = "4.0"; }; name = "Debug"; }; - "OBJ_58" = { + "OBJ_67" = { isa = "XCBuildConfiguration"; buildSettings = { LD = "/usr/bin/true"; @@ -559,64 +633,68 @@ "-target", "x86_64-apple-macosx10.10", "-sdk", - "/Applications/Xcode.10.1.0.10B61.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk" + "/Applications/Xcode.10.2.1.10E1001.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk" ); SWIFT_VERSION = "4.0"; }; name = "Release"; }; - "OBJ_59" = { + "OBJ_68" = { isa = "PBXSourcesBuildPhase"; files = ( - "OBJ_60" + "OBJ_69" ); }; - "OBJ_6" = { - isa = "PBXFileReference"; - explicitFileType = "sourcecode.swift"; - path = "Package.swift"; - sourceTree = ""; - }; - "OBJ_60" = { + "OBJ_69" = { isa = "PBXBuildFile"; fileRef = "OBJ_6"; }; - "OBJ_62" = { + "OBJ_7" = { + isa = "PBXGroup"; + children = ( + "OBJ_8" + ); + name = "Configs"; + path = ""; + sourceTree = ""; + }; + "OBJ_71" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_63", - "OBJ_64" + "OBJ_72", + "OBJ_73" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_63" = { + "OBJ_72" = { isa = "XCBuildConfiguration"; buildSettings = { }; name = "Debug"; }; - "OBJ_64" = { + "OBJ_73" = { isa = "XCBuildConfiguration"; buildSettings = { }; name = "Release"; }; - "OBJ_65" = { + "OBJ_74" = { isa = "PBXTargetDependency"; target = "Concurrency::ConcurrencyTests"; }; - "OBJ_67" = { + "OBJ_76" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_68", - "OBJ_69" + "OBJ_77", + "OBJ_78" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_68" = { + "OBJ_77" = { isa = "XCBuildConfiguration"; + baseConfigurationReference = "OBJ_8"; buildSettings = { CLANG_ENABLE_MODULES = "YES"; EMBEDDED_CONTENT_CONTAINS_SWIFT = "YES"; @@ -654,8 +732,9 @@ }; name = "Debug"; }; - "OBJ_69" = { + "OBJ_78" = { isa = "XCBuildConfiguration"; + baseConfigurationReference = "OBJ_8"; buildSettings = { CLANG_ENABLE_MODULES = "YES"; EMBEDDED_CONTENT_CONTAINS_SWIFT = "YES"; @@ -693,95 +772,91 @@ }; name = "Release"; }; - "OBJ_7" = { - isa = "PBXGroup"; - children = ( - "OBJ_8", - "OBJ_13" - ); - name = "Sources"; - path = ""; - sourceTree = "SOURCE_ROOT"; - }; - "OBJ_70" = { + "OBJ_79" = { isa = "PBXSourcesBuildPhase"; files = ( - "OBJ_71", - "OBJ_72", - "OBJ_73", - "OBJ_74", - "OBJ_75", - "OBJ_76" + "OBJ_80", + "OBJ_81", + "OBJ_82", + "OBJ_83", + "OBJ_84", + "OBJ_85" ); }; - "OBJ_71" = { + "OBJ_8" = { + isa = "PBXFileReference"; + path = "Package.xcconfig"; + sourceTree = ""; + }; + "OBJ_80" = { isa = "PBXBuildFile"; - fileRef = "OBJ_26"; + fileRef = "OBJ_29"; }; - "OBJ_72" = { + "OBJ_81" = { isa = "PBXBuildFile"; - fileRef = "OBJ_27"; + fileRef = "OBJ_30"; }; - "OBJ_73" = { + "OBJ_82" = { isa = "PBXBuildFile"; - fileRef = "OBJ_28"; + fileRef = "OBJ_31"; }; - "OBJ_74" = { + "OBJ_83" = { isa = "PBXBuildFile"; - fileRef = "OBJ_29"; + fileRef = "OBJ_32"; }; - "OBJ_75" = { + "OBJ_84" = { isa = "PBXBuildFile"; - fileRef = "OBJ_30"; + fileRef = "OBJ_33"; }; - "OBJ_76" = { + "OBJ_85" = { isa = "PBXBuildFile"; - fileRef = "OBJ_32"; + fileRef = "OBJ_35"; }; - "OBJ_77" = { + "OBJ_86" = { isa = "PBXFrameworksBuildPhase"; files = ( - "OBJ_78", - "OBJ_79" + "OBJ_87", + "OBJ_88" ); }; - "OBJ_78" = { + "OBJ_87" = { isa = "PBXBuildFile"; fileRef = "Concurrency::Concurrency::Product"; }; - "OBJ_79" = { + "OBJ_88" = { isa = "PBXBuildFile"; fileRef = "Concurrency::ObjCBridges::Product"; }; - "OBJ_8" = { + "OBJ_89" = { + isa = "PBXTargetDependency"; + target = "Concurrency::Concurrency"; + }; + "OBJ_9" = { isa = "PBXGroup"; children = ( - "OBJ_9", - "OBJ_10" + "OBJ_10", + "OBJ_22" ); - name = "ObjCBridges"; - path = "Sources/ObjCBridges"; + name = "Sources"; + path = ""; sourceTree = "SOURCE_ROOT"; }; - "OBJ_80" = { - isa = "PBXTargetDependency"; - target = "Concurrency::Concurrency"; - }; - "OBJ_81" = { + "OBJ_90" = { isa = "PBXTargetDependency"; target = "Concurrency::ObjCBridges"; }; - "OBJ_82" = { + "OBJ_91" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_83", - "OBJ_84" + "OBJ_92", + "OBJ_93" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_83" = { + "OBJ_92" = { isa = "XCBuildConfiguration"; + baseConfigurationReference = "OBJ_8"; buildSettings = { DEFINES_MODULE = "NO"; ENABLE_TESTABILITY = "YES"; @@ -818,8 +893,9 @@ }; name = "Debug"; }; - "OBJ_84" = { + "OBJ_93" = { isa = "XCBuildConfiguration"; + baseConfigurationReference = "OBJ_8"; buildSettings = { DEFINES_MODULE = "NO"; ENABLE_TESTABILITY = "YES"; @@ -856,26 +932,21 @@ }; name = "Release"; }; - "OBJ_85" = { + "OBJ_94" = { isa = "PBXSourcesBuildPhase"; files = ( - "OBJ_86" + "OBJ_95" ); }; - "OBJ_86" = { + "OBJ_95" = { isa = "PBXBuildFile"; - fileRef = "OBJ_9"; + fileRef = "OBJ_23"; }; - "OBJ_87" = { + "OBJ_96" = { isa = "PBXFrameworksBuildPhase"; files = ( ); }; - "OBJ_9" = { - isa = "PBXFileReference"; - path = "AtomicBridges.m"; - sourceTree = ""; - }; }; rootObject = "OBJ_1"; } diff --git a/Package.xcconfig b/Package.xcconfig new file mode 100644 index 0000000..057251e --- /dev/null +++ b/Package.xcconfig @@ -0,0 +1,2 @@ + +SWIFT_OBJC_BRIDGING_HEADER = Sources/Concurrency/Concurrency-Bridging-Header.h diff --git a/Sources/Concurrency/Concurrency-Bridging-Header.h b/Sources/Concurrency/Concurrency-Bridging-Header.h new file mode 100644 index 0000000..2a05e68 --- /dev/null +++ b/Sources/Concurrency/Concurrency-Bridging-Header.h @@ -0,0 +1,23 @@ +// +// Copyright (c) 2018. Uber Technologies +// +// 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. +// + +#ifndef Concurrency_Bridging_Header_h +#define Concurrency_Bridging_Header_h + +#import "AtomicBridges.h" + + +#endif /* Concurrency_Bridging_Header_h */