Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate Swift 4.0 for Carthage #22

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+384 −47
Open

Migrate Swift 4.0 for Carthage #22

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01595dd
- Upgrade swift 4.0
david84tong Aug 16, 2019
ab6ba70
+ support watchos
khanhpoeta Aug 22, 2019
8b47e82
+ Add new target for watch os
khanhpoeta Aug 22, 2019
4687bd9
+ updating config
khanhpoeta Aug 22, 2019
9ce1c70
+ Correct framework search path for RxSwift
khanhpoeta Aug 22, 2019
5e96122
+ Edit config for watchos
khanhpoeta Aug 22, 2019
e3c434e
+ support query pedometer data
khanhpoeta Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
+ updating config
@khanhpoeta
khanhpoeta committed Aug 22, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 4687bd9214f5cf2d2b597299db1ffbabb6499c8e
189 changes: 12 additions & 177 deletions RxCoreMotion.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
06A38EBD230E832D004CF703 /* MotionActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FD4AF91ED4C03500B27328 /* MotionActivityManager.swift */; };
06A38EBE230E832D004CF703 /* RxCoreMotion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D678671E7F676C0013F645 /* RxCoreMotion.swift */; };
06A38EC0230E832D004CF703 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 667B13091E7BCE28001151C7 /* Foundation.framework */; };
06A38EC1230E832D004CF703 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 667B13071E7BCE22001151C7 /* CoreMotion.framework */; };
06A38EC2230E832D004CF703 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D678651E7F67540013F645 /* RxSwift.framework */; };
06A38EC4230E832D004CF703 /* RxCoreMotion.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6786B1E7F67940013F645 /* RxCoreMotion.h */; settings = {ATTRIBUTES = (Public, ); }; };
06A38EC8230E832D004CF703 /* RxSwift.framework.dSYM in [Carthage] Copy dSYMS */ = {isa = PBXBuildFile; fileRef = 07D6786D1E7F6C4B0013F645 /* RxSwift.framework.dSYM */; };
07D678661E7F67540013F645 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D678651E7F67540013F645 /* RxSwift.framework */; };
06A38ED5230E935E004CF703 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06A38ED4230E935E004CF703 /* RxSwift.framework */; };
07D678681E7F676C0013F645 /* RxCoreMotion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D678671E7F676C0013F645 /* RxCoreMotion.swift */; };
07D6786C1E7F67B10013F645 /* RxCoreMotion.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6786B1E7F67940013F645 /* RxCoreMotion.h */; settings = {ATTRIBUTES = (Public, ); }; };
07D6786E1E7F6D080013F645 /* RxSwift.framework.dSYM in [Carthage] Copy dSYMS */ = {isa = PBXBuildFile; fileRef = 07D6786D1E7F6C4B0013F645 /* RxSwift.framework.dSYM */; };
@@ -24,17 +17,6 @@
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
06A38EC7230E832D004CF703 /* [Carthage] Copy dSYMS */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 16;
files = (
06A38EC8230E832D004CF703 /* RxSwift.framework.dSYM in [Carthage] Copy dSYMS */,
);
name = "[Carthage] Copy dSYMS";
runOnlyForDeploymentPostprocessing = 0;
};
667B13031E7BCCA9001151C7 /* [Carthage] Copy dSYMS */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -49,9 +31,8 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
06A38ECC230E832D004CF703 /* RxCoreMotion-watchOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "RxCoreMotion-watchOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
06A38ECD230E832D004CF703 /* RxCoreMotion copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "RxCoreMotion copy-Info.plist"; path = "/Users/installpoeta/Projects/Fork/CoreMotionWatchos/RxCoreMotion copy-Info.plist"; sourceTree = "<absolute>"; };
07D678651E7F67540013F645 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
06A38ED4230E935E004CF703 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
07D678671E7F676C0013F645 /* RxCoreMotion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RxCoreMotion.swift; path = Pod/Classes/RxCoreMotion.swift; sourceTree = SOURCE_ROOT; };
07D6786A1E7F67940013F645 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
07D6786B1E7F67940013F645 /* RxCoreMotion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxCoreMotion.h; sourceTree = "<group>"; };
@@ -63,23 +44,13 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
06A38EBF230E832D004CF703 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
06A38EC0230E832D004CF703 /* Foundation.framework in Frameworks */,
06A38EC1230E832D004CF703 /* CoreMotion.framework in Frameworks */,
06A38EC2230E832D004CF703 /* RxSwift.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
667B12F11E7BCACB001151C7 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
667B130A1E7BCE28001151C7 /* Foundation.framework in Frameworks */,
667B13081E7BCE22001151C7 /* CoreMotion.framework in Frameworks */,
07D678661E7F67540013F645 /* RxSwift.framework in Frameworks */,
06A38ED5230E935E004CF703 /* RxSwift.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -101,7 +72,6 @@
isa = PBXGroup;
children = (
667B12F51E7BCACB001151C7 /* RxCoreMotion.framework */,
06A38ECC230E832D004CF703 /* RxCoreMotion-watchOS.framework */,
);
name = Products;
sourceTree = "<group>";
@@ -129,24 +99,16 @@
isa = PBXGroup;
children = (
07D6786D1E7F6C4B0013F645 /* RxSwift.framework.dSYM */,
07D678651E7F67540013F645 /* RxSwift.framework */,
667B13071E7BCE22001151C7 /* CoreMotion.framework */,
667B13091E7BCE28001151C7 /* Foundation.framework */,
06A38ED4230E935E004CF703 /* RxSwift.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
06A38EC3230E832D004CF703 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
06A38EC4230E832D004CF703 /* RxCoreMotion.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
667B12F21E7BCACB001151C7 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@@ -158,26 +120,6 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
06A38EBB230E832D004CF703 /* RxCoreMotion-watchOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 06A38EC9230E832D004CF703 /* Build configuration list for PBXNativeTarget "RxCoreMotion-watchOS" */;
buildPhases = (
06A38EBC230E832D004CF703 /* Sources */,
06A38EBF230E832D004CF703 /* Frameworks */,
06A38EC3230E832D004CF703 /* Headers */,
06A38EC5230E832D004CF703 /* Resources */,
06A38EC6230E832D004CF703 /* [Carthage] Copy Frameworks */,
06A38EC7230E832D004CF703 /* [Carthage] Copy dSYMS */,
);
buildRules = (
);
dependencies = (
);
name = "RxCoreMotion-watchOS";
productName = "RxCoreMotion iOS";
productReference = 06A38ECC230E832D004CF703 /* RxCoreMotion-watchOS.framework */;
productType = "com.apple.product-type.framework";
};
667B12F41E7BCACB001151C7 /* RxCoreMotion */ = {
isa = PBXNativeTarget;
buildConfigurationList = 667B12FC1E7BCACB001151C7 /* Build configuration list for PBXNativeTarget "RxCoreMotion" */;
@@ -230,19 +172,11 @@
projectRoot = "";
targets = (
667B12F41E7BCACB001151C7 /* RxCoreMotion */,
06A38EBB230E832D004CF703 /* RxCoreMotion-watchOS */,
);
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
06A38EC5230E832D004CF703 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
667B12F31E7BCACB001151C7 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -253,20 +187,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
06A38EC6230E832D004CF703 /* [Carthage] Copy Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[Carthage] Copy Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks";
};
667B13061E7BCCF5001151C7 /* [Carthage] Copy Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -284,15 +204,6 @@
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
06A38EBC230E832D004CF703 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
06A38EBD230E832D004CF703 /* MotionActivityManager.swift in Sources */,
06A38EBE230E832D004CF703 /* RxCoreMotion.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
667B12F01E7BCACB001151C7 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -305,77 +216,6 @@
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
06A38ECA230E832D004CF703 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = "RxCoreMotion copy-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = rx.swift.RxCoreMotion;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "watchos watchsimulator";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 4.0;
};
name = Debug;
};
06A38ECB230E832D004CF703 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CODE_SIGN_IDENTITY = "";
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = "RxCoreMotion copy-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = rx.swift.RxCoreMotion;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "watchos watchsimulator";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 4.0;
};
name = Release;
};
071AD5B81CF171850058C7ED /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -418,7 +258,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SDKROOT = "";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchsimulator watchos";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
@@ -460,7 +300,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SDKROOT = "";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchsimulator watchos";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
@@ -492,12 +332,14 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = rx.swift.RxCoreMotion;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchos watchsimulator";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "x86_64 i386";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
@@ -526,10 +368,12 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = rx.swift.RxCoreMotion;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchos watchsimulator";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "x86_64 i386";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
@@ -538,15 +382,6 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
06A38EC9230E832D004CF703 /* Build configuration list for PBXNativeTarget "RxCoreMotion-watchOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
06A38ECA230E832D004CF703 /* Debug */,
06A38ECB230E832D004CF703 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
071AD5A31CF171850058C7ED /* Build configuration list for PBXProject "RxCoreMotion" */ = {
isa = XCConfigurationList;
buildConfigurations = (
80 changes: 0 additions & 80 deletions RxCoreMotion.xcodeproj/xcshareddata/xcschemes/RxCoreMotion-watchOS.xcscheme
View file

This file was deleted.