fix: Build iOS Example

Target iOS version 13. Unwrap the result of sendToDict which is now optional. Signed-off-by: jefft0 <jeff@thefirst.org>
ipfs-shipyard · Nov 18, 2022 · a737c2c · a737c2c
1 parent abb3f42
commit a737c2c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/ios/Bridge/GomobileIPFS.xcodeproj/xcshareddata/xcschemes/GomobileIPFS.xcscheme b/ios/Bridge/GomobileIPFS.xcodeproj/xcshareddata/xcschemes/GomobileIPFS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ios/Example/Example.xcodeproj/project.pbxproj b/ios/Example/Example.xcodeproj/project.pbxproj
@@ -56,7 +56,6 @@
 		607FACE51AFB9204008FA782 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = "<group>"; };
-		8AF76E4426E23ED4007DF24A /* Core.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Core.xcframework; path = "/Users/d4ryl00/gomobile-ipfs/ios/Bridge/../../packages/build/ios/intermediates/core/Core.xcframework"; sourceTree = "<absolute>"; };
 		8AF76E4A26F0A438007DF24A /* AttachmentHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentHandler.swift; sourceTree = "<group>"; };
 		8AF76E4C26F4D074007DF24A /* ScannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScannerViewController.swift; sourceTree = "<group>"; };
 		8DAEFB1B23FF38F300818B81 /* GomobileIPFS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GomobileIPFS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -147,7 +146,6 @@
 		8DAEFB1A23FF38F300818B81 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				8AF76E4426E23ED4007DF24A /* Core.xcframework */,
 				8DAEFB1B23FF38F300818B81 /* GomobileIPFS.framework */,
 			);
 			name = Frameworks;
@@ -199,7 +197,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1410;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -329,6 +327,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -354,7 +353,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -385,6 +384,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -403,7 +403,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -477,6 +477,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -497,6 +498,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/ios/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/ios/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ios/Example/Example/PeerCountUpdater.swift b/ios/Example/Example/PeerCountUpdater.swift
@@ -31,7 +31,7 @@ public class PeerCountUpdater: NSObject {
                 var peerCount: Int = 0
                 do {
                     let res = try ViewController.ipfs!.newRequest("/swarm/peers").sendToDict()
-                    let peerList = res["Peers"] as? NSArray
+                    let peerList = res!["Peers"] as? NSArray
                     peerCount = peerList?.count ?? 0
                 } catch let error {
                     print(error)

diff --git a/ios/Example/Example/ViewController.swift b/ios/Example/Example/ViewController.swift
@@ -85,7 +85,7 @@ class ViewController: UIViewController {
                     .with(body: body)
                     .sendToDict()
 
-                let cid = (res["Hash"] as! String)
+                let cid = (res!["Hash"] as! String)
                 print("cid=\(cid)")
 
                 let qrcode = self.generateQRCode(from: cid)
@@ -134,7 +134,7 @@ class ViewController: UIViewController {
                 try ViewController.ipfs!.start()
 
                 let res = try ViewController.ipfs!.newRequest("id").sendToDict()
-                self.peerID = (res["ID"] as! String)
+                self.peerID = (res!["ID"] as! String)
             } catch let err as IPFSError {
                 error = err.localizedFullDescription
             } catch let err {
@@ -240,7 +240,7 @@ class ViewController: UIViewController {
                 let list = try ViewController.ipfs!.newRequest("cat")
                     .with(argument: "\(ViewController.XKCDIPNS)/latest/info.json")
                     .sendToDict()
-                self.XKCDLatest = (list["num"] as! Int)
+                self.XKCDLatest = (list!["num"] as! Int)
 
                 let randomIndex = Int(arc4random_uniform(UInt32(self.XKCDLatest))) + 1
                 let formattedIndex = String(format: "%04d", randomIndex)
@@ -249,14 +249,14 @@ class ViewController: UIViewController {
                     .with(argument: "\(ViewController.XKCDIPNS)/\(formattedIndex)/info.json")
                     .sendToDict()
 
-                let imgURL = fetchedInfo["img"] as! String
+                let imgURL = fetchedInfo!["img"] as! String
                 let imgExt = imgURL.components(separatedBy: ".").last!.contains("png") ? "png" : "jpg"
 
                 let fetchedData = try ViewController.ipfs!.newRequest("cat")
                     .with(argument: "\(ViewController.XKCDIPNS)/\(formattedIndex)/image.\(imgExt)")
                     .sendToBytes()
 
-                title = "\(randomIndex). \(fetchedInfo["title"] as! String)"
+                title = "\(randomIndex). \(fetchedInfo!["title"] as! String)"
                 image = UIImage(data: fetchedData!)!
             } catch let err as IPFSError {
                 error = err.localizedFullDescription