From 49dffd0c183d953cba47b1e2974e93f1ee23721b Mon Sep 17 00:00:00 2001 From: Claude Houle Date: Mon, 23 Aug 2021 12:55:11 -0400 Subject: [PATCH] Fix for Xcode previews in universal apps --- CombineCocoa.podspec | 11 +++++----- CombineCocoa.xcodeproj/project.pbxproj | 21 ++++++++++--------- Example/Example.xcodeproj/project.pbxproj | 4 +++- .../xcshareddata/xcschemes/Example.xcscheme | 2 +- Example/Podfile.lock | 4 ++-- Package.swift | 7 +++++-- .../CombineCocoa/CombineControlEvent.swift | 2 +- .../CombineCocoa/CombineControlProperty.swift | 2 +- .../Controls/NSTextStorage+Combine.swift | 2 +- .../Controls/UIBarButtonItem+Combine.swift | 2 +- .../Controls/UIButton+Combine.swift | 2 +- .../Controls/UIControl+Combine.swift | 2 +- .../Controls/UIDatePicker+Combine.swift | 2 +- .../UIGestureRecognizer+Combine.swift | 2 +- .../Controls/UIPageControl+Combine.swift | 2 +- .../Controls/UIRefreshControl+Combine.swift | 2 +- .../Controls/UIScrollView+Combine.swift | 2 +- .../Controls/UISearchBar+Combine.swift | 2 +- .../Controls/UISegmentedControl+Combine.swift | 2 +- .../Controls/UISlider+Combine.swift | 2 +- .../Controls/UIStepper+Combine.swift | 2 +- .../Controls/UISwitch+Combine.swift | 2 +- .../Controls/UITextField+Combine.swift | 2 +- .../Controls/UITextView+Combine.swift | 2 +- 24 files changed, 46 insertions(+), 39 deletions(-) diff --git a/CombineCocoa.podspec b/CombineCocoa.podspec index 4635688..cdb4740 100644 --- a/CombineCocoa.podspec +++ b/CombineCocoa.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "CombineCocoa" - s.version = "0.3.0" + s.version = "0.3.1" s.summary = "CombineCocoa provided basic publisher bridges for UIControls in UIKit" s.description = <<-DESC Combine publisher bridges for Cocoa Controls (UIControl) in UIKit @@ -11,10 +11,11 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/freak4pc/CombineCocoa.git", :tag => s.version.to_s } s.requires_arc = true - - s.ios.deployment_target = '10.0' + + s.ios.deployment_target = '13.0' + s.osx.deployment_target = '10.15' s.source_files = 'Sources/**/*.{swift,h,m}' - s.frameworks = ['Combine', 'Foundation'] + s.frameworks = ['Combine', 'Foundation', 'UIKit'] s.swift_version = '5.0' - end \ No newline at end of file + end diff --git a/CombineCocoa.xcodeproj/project.pbxproj b/CombineCocoa.xcodeproj/project.pbxproj index 10633da..1f90718 100644 --- a/CombineCocoa.xcodeproj/project.pbxproj +++ b/CombineCocoa.xcodeproj/project.pbxproj @@ -49,7 +49,7 @@ /* Begin PBXFileReference section */ "CombineCocoa::CombineCocoa::Product" /* CombineCocoa.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CombineCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - "CombineCocoa::Runtime::Product" /* Runtime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Runtime.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + "CombineCocoa::Runtime::Product" /* Runtime.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Runtime.framework; sourceTree = BUILT_PRODUCTS_DIR; }; OBJ_10 /* AnimatedAssignSubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimatedAssignSubscriber.swift; sourceTree = ""; }; OBJ_11 /* CombineControlEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CombineControlEvent.swift; sourceTree = ""; }; OBJ_12 /* CombineControlProperty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CombineControlProperty.swift; sourceTree = ""; }; @@ -182,7 +182,7 @@ name = Products; sourceTree = BUILT_PRODUCTS_DIR; }; - OBJ_5 /* */ = { + OBJ_5 = { isa = PBXGroup; children = ( OBJ_6 /* Package.swift */, @@ -201,7 +201,6 @@ OBJ_55 /* Gemfile.lock */, OBJ_56 /* CombineCocoa.podspec */, ); - name = ""; sourceTree = ""; }; OBJ_7 /* Sources */ = { @@ -294,7 +293,7 @@ knownRegions = ( en, ); - mainGroup = OBJ_5 /* */; + mainGroup = OBJ_5; productRefGroup = OBJ_43 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -381,7 +380,7 @@ "SWIFT_PACKAGE=1", "DEBUG=1", ); - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -DXcode"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -406,7 +405,7 @@ "$(inherited)", "SWIFT_PACKAGE=1", ); - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; OTHER_SWIFT_FLAGS = "$(inherited) -DXcode"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; @@ -432,7 +431,7 @@ INFOPLIST_FILE = CombineCocoa.xcodeproj/CombineCocoa_Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -fmodule-map-file=$(SRCROOT)/Sources/Runtime/include/module.modulemap"; @@ -464,7 +463,7 @@ INFOPLIST_FILE = CombineCocoa.xcodeproj/CombineCocoa_Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -fmodule-map-file=$(SRCROOT)/Sources/Runtime/include/module.modulemap"; @@ -485,6 +484,7 @@ isa = XCBuildConfiguration; buildSettings = { LD = /usr/bin/true; + MACOSX_DEPLOYMENT_TARGET = 10.15; OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2 -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk -package-description-version 5.1.0"; SWIFT_VERSION = 5.0; }; @@ -494,6 +494,7 @@ isa = XCBuildConfiguration; buildSettings = { LD = /usr/bin/true; + MACOSX_DEPLOYMENT_TARGET = 10.15; OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2 -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk -package-description-version 5.1.0"; SWIFT_VERSION = 5.0; }; @@ -515,7 +516,7 @@ INFOPLIST_FILE = CombineCocoa.xcodeproj/Runtime_Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; @@ -546,7 +547,7 @@ INFOPLIST_FILE = CombineCocoa.xcodeproj/Runtime_Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index 35cab43..cb59c4a 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -195,7 +195,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1150; - LastUpgradeCheck = 1100; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "Shai Mishali"; TargetAttributes = { A24C43F822F592E700BC2E2B = { @@ -401,6 +401,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -462,6 +463,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme index 9760327..733fe24 100644 --- a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme +++ b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme @@ -1,6 +1,6 @@