Combined iOS and watchOS pods
- Merged OpenWhiskWatch.podspec into OpenWhisk.podspec
- Renamed schemes (example: OpenWhiskWatch --> OpenWhisk watchOS)
- Reorganized files in Xcode
diff --git a/OpenWhisk.podspec b/OpenWhisk.podspec
index efe2f13..5bf6638 100644
--- a/OpenWhisk.podspec
+++ b/OpenWhisk.podspec
@@ -10,15 +10,18 @@
s.description = <<-DESC
OpenWhisk is a cloud-first distributed event-based programming service. OpenWhisk provides a programming model to upload event handlers to a cloud service, and register the handlers to respond to various events.
- It's cool.
DESC
- s.platform = :ios, '9.0'
- s.frameworks = 'Foundation', 'WatchConnectivity'
+ s.ios.deployment_target = '9.0'
+ s.watchos.deployment_target = '2.0'
s.source = { :git => 'https://github.com/openwhisk/openwhisk-client-swift.git', :tag => "#{s.version}" }
+
s.source_files = 'OpenWhisk/*.{swift,h}'
+ s.watchos.exclude_files = 'OpenWhisk/OpenWhiskButton.swift'
+
+ s.frameworks = 'Foundation', 'WatchConnectivity'
s.resource_bundles = {'OpenWhiskResources' => ['OpenWhisk/OpenWhiskConfig.plist']}
end
diff --git a/OpenWhisk.xcodeproj/project.pbxproj b/OpenWhisk.xcodeproj/project.pbxproj
index 650dd70..a580429 100644
--- a/OpenWhisk.xcodeproj/project.pbxproj
+++ b/OpenWhisk.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 92BBA3A71D64D0660026EC66 /* OpenWhisk.h in Headers */ = {isa = PBXBuildFile; fileRef = D6E3E6391C72592300843E16 /* OpenWhisk.h */; settings = {ATTRIBUTES = (Public, ); }; };
D64559FC1C8F49A600AA6840 /* OpenWhiskButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E3E6511C72760C00843E16 /* OpenWhiskButton.swift */; };
D6C9C3B71C8F53C9002BDB13 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C9C3B41C8F53C9002BDB13 /* Config.swift */; };
D6C9C3B81C8F53C9002BDB13 /* OpenWhiskConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = D6C9C3B51C8F53C9002BDB13 /* OpenWhiskConfig.plist */; };
@@ -19,7 +20,6 @@
D6E3E6411C72592300843E16 /* OpenWhisk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6E3E6361C72592300843E16 /* OpenWhisk.framework */; };
D6E3E6461C72592300843E16 /* OpenWhiskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E3E6451C72592300843E16 /* OpenWhiskTests.swift */; };
D6E3E6551C72760C00843E16 /* OpenWhiskButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E3E6511C72760C00843E16 /* OpenWhiskButton.swift */; };
- D6F56AE21C76471B00F047B6 /* OpenWhiskWatch.h in Headers */ = {isa = PBXBuildFile; fileRef = D6F56AE11C76471B00F047B6 /* OpenWhiskWatch.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -33,19 +33,18 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
+ 92BBA3EB1D64D69B0026EC66 /* Info_watchOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info_watchOS.plist; sourceTree = "<group>"; };
D6C9C3B41C8F53C9002BDB13 /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
D6C9C3B51C8F53C9002BDB13 /* OpenWhiskConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = OpenWhiskConfig.plist; sourceTree = "<group>"; };
D6C9C3B61C8F53C9002BDB13 /* OpenWhiskSDK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenWhiskSDK.swift; sourceTree = "<group>"; };
D6E3E6361C72592300843E16 /* OpenWhisk.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenWhisk.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D6E3E6391C72592300843E16 /* OpenWhisk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenWhisk.h; sourceTree = "<group>"; };
- D6E3E63B1C72592300843E16 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- D6E3E6401C72592300843E16 /* OpenWhiskTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenWhiskTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+ D6E3E63B1C72592300843E16 /* Info_iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info_iOS.plist; sourceTree = "<group>"; };
+ D6E3E6401C72592300843E16 /* OpenWhisk Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OpenWhisk Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
D6E3E6451C72592300843E16 /* OpenWhiskTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenWhiskTests.swift; sourceTree = "<group>"; };
D6E3E6471C72592300843E16 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D6E3E6511C72760C00843E16 /* OpenWhiskButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenWhiskButton.swift; sourceTree = "<group>"; };
- D6F56ADF1C76471B00F047B6 /* OpenWhiskWatch.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenWhiskWatch.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- D6F56AE11C76471B00F047B6 /* OpenWhiskWatch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenWhiskWatch.h; sourceTree = "<group>"; };
- D6F56AE31C76471B00F047B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ D6F56ADF1C76471B00F047B6 /* OpenWhisk.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenWhisk.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -74,12 +73,22 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ 92BBA3EC1D64D6EF0026EC66 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ D6C9C3B51C8F53C9002BDB13 /* OpenWhiskConfig.plist */,
+ D6E3E6391C72592300843E16 /* OpenWhisk.h */,
+ D6E3E63B1C72592300843E16 /* Info_iOS.plist */,
+ 92BBA3EB1D64D69B0026EC66 /* Info_watchOS.plist */,
+ );
+ name = Resources;
+ sourceTree = "<group>";
+ };
D6E3E62C1C72592300843E16 = {
isa = PBXGroup;
children = (
D6E3E6381C72592300843E16 /* OpenWhisk */,
D6E3E6441C72592300843E16 /* OpenWhiskTests */,
- D6F56AE01C76471B00F047B6 /* OpenWhiskWatch */,
D6E3E6371C72592300843E16 /* Products */,
);
sourceTree = "<group>";
@@ -88,8 +97,8 @@
isa = PBXGroup;
children = (
D6E3E6361C72592300843E16 /* OpenWhisk.framework */,
- D6E3E6401C72592300843E16 /* OpenWhiskTests.xctest */,
- D6F56ADF1C76471B00F047B6 /* OpenWhiskWatch.framework */,
+ D6E3E6401C72592300843E16 /* OpenWhisk Tests.xctest */,
+ D6F56ADF1C76471B00F047B6 /* OpenWhisk.framework */,
);
name = Products;
sourceTree = "<group>";
@@ -97,12 +106,10 @@
D6E3E6381C72592300843E16 /* OpenWhisk */ = {
isa = PBXGroup;
children = (
- D6C9C3B41C8F53C9002BDB13 /* Config.swift */,
- D6C9C3B51C8F53C9002BDB13 /* OpenWhiskConfig.plist */,
D6C9C3B61C8F53C9002BDB13 /* OpenWhiskSDK.swift */,
D6E3E6511C72760C00843E16 /* OpenWhiskButton.swift */,
- D6E3E6391C72592300843E16 /* OpenWhisk.h */,
- D6E3E63B1C72592300843E16 /* Info.plist */,
+ D6C9C3B41C8F53C9002BDB13 /* Config.swift */,
+ 92BBA3EC1D64D6EF0026EC66 /* Resources */,
);
path = OpenWhisk;
sourceTree = "<group>";
@@ -116,15 +123,6 @@
path = OpenWhiskTests;
sourceTree = "<group>";
};
- D6F56AE01C76471B00F047B6 /* OpenWhiskWatch */ = {
- isa = PBXGroup;
- children = (
- D6F56AE11C76471B00F047B6 /* OpenWhiskWatch.h */,
- D6F56AE31C76471B00F047B6 /* Info.plist */,
- );
- path = OpenWhiskWatch;
- sourceTree = "<group>";
- };
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@@ -140,16 +138,16 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
- D6F56AE21C76471B00F047B6 /* OpenWhiskWatch.h in Headers */,
+ 92BBA3A71D64D0660026EC66 /* OpenWhisk.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- D6E3E6351C72592300843E16 /* OpenWhisk */ = {
+ D6E3E6351C72592300843E16 /* OpenWhisk iOS */ = {
isa = PBXNativeTarget;
- buildConfigurationList = D6E3E64A1C72592300843E16 /* Build configuration list for PBXNativeTarget "OpenWhisk" */;
+ buildConfigurationList = D6E3E64A1C72592300843E16 /* Build configuration list for PBXNativeTarget "OpenWhisk iOS" */;
buildPhases = (
D6E3E6311C72592300843E16 /* Sources */,
D6E3E6321C72592300843E16 /* Frameworks */,
@@ -160,14 +158,14 @@
);
dependencies = (
);
- name = OpenWhisk;
+ name = "OpenWhisk iOS";
productName = OpenWhisk;
productReference = D6E3E6361C72592300843E16 /* OpenWhisk.framework */;
productType = "com.apple.product-type.framework";
};
- D6E3E63F1C72592300843E16 /* OpenWhiskTests */ = {
+ D6E3E63F1C72592300843E16 /* OpenWhisk Tests */ = {
isa = PBXNativeTarget;
- buildConfigurationList = D6E3E64D1C72592300843E16 /* Build configuration list for PBXNativeTarget "OpenWhiskTests" */;
+ buildConfigurationList = D6E3E64D1C72592300843E16 /* Build configuration list for PBXNativeTarget "OpenWhisk Tests" */;
buildPhases = (
D6E3E63C1C72592300843E16 /* Sources */,
D6E3E63D1C72592300843E16 /* Frameworks */,
@@ -178,14 +176,14 @@
dependencies = (
D6E3E6431C72592300843E16 /* PBXTargetDependency */,
);
- name = OpenWhiskTests;
+ name = "OpenWhisk Tests";
productName = OpenWhiskTests;
- productReference = D6E3E6401C72592300843E16 /* OpenWhiskTests.xctest */;
+ productReference = D6E3E6401C72592300843E16 /* OpenWhisk Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
- D6F56ADE1C76471B00F047B6 /* OpenWhiskWatch */ = {
+ D6F56ADE1C76471B00F047B6 /* OpenWhisk watchOS */ = {
isa = PBXNativeTarget;
- buildConfigurationList = D6F56AE61C76471B00F047B6 /* Build configuration list for PBXNativeTarget "OpenWhiskWatch" */;
+ buildConfigurationList = D6F56AE61C76471B00F047B6 /* Build configuration list for PBXNativeTarget "OpenWhisk watchOS" */;
buildPhases = (
D6F56ADA1C76471B00F047B6 /* Sources */,
D6F56ADB1C76471B00F047B6 /* Frameworks */,
@@ -196,9 +194,9 @@
);
dependencies = (
);
- name = OpenWhiskWatch;
+ name = "OpenWhisk watchOS";
productName = OpenWhiskWatch;
- productReference = D6F56ADF1C76471B00F047B6 /* OpenWhiskWatch.framework */;
+ productReference = D6F56ADF1C76471B00F047B6 /* OpenWhisk.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */
@@ -234,9 +232,9 @@
projectDirPath = "";
projectRoot = "";
targets = (
- D6E3E6351C72592300843E16 /* OpenWhisk */,
- D6E3E63F1C72592300843E16 /* OpenWhiskTests */,
- D6F56ADE1C76471B00F047B6 /* OpenWhiskWatch */,
+ D6E3E6351C72592300843E16 /* OpenWhisk iOS */,
+ D6F56ADE1C76471B00F047B6 /* OpenWhisk watchOS */,
+ D6E3E63F1C72592300843E16 /* OpenWhisk Tests */,
);
};
/* End PBXProject section */
@@ -302,7 +300,7 @@
/* Begin PBXTargetDependency section */
D6E3E6431C72592300843E16 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = D6E3E6351C72592300843E16 /* OpenWhisk */;
+ target = D6E3E6351C72592300843E16 /* OpenWhisk iOS */;
targetProxy = D6E3E6421C72592300843E16 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@@ -405,12 +403,12 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
- INFOPLIST_FILE = OpenWhisk/Info.plist;
+ INFOPLIST_FILE = OpenWhisk/Info_iOS.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = org.openwhisk.OpenWhisk;
- PRODUCT_NAME = "$(TARGET_NAME)";
+ PRODUCT_NAME = OpenWhisk;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
@@ -424,12 +422,12 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
- INFOPLIST_FILE = OpenWhisk/Info.plist;
+ INFOPLIST_FILE = OpenWhisk/Info_iOS.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = org.openwhisk.OpenWhisk;
- PRODUCT_NAME = "$(TARGET_NAME)";
+ PRODUCT_NAME = OpenWhisk;
SKIP_INSTALL = YES;
};
name = Release;
@@ -440,7 +438,7 @@
INFOPLIST_FILE = OpenWhiskTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ibm.mobile.openwhisk.OpenWhiskTests;
- PRODUCT_NAME = "$(TARGET_NAME)";
+ PRODUCT_NAME = "OpenWhisk Tests";
};
name = Debug;
};
@@ -450,7 +448,7 @@
INFOPLIST_FILE = OpenWhiskTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ibm.mobile.openwhisk.OpenWhiskTests;
- PRODUCT_NAME = "$(TARGET_NAME)";
+ PRODUCT_NAME = "OpenWhisk Tests";
};
name = Release;
};
@@ -462,11 +460,11 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
- INFOPLIST_FILE = OpenWhiskWatch/Info.plist;
+ INFOPLIST_FILE = OpenWhisk/Info_watchOS.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- PRODUCT_BUNDLE_IDENTIFIER = com.ibm.mobile.openwhisk.OpenWhiskWatch;
- PRODUCT_NAME = "$(TARGET_NAME)";
+ PRODUCT_BUNDLE_IDENTIFIER = com.ibm.mobile.openwhisk.OpenWhisk;
+ PRODUCT_NAME = OpenWhisk;
SDKROOT = watchos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 4;
@@ -482,11 +480,11 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
- INFOPLIST_FILE = OpenWhiskWatch/Info.plist;
+ INFOPLIST_FILE = OpenWhisk/Info_watchOS.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- PRODUCT_BUNDLE_IDENTIFIER = com.ibm.mobile.openwhisk.OpenWhiskWatch;
- PRODUCT_NAME = "$(TARGET_NAME)";
+ PRODUCT_BUNDLE_IDENTIFIER = com.ibm.mobile.openwhisk.OpenWhisk;
+ PRODUCT_NAME = OpenWhisk;
SDKROOT = watchos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 4;
@@ -506,7 +504,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- D6E3E64A1C72592300843E16 /* Build configuration list for PBXNativeTarget "OpenWhisk" */ = {
+ D6E3E64A1C72592300843E16 /* Build configuration list for PBXNativeTarget "OpenWhisk iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D6E3E64B1C72592300843E16 /* Debug */,
@@ -515,7 +513,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- D6E3E64D1C72592300843E16 /* Build configuration list for PBXNativeTarget "OpenWhiskTests" */ = {
+ D6E3E64D1C72592300843E16 /* Build configuration list for PBXNativeTarget "OpenWhisk Tests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D6E3E64E1C72592300843E16 /* Debug */,
@@ -524,7 +522,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- D6F56AE61C76471B00F047B6 /* Build configuration list for PBXNativeTarget "OpenWhiskWatch" */ = {
+ D6F56AE61C76471B00F047B6 /* Build configuration list for PBXNativeTarget "OpenWhisk watchOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D6F56AE41C76471B00F047B6 /* Debug */,
diff --git a/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk Tests.xcscheme b/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk Tests.xcscheme
new file mode 100644
index 0000000..ffc4a29
--- /dev/null
+++ b/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk Tests.xcscheme
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "0730"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ <TestableReference
+ skipped = "NO">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "D6E3E63F1C72592300843E16"
+ BuildableName = "OpenWhisk Tests.xctest"
+ BlueprintName = "OpenWhisk Tests"
+ ReferencedContainer = "container:OpenWhisk.xcodeproj">
+ </BuildableReference>
+ </TestableReference>
+ </Testables>
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
diff --git a/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhiskWatch.xcscheme b/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk iOS.xcscheme
similarity index 82%
copy from OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhiskWatch.xcscheme
copy to OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk iOS.xcscheme
index 6ad428f..1d02dcf 100644
--- a/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhiskWatch.xcscheme
+++ b/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk iOS.xcscheme
@@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "D6F56ADE1C76471B00F047B6"
- BuildableName = "OpenWhiskWatch.framework"
- BlueprintName = "OpenWhiskWatch"
+ BlueprintIdentifier = "D6E3E6351C72592300843E16"
+ BuildableName = "OpenWhisk.framework"
+ BlueprintName = "OpenWhisk iOS"
ReferencedContainer = "container:OpenWhisk.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@@ -45,9 +45,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "D6F56ADE1C76471B00F047B6"
- BuildableName = "OpenWhiskWatch.framework"
- BlueprintName = "OpenWhiskWatch"
+ BlueprintIdentifier = "D6E3E6351C72592300843E16"
+ BuildableName = "OpenWhisk.framework"
+ BlueprintName = "OpenWhisk iOS"
ReferencedContainer = "container:OpenWhisk.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -63,9 +63,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "D6F56ADE1C76471B00F047B6"
- BuildableName = "OpenWhiskWatch.framework"
- BlueprintName = "OpenWhiskWatch"
+ BlueprintIdentifier = "D6E3E6351C72592300843E16"
+ BuildableName = "OpenWhisk.framework"
+ BlueprintName = "OpenWhisk iOS"
ReferencedContainer = "container:OpenWhisk.xcodeproj">
</BuildableReference>
</MacroExpansion>
diff --git a/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhiskWatch.xcscheme b/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk watchOS.xcscheme
similarity index 89%
rename from OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhiskWatch.xcscheme
rename to OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk watchOS.xcscheme
index 6ad428f..6c87875 100644
--- a/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhiskWatch.xcscheme
+++ b/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk watchOS.xcscheme
@@ -15,8 +15,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D6F56ADE1C76471B00F047B6"
- BuildableName = "OpenWhiskWatch.framework"
- BlueprintName = "OpenWhiskWatch"
+ BuildableName = "OpenWhisk.framework"
+ BlueprintName = "OpenWhisk watchOS"
ReferencedContainer = "container:OpenWhisk.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@@ -46,8 +46,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D6F56ADE1C76471B00F047B6"
- BuildableName = "OpenWhiskWatch.framework"
- BlueprintName = "OpenWhiskWatch"
+ BuildableName = "OpenWhisk.framework"
+ BlueprintName = "OpenWhisk watchOS"
ReferencedContainer = "container:OpenWhisk.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -64,8 +64,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D6F56ADE1C76471B00F047B6"
- BuildableName = "OpenWhiskWatch.framework"
- BlueprintName = "OpenWhiskWatch"
+ BuildableName = "OpenWhisk.framework"
+ BlueprintName = "OpenWhisk watchOS"
ReferencedContainer = "container:OpenWhisk.xcodeproj">
</BuildableReference>
</MacroExpansion>
diff --git a/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk.xcscheme b/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk.xcscheme
deleted file mode 100644
index 32fffff..0000000
--- a/OpenWhisk.xcodeproj/xcshareddata/xcschemes/OpenWhisk.xcscheme
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "0720"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "D6E3E6351C72592300843E16"
- BuildableName = "OpenWhisk.framework"
- BlueprintName = "OpenWhisk"
- ReferencedContainer = "container:OpenWhisk.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- buildConfiguration = "Debug"
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES">
- <Testables>
- <TestableReference
- skipped = "NO">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "D6E3E63F1C72592300843E16"
- BuildableName = "OpenWhiskTests.xctest"
- BlueprintName = "OpenWhiskTests"
- ReferencedContainer = "container:OpenWhisk.xcodeproj">
- </BuildableReference>
- </TestableReference>
- </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "D6E3E6351C72592300843E16"
- BuildableName = "OpenWhisk.framework"
- BlueprintName = "OpenWhisk"
- ReferencedContainer = "container:OpenWhisk.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
- </TestAction>
- <LaunchAction
- buildConfiguration = "Debug"
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- debugServiceExtension = "internal"
- allowLocationSimulation = "YES">
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "D6E3E6351C72592300843E16"
- BuildableName = "OpenWhisk.framework"
- BlueprintName = "OpenWhisk"
- ReferencedContainer = "container:OpenWhisk.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <EnvironmentVariables>
- <EnvironmentVariable
- key = "OPENWHISK_TESTAPISECRET"
- value = "$OPENWHISK_TESTAPISECRET"
- isEnabled = "YES">
- </EnvironmentVariable>
- <EnvironmentVariable
- key = "OPENWHISK_TESTAPIKEY"
- value = "$OPENWHISK_TESTAPIKEY"
- isEnabled = "YES">
- </EnvironmentVariable>
- </EnvironmentVariables>
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- buildConfiguration = "Release"
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- debugDocumentVersioning = "YES">
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "D6E3E6351C72592300843E16"
- BuildableName = "OpenWhisk.framework"
- BlueprintName = "OpenWhisk"
- ReferencedContainer = "container:OpenWhisk.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
diff --git a/OpenWhisk/Info.plist b/OpenWhisk/Info_iOS.plist
similarity index 100%
rename from OpenWhisk/Info.plist
rename to OpenWhisk/Info_iOS.plist
diff --git a/OpenWhisk/Info.plist b/OpenWhisk/Info_watchOS.plist
similarity index 100%
copy from OpenWhisk/Info.plist
copy to OpenWhisk/Info_watchOS.plist
diff --git a/OpenWhisk/OpenWhisk.h b/OpenWhisk/OpenWhisk.h
index ca8b511..6b134c6 100644
--- a/OpenWhisk/OpenWhisk.h
+++ b/OpenWhisk/OpenWhisk.h
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#import <UIKit/UIKit.h>
+@import Foundation;
//! Project version number for OpenWhisk.
FOUNDATION_EXPORT double OpenWhiskVersionNumber;
diff --git a/OpenWhiskWatch.podspec b/OpenWhiskWatch.podspec
deleted file mode 100644
index 2c9ca9f..0000000
--- a/OpenWhiskWatch.podspec
+++ /dev/null
@@ -1,25 +0,0 @@
-Pod::Spec.new do |s|
-
- s.name = 'OpenWhiskWatch'
- s.version = '0.1.6'
- s.summary = 'Mobile SDK to use OpenWhisk serverless environment from WatchOS2'
- s.homepage = 'http://www.ibm.com/mobilefirst/us/en/'
- s.license = { :type => 'Apache License, Version 2.0' }
- s.authors = 'IBM'
-
- s.description = <<-DESC
- OpenWhisk is a cloud-first distributed event-based programming service. OpenWhisk provides a programming model to upload event handlers to a cloud service, and register the handlers to respond to various events.
-
- DESC
-
- s.platform = :watchos, '2.0'
- s.frameworks = 'Foundation', 'WatchConnectivity'
-
- s.author = { 'Paul Castro' => 'castrop@us.ibm.com' }
- s.source = { :git => 'https://github.com/openwhisk/openwhisk-client-swift.git', :tag => "#{s.version}" }
-
- s.source_files = 'OpenWhisk/*.{swift,h}'
- s.exclude_files = 'OpenWhisk/OpenWhiskButton.swift'
- s.resource_bundles = {'OpenWhiskWatchResources' => ['OpenWhisk/OpenWhiskConfig.plist']}
-
-end
diff --git a/OpenWhiskWatch/Info.plist b/OpenWhiskWatch/Info.plist
deleted file mode 100644
index d3de8ee..0000000
--- a/OpenWhiskWatch/Info.plist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>en</string>
- <key>CFBundleExecutable</key>
- <string>$(EXECUTABLE_NAME)</string>
- <key>CFBundleIdentifier</key>
- <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>$(PRODUCT_NAME)</string>
- <key>CFBundlePackageType</key>
- <string>FMWK</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>$(CURRENT_PROJECT_VERSION)</string>
- <key>NSPrincipalClass</key>
- <string></string>
-</dict>
-</plist>
diff --git a/OpenWhiskWatch/OpenWhiskWatch.h b/OpenWhiskWatch/OpenWhiskWatch.h
deleted file mode 100644
index a70c70b..0000000
--- a/OpenWhiskWatch/OpenWhiskWatch.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2015-2016 IBM Corporation
- *
- * 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.
- */
-
-#import <WatchKit/WatchKit.h>
-
-//! Project version number for OpenWhiskWatch.
-FOUNDATION_EXPORT double OpenWhiskWatchVersionNumber;
-
-//! Project version string for OpenWhiskWatch.
-FOUNDATION_EXPORT const unsigned char OpenWhiskWatchVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <OpenWhiskWatch/PublicHeader.h>
-
-
