Skip to content

Commit 8cb5a6d

Browse files
stevetreasestevetrease
committed
Swift 4.2 conversion
1 parent 5234d2b commit 8cb5a6d

File tree

10 files changed

+18
-24
lines changed

10 files changed

+18
-24
lines changed

‎build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
703
1+
704

‎iOS Steps Today/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>1.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>703</string>
22+
<string>704</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionMainStoryboard</key>

‎iOS Steps Watch Extension/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>1.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>703</string>
22+
<string>704</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionAttributes</key>

‎iOS Steps Watch/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>1.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>703</string>
22+
<string>704</string>
2323
<key>UIBackgroundModes</key>
2424
<array/>
2525
<key>UISupportedInterfaceOrientations</key>

‎iOS Steps.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@
428428
AA3AF9001E95501500903F2B = {
429429
CreatedOnToolsVersion = 8.3;
430430
DevelopmentTeam = 22648A4K3P;
431-
LastSwiftMigration = 0900;
431+
LastSwiftMigration = 1000;
432432
ProvisioningStyle = Automatic;
433433
SystemCapabilities = {
434434
com.apple.BackgroundModes.watchos.extension = {
@@ -442,7 +442,7 @@
442442
AA9D2E801E3E424C000E9C08 = {
443443
CreatedOnToolsVersion = 8.2.1;
444444
DevelopmentTeam = 22648A4K3P;
445-
LastSwiftMigration = 0900;
445+
LastSwiftMigration = 1000;
446446
ProvisioningStyle = Automatic;
447447
SystemCapabilities = {
448448
com.apple.BackgroundModes = {
@@ -456,7 +456,7 @@
456456
AAF185F01E8848720081A1DB = {
457457
CreatedOnToolsVersion = 8.3;
458458
DevelopmentTeam = 22648A4K3P;
459-
LastSwiftMigration = 0900;
459+
LastSwiftMigration = 1000;
460460
ProvisioningStyle = Automatic;
461461
SystemCapabilities = {
462462
com.apple.HealthKit = {
@@ -794,8 +794,7 @@
794794
PRODUCT_NAME = "${TARGET_NAME}";
795795
SDKROOT = watchos;
796796
SKIP_INSTALL = YES;
797-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
798-
SWIFT_VERSION = 4.0;
797+
SWIFT_VERSION = 4.2;
799798
TARGETED_DEVICE_FAMILY = 4;
800799
WATCHOS_DEPLOYMENT_TARGET = 3.2;
801800
};
@@ -815,8 +814,7 @@
815814
PRODUCT_NAME = "${TARGET_NAME}";
816815
SDKROOT = watchos;
817816
SKIP_INSTALL = YES;
818-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
819-
SWIFT_VERSION = 4.0;
817+
SWIFT_VERSION = 4.2;
820818
TARGETED_DEVICE_FAMILY = 4;
821819
WATCHOS_DEPLOYMENT_TARGET = 3.2;
822820
};
@@ -942,8 +940,7 @@
942940
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
943941
PRODUCT_BUNDLE_IDENTIFIER = "eu.trease.iosteps.iOS-Steps";
944942
PRODUCT_NAME = "$(TARGET_NAME)";
945-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
946-
SWIFT_VERSION = 4.0;
943+
SWIFT_VERSION = 4.2;
947944
TARGETED_DEVICE_FAMILY = 1;
948945
};
949946
name = Debug;
@@ -961,8 +958,7 @@
961958
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
962959
PRODUCT_BUNDLE_IDENTIFIER = "eu.trease.iosteps.iOS-Steps";
963960
PRODUCT_NAME = "$(TARGET_NAME)";
964-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
965-
SWIFT_VERSION = 4.0;
961+
SWIFT_VERSION = 4.2;
966962
TARGETED_DEVICE_FAMILY = 1;
967963
};
968964
name = Release;
@@ -980,8 +976,7 @@
980976
PRODUCT_BUNDLE_IDENTIFIER = "eu.trease.iosteps.iOS-Steps.iOS-Steps-Today";
981977
PRODUCT_NAME = "$(TARGET_NAME)";
982978
SKIP_INSTALL = YES;
983-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
984-
SWIFT_VERSION = 4.0;
979+
SWIFT_VERSION = 4.2;
985980
};
986981
name = Debug;
987982
};
@@ -998,8 +993,7 @@
998993
PRODUCT_BUNDLE_IDENTIFIER = "eu.trease.iosteps.iOS-Steps.iOS-Steps-Today";
999994
PRODUCT_NAME = "$(TARGET_NAME)";
1000995
SKIP_INSTALL = YES;
1001-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1002-
SWIFT_VERSION = 4.0;
996+
SWIFT_VERSION = 4.2;
1003997
};
1004998
name = Release;
1005999
};

‎iOS Steps/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import WatchConnectivity
1818
var window: UIWindow?
1919
var myViewController:DayViewController?
2020

21-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
21+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
2222
// Override point for customization after application launch.
2323
print (NSURL (fileURLWithPath: "\(#file)").lastPathComponent!, "\(#function)")
2424

‎iOS Steps/Base.lproj/LaunchScreen.storyboard‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
2222
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2323
<subviews>
24-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 703 (fdd9550)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
24+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 704 (5234d2b)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
2525
<rect key="frame" x="132.5" y="527" width="55.5" height="21"/>
2626
<fontDescription key="fontDescription" type="system" pointSize="17"/>
2727
<nil key="textColor"/>

‎iOS Steps/Base.lproj/LaunchScreen.storyboardbak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
2222
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2323
<subviews>
24-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 702 (fdd9550)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
24+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 703 (fdd9550)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
2525
<rect key="frame" x="132.5" y="527" width="55.5" height="21"/>
2626
<fontDescription key="fontDescription" type="system" pointSize="17"/>
2727
<nil key="textColor"/>

‎iOS Steps/DayViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class DayViewController: UIViewController {
258258
}
259259

260260

261-
func copyStepsPressed () {
261+
@objc func copyStepsPressed () {
262262
print (NSURL (fileURLWithPath: "\(#file)").lastPathComponent!, "\(#function)")
263263
UIPasteboard.general.string = String(Int(healthKitManager.stepsYesterday))
264264
}

‎iOS Steps/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</dict>
3131
</array>
3232
<key>CFBundleVersion</key>
33-
<string>703</string>
33+
<string>704</string>
3434
<key>ITSAppUsesNonExemptEncryption</key>
3535
<false/>
3636
<key>ITSEncryptionExportComplianceCode</key>

0 commit comments

Comments
 (0)