Fix Xcode 10.2 build error, other warnings (#367)

* fix xcode 10.2 build error, other warnings * use swift 5 for decred_wallet * update targets and pods to swift 5
planetdecred · May 8, 2019 · 50942e3 · 50942e3
1 parent 8a6586f
commit 50942e3
Show file tree

Hide file tree

Showing 35 changed files with 253 additions and 312 deletions.
diff --git a/Podfile b/Podfile
@@ -4,7 +4,8 @@ project 'decred_wallet'
 target 'Decred Wallet' do
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
   use_frameworks!
-  pod 'SlideMenuControllerSwift'
+  # use swift5 branch pending when cocoapods gets updated with official support for swift 5
+  pod 'SlideMenuControllerSwift', :git => 'https://github.com/itswisdomagain/SlideMenuControllerSwift.git', :branch => 'swift5'
   pod 'JGProgressHUD'
   pod 'QRCodeReader.swift'
   pod 'CryptoSwift'

diff --git a/Podfile.lock b/Podfile.lock
@@ -5,7 +5,7 @@ PODS:
   - Fabric (1.9.0)
   - JGProgressHUD (2.0.3)
   - MBProgressHUD (1.1.0)
-  - QRCodeReader.swift (10.0.0)
+  - QRCodeReader.swift (10.1.0)
   - SlideMenuControllerSwift (4.0.0)
 
 DEPENDENCIES:
@@ -15,7 +15,7 @@ DEPENDENCIES:
   - JGProgressHUD
   - MBProgressHUD
   - QRCodeReader.swift
-  - SlideMenuControllerSwift
+  - SlideMenuControllerSwift (from `https://github.com/itswisdomagain/SlideMenuControllerSwift.git`, branch `swift5`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -25,17 +25,26 @@ SPEC REPOS:
     - JGProgressHUD
     - MBProgressHUD
     - QRCodeReader.swift
-    - SlideMenuControllerSwift
+
+EXTERNAL SOURCES:
+  SlideMenuControllerSwift:
+    :branch: swift5
+    :git: https://github.com/itswisdomagain/SlideMenuControllerSwift.git
+
+CHECKOUT OPTIONS:
+  SlideMenuControllerSwift:
+    :commit: d61e2a3bfaf8b6c0727667add98e40571728503f
+    :git: https://github.com/itswisdomagain/SlideMenuControllerSwift.git
 
 SPEC CHECKSUMS:
   Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933
   CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f
   Fabric: f988e33c97f08930a413e08123064d2e5f68d655
   JGProgressHUD: 12b20a8f4ffe05258f8635c1ab92816e451f904d
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
-  QRCodeReader.swift: 74d0378eb0c7807828552b49626bbc8307495aee
-  SlideMenuControllerSwift: 021d6318201c53d4d4d3710517d43d6c556c7dd0
+  QRCodeReader.swift: 373a389fe9a22d513c879a32a6f647c58f4ef572
+  SlideMenuControllerSwift: f9ec1ad1a95d211324d25b15dcdbc94881596716
 
-PODFILE CHECKSUM: 38ee43f1a5d00148f409e43591d4f2db8be6285f
+PODFILE CHECKSUM: 90a2a91513fab5bc604856282ff3a8dc619010bc
 
 COCOAPODS: 1.6.1
diff --git a/decred_wallet.xcodeproj/project.pbxproj b/decred_wallet.xcodeproj/project.pbxproj
diff --git a/decred_wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet Testnet.xcscheme b/decred_wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet Testnet.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/decred_wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet.xcscheme b/decred_wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/decred_wallet/AppDelegate.swift b/decred_wallet/AppDelegate.swift
@@ -124,14 +124,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         self.window?.makeKeyAndVisible()
     }
 
-    func application(_ application: UIApplication, shouldAllowExtensionPointIdentifier extensionPointIdentifier: UIApplicationExtensionPointIdentifier) -> Bool {
-        if extensionPointIdentifier == UIApplicationExtensionPointIdentifier.keyboard {
+    func application(_ application: UIApplication, shouldAllowExtensionPointIdentifier extensionPointIdentifier: UIApplication.ExtensionPointIdentifier) -> Bool {
+        if extensionPointIdentifier == UIApplication.ExtensionPointIdentifier.keyboard {
             return false
         }
         return true
     }
 
-    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 
         // setup crash reporting for testnet build only
         let isTestnet = Bool(infoForKey(GlobalConstants.Strings.IS_TESTNET)!)!

diff --git a/decred_wallet/Base.lproj/LaunchScreen.storyboard b/decred_wallet/Base.lproj/LaunchScreen.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -24,7 +24,7 @@
                                 <color key="textColor" red="0.98039215690000003" green="0.98039215690000003" blue="0.98039215690000003" alpha="1" colorSpace="calibratedRGB"/>
                                 <color key="highlightedColor" red="0.98039215690000003" green="0.98039215690000003" blue="0.98039215690000003" alpha="1" colorSpace="calibratedRGB"/>
                             </label>
-                            <imageView autoresizesSubviews="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" highlighted="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3bf-Ug-eS9">
+                            <imageView autoresizesSubviews="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="3bf-Ug-eS9">
                                 <rect key="frame" x="120" y="245" width="135" height="79"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="79" id="YdZ-VM-dWV"/>