Skip to content

Commit

Permalink
Fix macOS build
Browse files Browse the repository at this point in the history
  • Loading branch information
ashleymills committed Aug 29, 2018
1 parent 8bc71a4 commit 6ca36a9
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added optional `queueQoS` and `targetQueue` to `init(reachabilityRef: SCNetworkReachability, queueQoS: DispatchQoS = .default, targetQueue: DispatchQueue? = nil)`
- Added optional `queueQoS` and `targetQueue` to `init?(hostname: String, queueQoS: DispatchQoS = .default, targetQueue: DispatchQueue? = nil)`
- Added optional `queueQoS` and `targetQueue` to `init?(queueQoS: DispatchQoS = .default, targetQueue: DispatchQueue? = nil)`
- Move macOS deployment target to 10.10


## [4.1.0] - 2017-10-10
Expand Down
47 changes: 45 additions & 2 deletions Reachability.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
AA7344B51BE769D6008AFE69 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA7344B31BE769D6008AFE69 /* LaunchScreen.xib */; };
CAC230C51BF2180000F6464E /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA7344721BE7678B008AFE69 /* Reachability.framework */; };
CAC230C61BF2180000F6464E /* Reachability.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = AA7344721BE7678B008AFE69 /* Reachability.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
CAE85CC92136B21500320E68 /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA7344721BE7678B008AFE69 /* Reachability.framework */; };
CAE85CCA2136B21500320E68 /* Reachability.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = AA7344721BE7678B008AFE69 /* Reachability.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
CAE85CCD2136B21B00320E68 /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA7344721BE7678B008AFE69 /* Reachability.framework */; };
CAE85CCE2136B21B00320E68 /* Reachability.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = AA7344721BE7678B008AFE69 /* Reachability.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -43,6 +47,20 @@
remoteGlobalIDString = AA7344711BE7678B008AFE69;
remoteInfo = Reachability;
};
CAE85CCB2136B21500320E68 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = AA7344691BE7678B008AFE69 /* Project object */;
proxyType = 1;
remoteGlobalIDString = AA7344711BE7678B008AFE69;
remoteInfo = Reachability;
};
CAE85CCF2136B21B00320E68 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = AA7344691BE7678B008AFE69 /* Project object */;
proxyType = 1;
remoteGlobalIDString = AA7344711BE7678B008AFE69;
remoteInfo = Reachability;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -52,6 +70,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
CAE85CCA2136B21500320E68 /* Reachability.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -62,6 +81,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
CAE85CCE2136B21B00320E68 /* Reachability.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -118,6 +138,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CAE85CC92136B21500320E68 /* Reachability.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -133,6 +154,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CAE85CCD2136B21B00320E68 /* Reachability.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -273,6 +295,7 @@
buildRules = (
);
dependencies = (
CAE85CCC2136B21500320E68 /* PBXTargetDependency */,
);
name = ReachabilityMacSample;
productName = ReachabilityMacSample;
Expand Down Expand Up @@ -309,6 +332,7 @@
buildRules = (
);
dependencies = (
CAE85CD02136B21B00320E68 /* PBXTargetDependency */,
);
name = ReachabilityAppleTVSample;
productName = ReachabilityAppleTVSample;
Expand Down Expand Up @@ -373,6 +397,7 @@
57A45A001C197BE800384AE4 = {
CreatedOnToolsVersion = 7.1.1;
LastSwiftMigration = 0900;
ProvisioningStyle = Manual;
};
AA7344711BE7678B008AFE69 = {
CreatedOnToolsVersion = 7.1;
Expand Down Expand Up @@ -511,6 +536,16 @@
target = AA7344711BE7678B008AFE69 /* Reachability */;
targetProxy = CAC230C71BF2180000F6464E /* PBXContainerItemProxy */;
};
CAE85CCC2136B21500320E68 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = AA7344711BE7678B008AFE69 /* Reachability */;
targetProxy = CAE85CCB2136B21500320E68 /* PBXContainerItemProxy */;
};
CAE85CD02136B21B00320E68 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = AA7344711BE7678B008AFE69 /* Reachability */;
targetProxy = CAE85CCF2136B21B00320E68 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
Expand Down Expand Up @@ -641,10 +676,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = ReachabilityAppleTVSample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = swift.reachability.ReachabilityAppleTVSample;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = appletvos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
Expand All @@ -659,10 +697,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = ReachabilityAppleTVSample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = swift.reachability.ReachabilityAppleTVSample;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = appletvos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
Expand Down Expand Up @@ -790,6 +831,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
Expand All @@ -800,7 +842,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = uk.co.joylordsystems.Reachability;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -821,6 +863,7 @@
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_CODE_COVERAGE = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
Expand All @@ -831,7 +874,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = uk.co.joylordsystems.Reachability;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
Expand Down
2 changes: 1 addition & 1 deletion ReachabilitySwift.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Pod::Spec.new do |s|

# Source Info
s.ios.deployment_target = "8.0"
s.osx.deployment_target = "10.9"
s.osx.deployment_target = "10.10"
s.tvos.deployment_target = "9.0"
s.source = {
:git => 'https://github.com/ashleymills/Reachability.swift.git',
Expand Down

0 comments on commit 6ca36a9

Please sign in to comment.