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

Jump to bottom

[TIMOB-24567] iOS: Use Swift 3.1 for watchOS templates, update pairing table #8952

Merged
merged 6 commits into from
Apr 10, 2017
Merged

[TIMOB-24567] iOS: Use Swift 3.1 for watchOS templates, update pairing table #8952

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be22c6b
[TIMOB-24567] Use Swift 3.1, update pairing table
hansemannn Apr 8, 2017
50b2511
[TIMOB-24567] Fix formatting & typo
hansemannn Apr 8, 2017
359b11e
[TIMOB-24567] Update Obj-C template for watchOS 3
hansemannn Apr 8, 2017
684a91e
[TIMOB-24567] Rename template to watchos3-swift
hansemannn Apr 9, 2017
3cdfafe
Remove legacy objc-template
hansemannn Apr 10, 2017
25588d8
Restore old ioslib until updated to 1.3.3
hansemannn Apr 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion iphone/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3493,7 +3493,7 @@ iOSBuilder.prototype.createXcodeProject = function createXcodeProject(next) {

if (hasSwiftFiles) {
if (!extBuildSettings.SWIFT_VERSION) {
extBuildSettings.SWIFT_VERSION = '2.2';
extBuildSettings.SWIFT_VERSION = '3.1';
}

if (legacySwift) {
Expand Down
44 changes: 16 additions & 28 deletions node_modules/ioslib/lib/xcode.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions templates/applewatch/watchos2-swift/template/{{ExtName}}.xcodeproj/project.pbxproj.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@
DB57BE9F1C05A7E700A2FF3A /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0710;
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0830;
ORGANIZATIONNAME = "Appcelerator, Inc.";
TargetAttributes = {
DB57BEB81C05A7E700A2FF3A = {
Expand Down Expand Up @@ -333,9 +333,9 @@
PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 3.1;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
WATCHOS_DEPLOYMENT_TARGET = 3.2;
};
name = Debug;
};
Expand All @@ -348,9 +348,9 @@
PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 3.1;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
WATCHOS_DEPLOYMENT_TARGET = 3.2;
};
name = Release;
};
Expand All @@ -367,7 +367,7 @@
SDKROOT = watchos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
WATCHOS_DEPLOYMENT_TARGET = 3.2;
};
name = Debug;
};
Expand All @@ -384,7 +384,7 @@
SDKROOT = watchos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
WATCHOS_DEPLOYMENT_TARGET = 3.2;
};
name = Release;
};
Expand Down
2 changes: 0 additions & 2 deletions templates/applewatch/watchos2-swift/template/{{WatchkitAppName}}/Info.plist.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>UISupportedInterfaceOrientations</key>
Expand Down
26 changes: 25 additions & 1 deletion templates/applewatch/watchos2-swift/template/{{WatchkitExtName}}/ExtensionDelegate.swift.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,28 @@ class ExtensionDelegate: NSObject, WKExtensionDelegate {
// Use this method to pause ongoing tasks, disable timers, etc.
}

}
func handle(_ backgroundTasks: Set<WKRefreshBackgroundTask>) {
// 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 task in backgroundTasks {
// Use a switch statement to check the task type
switch task {
case let backgroundTask as WKApplicationRefreshBackgroundTask:
// Be sure to complete the background task once you’re done.
backgroundTask.setTaskCompleted()
case let snapshotTask as WKSnapshotRefreshBackgroundTask:
// Snapshot tasks have a unique completion call, make sure to set your expiration date
snapshotTask.setTaskCompleted(restoredDefaultState: true, estimatedSnapshotExpiration: Date.distantFuture, userInfo: nil)
case let connectivityTask as WKWatchConnectivityRefreshBackgroundTask:
// Be sure to complete the connectivity task once you’re done.
connectivityTask.setTaskCompleted()
case let urlSessionTask as WKURLSessionRefreshBackgroundTask:
// Be sure to complete the URL session task once you’re done.
urlSessionTask.setTaskCompleted()
default:
// make sure to complete unhandled task types
task.setTaskCompleted()
}
}
}

}
2 changes: 0 additions & 2 deletions templates/applewatch/watchos2-swift/template/{{WatchkitExtName}}/Info.plist.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSExtension</key>
Expand Down
1 change: 0 additions & 1 deletion ...ates/applewatch/watchos2-swift/template/{{WatchkitExtName}}/InterfaceController.swift.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ class InterfaceController: WKInterfaceController, WCSessionDelegate {
super.didDeactivate()
}

@available(watchOS 2.2, *)
public func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {
// This will be called when the activation of a session finishes.
}
Expand Down
20 changes: 4 additions & 16 deletions ...s/applewatch/watchos2-swift/template/{{WatchkitExtName}}/NotificationController.swift.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import WatchKit
import Foundation


class NotificationController: WKUserNotificationInterfaceController {

override init() {
Expand All @@ -30,24 +29,13 @@ class NotificationController: WKUserNotificationInterfaceController {
}

/*
override func didReceiveLocalNotification(localNotification: UILocalNotification, withCompletion completionHandler: ((WKUserNotificationInterfaceType) -> Void)) {
// This method is called when a local notification needs to be presented.
// Implement it if you use a dynamic notification interface.
// Populate your dynamic notification interface as quickly as possible.
//
// After populating your dynamic notification interface call the completion block.
completionHandler(.Custom)
}
*/

/*
override func didReceiveRemoteNotification(remoteNotification: [NSObject : AnyObject], withCompletion completionHandler: ((WKUserNotificationInterfaceType) -> Void)) {
// This method is called when a remote notification needs to be presented.
override func didReceive(_ notification: UNNotification, withCompletion completionHandler: @escaping (WKUserNotificationInterfaceType) -> Swift.Void) {
// This method is called when a notification needs to be presented.
// Implement it if you use a dynamic notification interface.
// Populate your dynamic notification interface as quickly as possible.
//
// After populating your dynamic notification interface call the completion block.
completionHandler(.Custom)
completionHandler(.custom)
}
*/
*/
}