From 3ea28709148f0b9615d892eb44d3b394a7d2816e Mon Sep 17 00:00:00 2001 From: Tony Lu Date: Wed, 24 Jul 2019 16:59:09 -0700 Subject: [PATCH] Config'd the projects so that they actually run on tvOS 10.0 and watchOS 4.0 Removed unnecessary code stubs --- .../tvOS-sample.xcodeproj/project.pbxproj | 5 +- .../tvOS-sample/tvOS-sample/AppDelegate.m | 36 ----- .../ExtensionDelegate.m | 58 -------- .../InterfaceController.m | 10 -- .../watchOS-sample.xcodeproj/project.pbxproj | 106 +++++++-------- .../watchOS-sample WatchKit App.xcscheme | 127 ++++++++++++++++++ .../xcschemes/watchOS-sample.xcscheme | 91 +++++++++++++ .../watchOS-sample/AppDelegate.m | 36 ----- .../watchOS-sample/ViewController.m | 5 - 9 files changed, 274 insertions(+), 200 deletions(-) create mode 100644 src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/xcshareddata/xcschemes/watchOS-sample WatchKit App.xcscheme create mode 100644 src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/xcshareddata/xcschemes/watchOS-sample.xcscheme diff --git a/src/objective-c/examples/tvOS-sample/tvOS-sample.xcodeproj/project.pbxproj b/src/objective-c/examples/tvOS-sample/tvOS-sample.xcodeproj/project.pbxproj index 8840882b145..a19281242bd 100644 --- a/src/objective-c/examples/tvOS-sample/tvOS-sample.xcodeproj/project.pbxproj +++ b/src/objective-c/examples/tvOS-sample/tvOS-sample.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -48,7 +48,6 @@ D2D1C60CE9BD00C1371BC913 /* Pods-tvOS-sample.debug.xcconfig */, 93F3CF0DB110860F8E180685 /* Pods-tvOS-sample.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -352,6 +351,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.google.tvOS-grpc-sample"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 10.0; }; name = Debug; }; @@ -371,6 +371,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.google.tvOS-grpc-sample"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 10.0; }; name = Release; }; diff --git a/src/objective-c/examples/tvOS-sample/tvOS-sample/AppDelegate.m b/src/objective-c/examples/tvOS-sample/tvOS-sample/AppDelegate.m index 11b6c418aee..4a76f4c488c 100644 --- a/src/objective-c/examples/tvOS-sample/tvOS-sample/AppDelegate.m +++ b/src/objective-c/examples/tvOS-sample/tvOS-sample/AppDelegate.m @@ -24,40 +24,4 @@ @implementation AppDelegate -- (BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for - // certain types of temporary interruptions (such as an incoming phone call or SMS message) or - // when the user quits the application and it begins the transition to the background state. Use - // this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. - // Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store - // enough application state information to restore your application to its current state in case - // it is terminated later. If your application supports background execution, this method is - // called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the active state; here you can undo - // many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If - // the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also - // applicationDidEnterBackground:. -} - @end diff --git a/src/objective-c/examples/watchOS-sample/watchOS-sample-WatchKit-Extension/ExtensionDelegate.m b/src/objective-c/examples/watchOS-sample/watchOS-sample-WatchKit-Extension/ExtensionDelegate.m index 5be441937b6..b64d60256de 100644 --- a/src/objective-c/examples/watchOS-sample/watchOS-sample-WatchKit-Extension/ExtensionDelegate.m +++ b/src/objective-c/examples/watchOS-sample/watchOS-sample-WatchKit-Extension/ExtensionDelegate.m @@ -20,62 +20,4 @@ @implementation ExtensionDelegate -- (void)applicationDidFinishLaunching { - // Perform any final initialization of your application. -} - -- (void)applicationDidBecomeActive { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If - // the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillResignActive { - // Sent when the application is about to move from active to inactive state. This can occur for - // certain types of temporary interruptions (such as an incoming phone call or SMS message) or - // when the user quits the application and it begins the transition to the background state. Use - // this method to pause ongoing tasks, disable timers, etc. -} - -- (void)handleBackgroundTasks:(NSSet *)backgroundTasks { - // Sent when the system needs to launch the application in the background to process tasks. Tasks - // arrive in a set, so loop through and process each one. - for (WKRefreshBackgroundTask *task in backgroundTasks) { - // Check the Class of each task to decide how to process it - if ([task isKindOfClass:[WKApplicationRefreshBackgroundTask class]]) { - // Be sure to complete the background task once you’re done. - WKApplicationRefreshBackgroundTask *backgroundTask = - (WKApplicationRefreshBackgroundTask *)task; - [backgroundTask setTaskCompletedWithSnapshot:NO]; - } else if ([task isKindOfClass:[WKSnapshotRefreshBackgroundTask class]]) { - // Snapshot tasks have a unique completion call, make sure to set your expiration date - WKSnapshotRefreshBackgroundTask *snapshotTask = (WKSnapshotRefreshBackgroundTask *)task; - [snapshotTask setTaskCompletedWithDefaultStateRestored:YES - estimatedSnapshotExpiration:[NSDate distantFuture] - userInfo:nil]; - } else if ([task isKindOfClass:[WKWatchConnectivityRefreshBackgroundTask class]]) { - // Be sure to complete the background task once you’re done. - WKWatchConnectivityRefreshBackgroundTask *backgroundTask = - (WKWatchConnectivityRefreshBackgroundTask *)task; - [backgroundTask setTaskCompletedWithSnapshot:NO]; - } else if ([task isKindOfClass:[WKURLSessionRefreshBackgroundTask class]]) { - // Be sure to complete the background task once you’re done. - WKURLSessionRefreshBackgroundTask *backgroundTask = (WKURLSessionRefreshBackgroundTask *)task; - [backgroundTask setTaskCompletedWithSnapshot:NO]; - } else if ([task isKindOfClass:[WKRelevantShortcutRefreshBackgroundTask class]]) { - // Be sure to complete the relevant-shortcut task once you’re done. - WKRelevantShortcutRefreshBackgroundTask *relevantShortcutTask = - (WKRelevantShortcutRefreshBackgroundTask *)task; - [relevantShortcutTask setTaskCompletedWithSnapshot:NO]; - } else if ([task isKindOfClass:[WKIntentDidRunRefreshBackgroundTask class]]) { - // Be sure to complete the intent-did-run task once you’re done. - WKIntentDidRunRefreshBackgroundTask *intentDidRunTask = - (WKIntentDidRunRefreshBackgroundTask *)task; - [intentDidRunTask setTaskCompletedWithSnapshot:NO]; - } else { - // make sure to complete unhandled task types - [task setTaskCompletedWithSnapshot:NO]; - } - } -} - @end diff --git a/src/objective-c/examples/watchOS-sample/watchOS-sample-WatchKit-Extension/InterfaceController.m b/src/objective-c/examples/watchOS-sample/watchOS-sample-WatchKit-Extension/InterfaceController.m index 77efbc42447..d7f0c94adc9 100644 --- a/src/objective-c/examples/watchOS-sample/watchOS-sample-WatchKit-Extension/InterfaceController.m +++ b/src/objective-c/examples/watchOS-sample/watchOS-sample-WatchKit-Extension/InterfaceController.m @@ -41,16 +41,6 @@ callOptions:_options]; } -- (void)willActivate { - // This method is called when watch view controller is about to be visible to user - [super willActivate]; -} - -- (void)didDeactivate { - // This method is called when watch view controller is no longer visible - [super didDeactivate]; -} - - (IBAction)makeCall { RMTSimpleRequest *request = [RMTSimpleRequest message]; request.responseSize = 100; diff --git a/src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/project.pbxproj b/src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/project.pbxproj index 191bde5d9e0..9d40fc4b0cf 100644 --- a/src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/project.pbxproj +++ b/src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/project.pbxproj @@ -7,8 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 8C710D86B987697CC3B243A8 /* libPods-watchOS-sample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56BDF7E8B01683A4EFDEC9CF /* libPods-watchOS-sample.a */; }; - 8F4EFFA8E14960D3C5BD0046 /* libPods-watchOS-sample WatchKit Extension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 76AFD66D880975F945E377C9 /* libPods-watchOS-sample WatchKit Extension.a */; }; + 6CD34817C1124B7090EFB679 /* libPods-watchOS-sample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81BB6B1D8754281EF32EB3F2 /* libPods-watchOS-sample.a */; }; ABB17D5922D93BAB00C26D6E /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = ABB17D5822D93BAB00C26D6E /* AppDelegate.m */; }; ABB17D5C22D93BAB00C26D6E /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABB17D5B22D93BAB00C26D6E /* ViewController.m */; }; ABB17D5F22D93BAB00C26D6E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ABB17D5D22D93BAB00C26D6E /* Main.storyboard */; }; @@ -22,6 +21,7 @@ ABB17D8022D93BAC00C26D6E /* InterfaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABB17D7F22D93BAC00C26D6E /* InterfaceController.m */; }; ABB17D8322D93BAC00C26D6E /* ExtensionDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = ABB17D8222D93BAC00C26D6E /* ExtensionDelegate.m */; }; ABB17D8522D93BAD00C26D6E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ABB17D8422D93BAD00C26D6E /* Assets.xcassets */; }; + CCC7943770AD2447C8F33431 /* libPods-watchOS-sample WatchKit Extension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B9B6F1C6465A4AAC45CAF14 /* libPods-watchOS-sample WatchKit Extension.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -67,11 +67,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0D53169393FEB36944484D25 /* Pods-watchOS-sample WatchKit Extension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-watchOS-sample WatchKit Extension.release.xcconfig"; path = "Target Support Files/Pods-watchOS-sample WatchKit Extension/Pods-watchOS-sample WatchKit Extension.release.xcconfig"; sourceTree = ""; }; - 56BDF7E8B01683A4EFDEC9CF /* libPods-watchOS-sample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-watchOS-sample.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 76AFD66D880975F945E377C9 /* libPods-watchOS-sample WatchKit Extension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-watchOS-sample WatchKit Extension.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 7DB8462D385A70A534800DAF /* Pods-watchOS-sample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-watchOS-sample.release.xcconfig"; path = "Target Support Files/Pods-watchOS-sample/Pods-watchOS-sample.release.xcconfig"; sourceTree = ""; }; - 8C5540E3A034586596BEFE2B /* Pods-watchOS-sample WatchKit Extension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-watchOS-sample WatchKit Extension.debug.xcconfig"; path = "Target Support Files/Pods-watchOS-sample WatchKit Extension/Pods-watchOS-sample WatchKit Extension.debug.xcconfig"; sourceTree = ""; }; + 574DCD2DDCABCC45B2308601 /* Pods-watchOS-sample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-watchOS-sample.debug.xcconfig"; path = "Target Support Files/Pods-watchOS-sample/Pods-watchOS-sample.debug.xcconfig"; sourceTree = ""; }; + 5B9B6F1C6465A4AAC45CAF14 /* libPods-watchOS-sample WatchKit Extension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-watchOS-sample WatchKit Extension.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 81BB6B1D8754281EF32EB3F2 /* libPods-watchOS-sample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-watchOS-sample.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 957B59E3DE8281B41B6DB3FD /* Pods-watchOS-sample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-watchOS-sample.release.xcconfig"; path = "Target Support Files/Pods-watchOS-sample/Pods-watchOS-sample.release.xcconfig"; sourceTree = ""; }; ABB17D5422D93BAB00C26D6E /* watchOS-sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "watchOS-sample.app"; sourceTree = BUILT_PRODUCTS_DIR; }; ABB17D5722D93BAB00C26D6E /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; ABB17D5822D93BAB00C26D6E /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; @@ -93,7 +92,8 @@ ABB17D8222D93BAC00C26D6E /* ExtensionDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExtensionDelegate.m; sourceTree = ""; }; ABB17D8422D93BAD00C26D6E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; ABB17D8622D93BAD00C26D6E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CC865626944D2C3DD838F762 /* Pods-watchOS-sample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-watchOS-sample.debug.xcconfig"; path = "Target Support Files/Pods-watchOS-sample/Pods-watchOS-sample.debug.xcconfig"; sourceTree = ""; }; + EDC6FF21CD9F393E8FDF02F6 /* Pods-watchOS-sample WatchKit Extension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-watchOS-sample WatchKit Extension.release.xcconfig"; path = "Target Support Files/Pods-watchOS-sample WatchKit Extension/Pods-watchOS-sample WatchKit Extension.release.xcconfig"; sourceTree = ""; }; + FBBABD10A996E7CCA4B2F937 /* Pods-watchOS-sample WatchKit Extension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-watchOS-sample WatchKit Extension.debug.xcconfig"; path = "Target Support Files/Pods-watchOS-sample WatchKit Extension/Pods-watchOS-sample WatchKit Extension.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -101,7 +101,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8C710D86B987697CC3B243A8 /* libPods-watchOS-sample.a in Frameworks */, + 6CD34817C1124B7090EFB679 /* libPods-watchOS-sample.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -109,7 +109,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8F4EFFA8E14960D3C5BD0046 /* libPods-watchOS-sample WatchKit Extension.a in Frameworks */, + CCC7943770AD2447C8F33431 /* libPods-watchOS-sample WatchKit Extension.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -126,23 +126,14 @@ 2C4A0708747AAA7298F757DA /* Pods */ = { isa = PBXGroup; children = ( - CC865626944D2C3DD838F762 /* Pods-watchOS-sample.debug.xcconfig */, - 7DB8462D385A70A534800DAF /* Pods-watchOS-sample.release.xcconfig */, - 8C5540E3A034586596BEFE2B /* Pods-watchOS-sample WatchKit Extension.debug.xcconfig */, - 0D53169393FEB36944484D25 /* Pods-watchOS-sample WatchKit Extension.release.xcconfig */, + 574DCD2DDCABCC45B2308601 /* Pods-watchOS-sample.debug.xcconfig */, + 957B59E3DE8281B41B6DB3FD /* Pods-watchOS-sample.release.xcconfig */, + FBBABD10A996E7CCA4B2F937 /* Pods-watchOS-sample WatchKit Extension.debug.xcconfig */, + EDC6FF21CD9F393E8FDF02F6 /* Pods-watchOS-sample WatchKit Extension.release.xcconfig */, ); path = Pods; sourceTree = ""; }; - 589283F4A582EEF2434E0220 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 56BDF7E8B01683A4EFDEC9CF /* libPods-watchOS-sample.a */, - 76AFD66D880975F945E377C9 /* libPods-watchOS-sample WatchKit Extension.a */, - ); - name = Frameworks; - sourceTree = ""; - }; ABB17D4B22D93BAB00C26D6E = { isa = PBXGroup; children = ( @@ -151,7 +142,7 @@ ABB17D7D22D93BAC00C26D6E /* watchOS-sample-WatchKit-Extension */, ABB17D5522D93BAB00C26D6E /* Products */, 2C4A0708747AAA7298F757DA /* Pods */, - 589283F4A582EEF2434E0220 /* Frameworks */, + FDB2CA47351660A961DBE458 /* Frameworks */, ); sourceTree = ""; }; @@ -204,6 +195,15 @@ path = "watchOS-sample-WatchKit-Extension"; sourceTree = ""; }; + FDB2CA47351660A961DBE458 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 81BB6B1D8754281EF32EB3F2 /* libPods-watchOS-sample.a */, + 5B9B6F1C6465A4AAC45CAF14 /* libPods-watchOS-sample WatchKit Extension.a */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -211,12 +211,12 @@ isa = PBXNativeTarget; buildConfigurationList = ABB17D9122D93BAD00C26D6E /* Build configuration list for PBXNativeTarget "watchOS-sample" */; buildPhases = ( - 94316399D2F0BC04388E77B0 /* [CP] Check Pods Manifest.lock */, + C094DF31B83C380F13D80132 /* [CP] Check Pods Manifest.lock */, ABB17D5022D93BAB00C26D6E /* Sources */, ABB17D5122D93BAB00C26D6E /* Frameworks */, ABB17D5222D93BAB00C26D6E /* Resources */, ABB17D9022D93BAD00C26D6E /* Embed Watch Content */, - 1E38C9CB686CAEF71A5A25B7 /* [CP] Copy Pods Resources */, + E8B22C16C7C7397CEC79CCF6 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -250,11 +250,11 @@ isa = PBXNativeTarget; buildConfigurationList = ABB17D8922D93BAD00C26D6E /* Build configuration list for PBXNativeTarget "watchOS-sample WatchKit Extension" */; buildPhases = ( - 097AA61E20DEB1DB1E771FC9 /* [CP] Check Pods Manifest.lock */, + 370B91D5CA71A3A771721814 /* [CP] Check Pods Manifest.lock */, ABB17D7522D93BAC00C26D6E /* Sources */, ABB17D7622D93BAC00C26D6E /* Frameworks */, ABB17D7722D93BAC00C26D6E /* Resources */, - 8F82497BD93485F0621F0F30 /* [CP] Copy Pods Resources */, + DB65546E9DFC6EADD365E270 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -336,7 +336,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 097AA61E20DEB1DB1E771FC9 /* [CP] Check Pods Manifest.lock */ = { + 370B91D5CA71A3A771721814 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -358,24 +358,29 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 1E38C9CB686CAEF71A5A25B7 /* [CP] Copy Pods Resources */ = { + C094DF31B83C380F13D80132 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-watchOS-sample/Pods-watchOS-sample-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-watchOS-sample/Pods-watchOS-sample-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-watchOS-sample-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-watchOS-sample/Pods-watchOS-sample-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 8F82497BD93485F0621F0F30 /* [CP] Copy Pods Resources */ = { + DB65546E9DFC6EADD365E270 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -392,26 +397,21 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-watchOS-sample WatchKit Extension/Pods-watchOS-sample WatchKit Extension-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 94316399D2F0BC04388E77B0 /* [CP] Check Pods Manifest.lock */ = { + E8B22C16C7C7397CEC79CCF6 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-watchOS-sample/Pods-watchOS-sample-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-watchOS-sample-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-watchOS-sample/Pods-watchOS-sample-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-watchOS-sample/Pods-watchOS-sample-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -593,7 +593,7 @@ }; ABB17D8A22D93BAD00C26D6E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8C5540E3A034586596BEFE2B /* Pods-watchOS-sample WatchKit Extension.debug.xcconfig */; + baseConfigurationReference = FBBABD10A996E7CCA4B2F937 /* Pods-watchOS-sample WatchKit Extension.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; CODE_SIGN_STYLE = Automatic; @@ -609,13 +609,13 @@ SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 5.1; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; ABB17D8B22D93BAD00C26D6E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0D53169393FEB36944484D25 /* Pods-watchOS-sample WatchKit Extension.release.xcconfig */; + baseConfigurationReference = EDC6FF21CD9F393E8FDF02F6 /* Pods-watchOS-sample WatchKit Extension.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; CODE_SIGN_STYLE = Automatic; @@ -631,7 +631,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 5.1; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -648,7 +648,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 5.1; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -665,13 +665,13 @@ SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 5.1; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; ABB17D9222D93BAD00C26D6E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CC865626944D2C3DD838F762 /* Pods-watchOS-sample.debug.xcconfig */; + baseConfigurationReference = 574DCD2DDCABCC45B2308601 /* Pods-watchOS-sample.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -689,7 +689,7 @@ }; ABB17D9322D93BAD00C26D6E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7DB8462D385A70A534800DAF /* Pods-watchOS-sample.release.xcconfig */; + baseConfigurationReference = 957B59E3DE8281B41B6DB3FD /* Pods-watchOS-sample.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; diff --git a/src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/xcshareddata/xcschemes/watchOS-sample WatchKit App.xcscheme b/src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/xcshareddata/xcschemes/watchOS-sample WatchKit App.xcscheme new file mode 100644 index 00000000000..7c7e35eea14 --- /dev/null +++ b/src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/xcshareddata/xcschemes/watchOS-sample WatchKit App.xcscheme @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/xcshareddata/xcschemes/watchOS-sample.xcscheme b/src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/xcshareddata/xcschemes/watchOS-sample.xcscheme new file mode 100644 index 00000000000..51e4fa09792 --- /dev/null +++ b/src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/xcshareddata/xcschemes/watchOS-sample.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/objective-c/examples/watchOS-sample/watchOS-sample/AppDelegate.m b/src/objective-c/examples/watchOS-sample/watchOS-sample/AppDelegate.m index d78f5f2175c..4a76f4c488c 100644 --- a/src/objective-c/examples/watchOS-sample/watchOS-sample/AppDelegate.m +++ b/src/objective-c/examples/watchOS-sample/watchOS-sample/AppDelegate.m @@ -24,40 +24,4 @@ @implementation AppDelegate -- (BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for - // certain types of temporary interruptions (such as an incoming phone call or SMS message) or - // when the user quits the application and it begins the transition to the background state. Use - // this method to pause ongoing tasks, disable timers, and invalidate graphics rendering - // callbacks. Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store - // enough application state information to restore your application to its current state in case - // it is terminated later. If your application supports background execution, this method is - // called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the active state; here you can undo - // many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If - // the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also - // applicationDidEnterBackground:. -} - @end diff --git a/src/objective-c/examples/watchOS-sample/watchOS-sample/ViewController.m b/src/objective-c/examples/watchOS-sample/watchOS-sample/ViewController.m index cd06242f80b..d15c78482bb 100644 --- a/src/objective-c/examples/watchOS-sample/watchOS-sample/ViewController.m +++ b/src/objective-c/examples/watchOS-sample/watchOS-sample/ViewController.m @@ -26,9 +26,4 @@ @implementation ViewController -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} - @end