Merge pull request #109 from NordicSemiconductor/refreshing

philips77 · web-flow · commit 3682c556d105 · 2021-04-30T13:02:07.000+02:00
Migration to Xcode 12.5, DFU 4.10.1, McuMgr 0.12.0
diff --git a/Podfile b/Podfile
@@ -1,10 +1,8 @@
 use_frameworks!
 target "nRF Toolbox" do
-    pod 'iOSDFULibrary', '~> 4.7'
-    # pod 'EVReflection', '~> 5.10'
+    pod 'iOSDFULibrary', '~> 4.10.1'
     pod 'SWRevealViewController', '~> 2.3'
-    pod 'CorePlot', '~> 2.2'
-    pod 'Charts', '~> 3.5'
-    pod 'AEXML', '~> 4.5'
-    pod 'McuManager', '~> 0.10'
+    pod 'Charts', '~> 3.6'
+    pod 'AEXML', '~> 4.6'
+    pod 'McuManager', '~> 0.12'
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,46 +1,42 @@
 PODS:
-  - AEXML (4.5.0)
-  - Charts (3.5.0):
-    - Charts/Core (= 3.5.0)
-  - Charts/Core (3.5.0)
-  - CorePlot (2.3)
-  - iOSDFULibrary (4.7.1):
+  - AEXML (4.6.0)
+  - Charts (3.6.0):
+    - Charts/Core (= 3.6.0)
+  - Charts/Core (3.6.0)
+  - iOSDFULibrary (4.10.1):
     - ZIPFoundation (= 0.9.11)
-  - McuManager (0.10.0):
+  - McuManager (0.12.0):
     - SwiftCBOR (= 0.4.3)
   - SwiftCBOR (0.4.3)
   - SWRevealViewController (2.3.0)
   - ZIPFoundation (0.9.11)
 
 DEPENDENCIES:
-  - AEXML (~> 4.5)
-  - Charts (~> 3.5)
-  - CorePlot (~> 2.2)
-  - iOSDFULibrary (~> 4.7)
-  - McuManager (~> 0.10)
+  - AEXML (~> 4.6)
+  - Charts (~> 3.6)
+  - iOSDFULibrary (~> 4.10.1)
+  - McuManager (~> 0.12)
   - SWRevealViewController (~> 2.3)
 
 SPEC REPOS:
   trunk:
     - AEXML
     - Charts
-    - CorePlot
     - iOSDFULibrary
     - McuManager
     - SwiftCBOR
     - SWRevealViewController
     - ZIPFoundation
 
 SPEC CHECKSUMS:
-  AEXML: 0e8f1d874fa033ca6b3909452a8bc362faad46e6
-  Charts: 40a08591df1f8ad5c223ddedfb1a06da92f24f7c
-  CorePlot: 6bfe6d30d215beec3cfd18ee43e434620119bc1e
-  iOSDFULibrary: f912fa3880137df8d81bf220dd70ebe036f2d601
-  McuManager: a734d3ef5cbf2fb6021388c79f8c7895b3281e38
+  AEXML: 2fbb73d8724797ed2cde888731e176fa4d44dd83
+  Charts: b1e3a1f5a1c9ba5394438ca3b91bd8c9076310af
+  iOSDFULibrary: 54dfe3f729cabc2250b0420147d0f864d76e7b54
+  McuManager: 04fbec94566eaaf5508175246b1d5b0c5f1b83dd
   SwiftCBOR: c7d740966575e0fd5d971466de2b6776db3f10c3
   SWRevealViewController: 6d3fd97f70112fd7cef9de14df4260eacce4c63a
   ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
 
-PODFILE CHECKSUM: 231a987b95c8a931837051e6800bdf1778d188ee
+PODFILE CHECKSUM: 886189cf4c5addbc3754f4b102eb11c866fab740
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.1
diff --git a/nRF Toolbox.xcodeproj/project.pbxproj b/nRF Toolbox.xcodeproj/project.pbxproj
@@ -1783,7 +1783,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1140;
-				LastUpgradeCheck = 1030;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Nordic Semiconductor";
 				TargetAttributes = {
 					014C4E8F2404038A0003E601 = {
@@ -1808,10 +1808,9 @@
 			};
 			buildConfigurationList = 5217F3DD1859EE0000F2D5BB /* Build configuration list for PBXProject "nRF Toolbox" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 			);
@@ -1930,7 +1929,6 @@
 				"${PODS_ROOT}/Target Support Files/Pods-nRF Toolbox/Pods-nRF Toolbox-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AEXML/AEXML.framework",
 				"${BUILT_PRODUCTS_DIR}/Charts/Charts.framework",
-				"${BUILT_PRODUCTS_DIR}/CorePlot/CorePlot.framework",
 				"${BUILT_PRODUCTS_DIR}/McuManager/McuManager.framework",
 				"${BUILT_PRODUCTS_DIR}/SWRevealViewController/SWRevealViewController.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftCBOR/SwiftCBOR.framework",
@@ -1941,7 +1939,6 @@
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AEXML.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Charts.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CorePlot.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/McuManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SWRevealViewController.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftCBOR.framework",
@@ -2304,6 +2301,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;
@@ -2414,6 +2412,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;
@@ -2474,6 +2473,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;
diff --git a/nRF Toolbox.xcodeproj/xcshareddata/xcschemes/nRF Toolbox Tests 1.xcscheme b/nRF Toolbox.xcodeproj/xcshareddata/xcschemes/nRF Toolbox Tests 1.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/nRF Toolbox.xcodeproj/xcshareddata/xcschemes/nRF Toolbox Tests.xcscheme b/nRF Toolbox.xcodeproj/xcshareddata/xcschemes/nRF Toolbox Tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0169B5A423FBEA9600907C1B"
+               BlueprintIdentifier = "014C4E8F2404038A0003E601"
                BuildableName = "nRF Toolbox Tests.xctest"
                BlueprintName = "nRF Toolbox Tests"
                ReferencedContainer = "container:nRF Toolbox.xcodeproj">
diff --git a/nRF Toolbox.xcodeproj/xcshareddata/xcschemes/nRF Toolbox.xcscheme b/nRF Toolbox.xcodeproj/xcshareddata/xcschemes/nRF Toolbox.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/nRF Toolbox/Connection/ConnectionViewController.swift b/nRF Toolbox/Connection/ConnectionViewController.swift
@@ -32,7 +32,7 @@
 
 import UIKit
 
-protocol ConnectionViewControllerDelegate: class {
+protocol ConnectionViewControllerDelegate: AnyObject {
     func requestConnection(to peripheral: Peripheral)
 }
 
diff --git a/nRF Toolbox/Connection/PeripheralScanner.swift b/nRF Toolbox/Connection/PeripheralScanner.swift
@@ -33,7 +33,7 @@
 import CoreBluetooth
 import os.log
 
-protocol PeripheralScannerDelegate: class {
+protocol PeripheralScannerDelegate: AnyObject {
     func statusChanges(_ status: PeripheralScanner.Status)
     func newPeripherals(_ peripherals: [Peripheral], willBeAddedTo existing: [Peripheral])
     func peripherals(_ peripherals: [Peripheral], addedTo old: [Peripheral])
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/DFURouter.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/DFURouter.swift
@@ -38,7 +38,7 @@ enum PresentationType {
     case push, present
 }
 
-protocol DFURouterType: class {
+protocol DFURouterType: AnyObject {
     @discardableResult
     func initialState() -> UIViewController
     
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/Utils/PeripheralHolder.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/Utils/PeripheralHolder.swift
@@ -32,7 +32,7 @@
 
 import UIKit
 
-protocol PeripheralConnectionCallback: class {
+protocol PeripheralConnectionCallback: AnyObject {
     func peripheralWasSelected(_ peripheral: Peripheral)
 }
 
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/DFUUpdateTabBarViewController.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/DFUUpdateTabBarViewController.swift
@@ -33,7 +33,7 @@
 import UIKit
 import iOSDFULibrary
 
-protocol DFUUpdateRouter: class {
+protocol DFUUpdateRouter: AnyObject {
     func showLogs()
     func done()
 }
diff --git a/nRF Toolbox/Profiles/HeartRateMonitor/Sections/HeartRateChartSection.swift b/nRF Toolbox/Profiles/HeartRateMonitor/Sections/HeartRateChartSection.swift
@@ -31,7 +31,6 @@
 
 
 import Foundation
-import CorePlot
 
 class HeartRateChartSection: ChartDataSection<HeartRateMeasurementCharacteristic> {
     override var sectionTitle: String { "Heart Rate" }
diff --git a/nRF Toolbox/Profiles/UART/LoggViewController/UARTFilterLogViewController.swift b/nRF Toolbox/Profiles/UART/LoggViewController/UARTFilterLogViewController.swift
@@ -32,7 +32,7 @@
 
 import UIKit
 
-protocol UARTFilterApplierDelegate: class {
+protocol UARTFilterApplierDelegate: AnyObject {
     func setLevels(_ levels: [LogType])
 }
 
diff --git a/nRF Toolbox/Profiles/UART/Macro/UARTMacrosTableViewController.swift b/nRF Toolbox/Profiles/UART/Macro/UARTMacrosTableViewController.swift
@@ -32,7 +32,7 @@
 
 import UIKit
 
-protocol UARTMacroViewControllerDelegate: class {
+protocol UARTMacroViewControllerDelegate: AnyObject {
     func macrosController(_ controller: UARTMacrosTableViewController, created macros: UARTMacro)
     func macrosController(_ controller: UARTMacrosTableViewController, changed macros: UARTMacro)
 }
diff --git a/nRF Toolbox/Profiles/UART/NewCommand/UARTNewCommandViewController.swift b/nRF Toolbox/Profiles/UART/NewCommand/UARTNewCommandViewController.swift
@@ -32,7 +32,7 @@
 
 import UIKit
 
-protocol UARTNewCommandDelegate: class {
+protocol UARTNewCommandDelegate: AnyObject {
     func createdNewCommand(_ viewController: UARTNewCommandViewController, command: UARTCommandModel, index: Int)
 }
 
diff --git a/nRF Toolbox/Profiles/UART/PeripheralView/PeripheralView.swift b/nRF Toolbox/Profiles/UART/PeripheralView/PeripheralView.swift
@@ -32,7 +32,7 @@
 
 import UIKit
 
-protocol PeripheralViewDelegate: class {
+protocol PeripheralViewDelegate: AnyObject {
     func requestConnect()
     func requestDisconnect()
 }
diff --git a/nRF Toolbox/Profiles/UART/UARTTabBarController.swift b/nRF Toolbox/Profiles/UART/UARTTabBarController.swift
@@ -33,7 +33,7 @@
 import UIKit
 import CoreBluetooth.CBPeripheral
 
-protocol UARTRouter: class {
+protocol UARTRouter: AnyObject {
     func displayMacros(with preset: UARTPreset)
 }
 
diff --git a/nRF Toolbox/Profiles/UART/Views/UARTPresetCollectionViewDelegate.swift b/nRF Toolbox/Profiles/UART/Views/UARTPresetCollectionViewDelegate.swift
@@ -32,7 +32,7 @@
 
 import UIKit
 
-protocol UARTPresetCollectionViewDelegate: class {
+protocol UARTPresetCollectionViewDelegate: AnyObject {
     func selectedCommand(_ command: UARTCommandModel, at index: Int)
     func longTapAtCommand(_ command: UARTCommandModel, at index: Int)
 }
diff --git a/nRF Toolbox/Profiles/ZephyrDFU/ViewController/ZephyrDFURouter.swift b/nRF Toolbox/Profiles/ZephyrDFU/ViewController/ZephyrDFURouter.swift
@@ -32,7 +32,7 @@
 
 import UIKit
 
-protocol ZephyrDFURouterType: class {
+protocol ZephyrDFURouterType: AnyObject {
     @discardableResult func setInitialState() -> UIViewController
     @discardableResult func goToPeripheralSelector(scanner: PeripheralScanner, presentationType: PresentationType, callback: @escaping (Peripheral) -> ()) -> ConnectionViewController
     @discardableResult func goToFileSelector() -> ZephyrFileSelector
diff --git a/nRF Toolbox/Utilities/XibInstantiable.swift b/nRF Toolbox/Utilities/XibInstantiable.swift
@@ -32,7 +32,7 @@
 
 import UIKit
 
-protocol XibInstantiable: class {
+protocol XibInstantiable: AnyObject {
     static func instance() -> Self
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`
`33`	`33`	`import UIKit`
`34`	`34`
`35`		`-protocol ConnectionViewControllerDelegate: class {`
	`35`	`+protocol ConnectionViewControllerDelegate: AnyObject {`
`36`	`36`	`func requestConnection(to peripheral: Peripheral)`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ enum PresentationType {`
`38`	`38`	`case push, present`
`39`	`39`	`}`
`40`	`40`
`41`		`-protocol DFURouterType: class {`
	`41`	`+protocol DFURouterType: AnyObject {`
`42`	`42`	`@discardableResult`
`43`	`43`	`func initialState() -> UIViewController`
`44`	`44`