Skip to content

Commit c888d49

Browse files
malcommacmalcommac
committed
#49 Fixes for Swift 4.2
1 parent 76897e9 commit c888d49

File tree

4 files changed

+32
-28
lines changed

4 files changed

+32
-28
lines changed

‎ExampleWatchOS/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,15 @@
3737
"size" : "44x44",
3838
"idiom" : "watch",
3939
"scale" : "2x",
40-
"role" : "longLook",
41-
"subtype" : "42mm"
40+
"role" : "appLauncher",
41+
"subtype" : "40mm"
42+
},
43+
{
44+
"size" : "50x50",
45+
"idiom" : "watch",
46+
"scale" : "2x",
47+
"role" : "appLauncher",
48+
"subtype" : "44mm"
4249
},
4350
{
4451
"size" : "86x86",
@@ -53,6 +60,25 @@
5360
"scale" : "2x",
5461
"role" : "quickLook",
5562
"subtype" : "42mm"
63+
},
64+
{
65+
"size" : "108x108",
66+
"idiom" : "watch",
67+
"scale" : "2x",
68+
"role" : "quickLook",
69+
"subtype" : "44mm"
70+
},
71+
{
72+
"idiom" : "watch-marketing",
73+
"size" : "1024x1024",
74+
"scale" : "1x"
75+
},
76+
{
77+
"size" : "44x44",
78+
"idiom" : "watch",
79+
"scale" : "2x",
80+
"role" : "longLook",
81+
"subtype" : "42mm"
5682
}
5783
],
5884
"info" : {

‎ExampleiOS/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17+
private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}

‎SwiftRichString.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@
13931393
ONLY_ACTIVE_ARCH = YES;
13941394
SDKROOT = iphoneos;
13951395
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1396-
SWIFT_VERSION = 4.0;
1396+
SWIFT_VERSION = 4.2;
13971397
TARGETED_DEVICE_FAMILY = "1,2";
13981398
VERSIONING_SYSTEM = "apple-generic";
13991399
VERSION_INFO_PREFIX = "";
@@ -1444,7 +1444,7 @@
14441444
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
14451445
MTL_ENABLE_DEBUG_INFO = NO;
14461446
SDKROOT = iphoneos;
1447-
SWIFT_VERSION = 4.0;
1447+
SWIFT_VERSION = 4.2;
14481448
TARGETED_DEVICE_FAMILY = "1,2";
14491449
VALIDATE_PRODUCT = YES;
14501450
VERSIONING_SYSTEM = "apple-generic";
@@ -1471,7 +1471,6 @@
14711471
PRODUCT_NAME = SwiftRichString;
14721472
SKIP_INSTALL = YES;
14731473
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1474-
SWIFT_VERSION = 4.2;
14751474
};
14761475
name = Debug;
14771476
};
@@ -1493,7 +1492,6 @@
14931492
PRODUCT_NAME = SwiftRichString;
14941493
SKIP_INSTALL = YES;
14951494
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1496-
SWIFT_VERSION = 4.2;
14971495
};
14981496
name = Release;
14991497
};
@@ -1507,7 +1505,6 @@
15071505
PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-iOS-Tests";
15081506
PRODUCT_NAME = "$(TARGET_NAME)";
15091507
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1510-
SWIFT_VERSION = 4.2;
15111508
};
15121509
name = Debug;
15131510
};
@@ -1521,7 +1518,6 @@
15211518
PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-iOS-Tests";
15221519
PRODUCT_NAME = "$(TARGET_NAME)";
15231520
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1524-
SWIFT_VERSION = 4.2;
15251521
};
15261522
name = Release;
15271523
};
@@ -1543,7 +1539,6 @@
15431539
SDKROOT = watchos;
15441540
SKIP_INSTALL = YES;
15451541
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1546-
SWIFT_VERSION = 4.0;
15471542
TARGETED_DEVICE_FAMILY = 4;
15481543
WATCHOS_DEPLOYMENT_TARGET = 2.0;
15491544
};
@@ -1567,7 +1562,6 @@
15671562
SDKROOT = watchos;
15681563
SKIP_INSTALL = YES;
15691564
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1570-
SWIFT_VERSION = 4.0;
15711565
TARGETED_DEVICE_FAMILY = 4;
15721566
WATCHOS_DEPLOYMENT_TARGET = 2.0;
15731567
};
@@ -1591,7 +1585,6 @@
15911585
SDKROOT = appletvos;
15921586
SKIP_INSTALL = YES;
15931587
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1594-
SWIFT_VERSION = 4.0;
15951588
TARGETED_DEVICE_FAMILY = 3;
15961589
TVOS_DEPLOYMENT_TARGET = 9.0;
15971590
};
@@ -1615,7 +1608,6 @@
16151608
SDKROOT = appletvos;
16161609
SKIP_INSTALL = YES;
16171610
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1618-
SWIFT_VERSION = 4.0;
16191611
TARGETED_DEVICE_FAMILY = 3;
16201612
TVOS_DEPLOYMENT_TARGET = 9.0;
16211613
};
@@ -1642,7 +1634,6 @@
16421634
SDKROOT = macosx;
16431635
SKIP_INSTALL = YES;
16441636
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1645-
SWIFT_VERSION = 4.0;
16461637
};
16471638
name = Debug;
16481639
};
@@ -1667,7 +1658,6 @@
16671658
SDKROOT = macosx;
16681659
SKIP_INSTALL = YES;
16691660
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1670-
SWIFT_VERSION = 4.0;
16711661
};
16721662
name = Release;
16731663
};
@@ -1691,7 +1681,6 @@
16911681
PRODUCT_NAME = "$(TARGET_NAME)";
16921682
SDKROOT = appletvos;
16931683
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1694-
SWIFT_VERSION = 4.0;
16951684
TARGETED_DEVICE_FAMILY = 3;
16961685
TVOS_DEPLOYMENT_TARGET = 10.0;
16971686
};
@@ -1717,7 +1706,6 @@
17171706
PRODUCT_NAME = "$(TARGET_NAME)";
17181707
SDKROOT = appletvos;
17191708
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1720-
SWIFT_VERSION = 4.0;
17211709
TARGETED_DEVICE_FAMILY = 3;
17221710
TVOS_DEPLOYMENT_TARGET = 10.0;
17231711
};
@@ -1743,7 +1731,6 @@
17431731
SDKROOT = watchos;
17441732
SKIP_INSTALL = YES;
17451733
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1746-
SWIFT_VERSION = 4.0;
17471734
TARGETED_DEVICE_FAMILY = 4;
17481735
WATCHOS_DEPLOYMENT_TARGET = 4.3;
17491736
};
@@ -1769,7 +1756,6 @@
17691756
SDKROOT = watchos;
17701757
SKIP_INSTALL = YES;
17711758
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1772-
SWIFT_VERSION = 4.0;
17731759
TARGETED_DEVICE_FAMILY = 4;
17741760
WATCHOS_DEPLOYMENT_TARGET = 4.3;
17751761
};
@@ -1853,7 +1839,6 @@
18531839
PRODUCT_BUNDLE_IDENTIFIER = com.swiftrichstring.ExampleiOS;
18541840
PRODUCT_NAME = "$(TARGET_NAME)";
18551841
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1856-
SWIFT_VERSION = 4.0;
18571842
TARGETED_DEVICE_FAMILY = "1,2";
18581843
URLSERVIZI = "";
18591844
};
@@ -1881,7 +1866,6 @@
18811866
PRODUCT_BUNDLE_IDENTIFIER = com.swiftrichstring.ExampleiOS;
18821867
PRODUCT_NAME = "$(TARGET_NAME)";
18831868
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1884-
SWIFT_VERSION = 4.0;
18851869
TARGETED_DEVICE_FAMILY = "1,2";
18861870
URLSERVIZI = "";
18871871
};
@@ -1912,7 +1896,6 @@
19121896
PRODUCT_NAME = "$(TARGET_NAME)";
19131897
SDKROOT = macosx;
19141898
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1915-
SWIFT_VERSION = 4.0;
19161899
};
19171900
name = Debug;
19181901
};
@@ -1941,7 +1924,6 @@
19411924
PRODUCT_NAME = "$(TARGET_NAME)";
19421925
SDKROOT = macosx;
19431926
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1944-
SWIFT_VERSION = 4.0;
19451927
};
19461928
name = Release;
19471929
};
@@ -1957,7 +1939,6 @@
19571939
PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-macOS-Tests";
19581940
PRODUCT_NAME = "$(TARGET_NAME)";
19591941
SDKROOT = macosx;
1960-
SWIFT_VERSION = 4.0;
19611942
};
19621943
name = Debug;
19631944
};
@@ -1974,7 +1955,6 @@
19741955
PRODUCT_NAME = "$(TARGET_NAME)";
19751956
SDKROOT = macosx;
19761957
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1977-
SWIFT_VERSION = 4.0;
19781958
};
19791959
name = Release;
19801960
};
@@ -1987,7 +1967,6 @@
19871967
PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-tvOS-Tests";
19881968
PRODUCT_NAME = "$(TARGET_NAME)";
19891969
SDKROOT = appletvos;
1990-
SWIFT_VERSION = 4.0;
19911970
TVOS_DEPLOYMENT_TARGET = 9.1;
19921971
};
19931972
name = Debug;
@@ -2002,7 +1981,6 @@
20021981
PRODUCT_NAME = "$(TARGET_NAME)";
20031982
SDKROOT = appletvos;
20041983
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
2005-
SWIFT_VERSION = 4.0;
20061984
TVOS_DEPLOYMENT_TARGET = 9.1;
20071985
};
20081986
name = Release;

‎SwiftRichString.xcodeproj/xcuserdata/daniele.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
endingColumnNumber = "9223372036854775807"
1616
startingLineNumber = "300"
1717
endingLineNumber = "300"
18-
landmarkName = "ligatures"
18+
landmarkName = "baseWritingDirection"
1919
landmarkType = "24">
2020
</BreakpointContent>
2121
</BreakpointProxy>

0 commit comments

Comments
 (0)