Merge pull request #36 from NordicSemiconductor/develop

philips77 · web-flow · commit 360ba1f26a99 · 2021-04-30T15:07:42.000+02:00
Version 0.12.1
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,4 @@ Carthage/Build
 # `pod install` in .travis.yml
 #
 # Pods/
+.swiftpm
diff --git a/CoreBluetoothMock.podspec b/CoreBluetoothMock.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'CoreBluetoothMock'
-  s.version          = '0.12.0'
+  s.version          = '0.12.1'
   s.summary          = 'Mocking library for CoreBluetooth.'
 
   s.description      = <<-DESC
@@ -18,7 +18,7 @@ device and test the app on simulator.
   s.osx.deployment_target = '10.13'
   s.tvos.deployment_target = '9.0'
   s.watchos.deployment_target = '2.0'
-  s.swift_versions = ['4.2', '5.0', '5.1', '5.2', '5.3']
+  s.swift_versions = ['4.2', '5.0', '5.1', '5.2', '5.3', '5.4']
   s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }
 
   s.source_files = 'CoreBluetoothMock/Classes/**/*'
diff --git a/CoreBluetoothMock/Classes/CBMAttribute.swift b/CoreBluetoothMock/Classes/CBMAttribute.swift
@@ -0,0 +1,7 @@
+import CoreBluetooth
+
+open class CBMAttribute: NSObject {
+    var uuid: CBUUID {
+        fatalError()
+    }
+}
diff --git a/CoreBluetoothMock/Classes/CBMCentralManager.swift b/CoreBluetoothMock/Classes/CBMCentralManager.swift
@@ -30,7 +30,7 @@
 
 import CoreBluetooth
 
-public protocol CBMCentralManager: class {
+public protocol CBMCentralManager: AnyObject {
     #if !os(macOS)
     @available(iOS 13.0, tvOS 13.0, watchOS 6.0, *)
     typealias Feature = CBCentralManager.Feature
diff --git a/CoreBluetoothMock/Classes/CBMCentralManagerDelegate.swift b/CoreBluetoothMock/Classes/CBMCentralManagerDelegate.swift
@@ -30,7 +30,7 @@
 
 import CoreBluetooth
 
-public protocol CBMCentralManagerDelegate: class {
+public protocol CBMCentralManagerDelegate: AnyObject {
 
     /// Invoked whenever the central manager's state has been updated. Commands
     /// should only be issued when the state is `.poweredOn`.
diff --git a/CoreBluetoothMock/Classes/CBMManagerTypes.swift b/CoreBluetoothMock/Classes/CBMManagerTypes.swift
@@ -45,8 +45,9 @@ public enum CBMManagerState: Int {
     case poweredOn
 }
 
-public typealias CBMPeer = CBPeer
-public typealias CBMAttribute = CBAttribute
+// disabled for Xcode 12.5 beta
+//public typealias CBMPeer = CBPeer
+//public typealias CBMAttribute = CBAttribute
 public typealias CBMUUID = CBUUID
 public typealias CBMError = CBError
 public typealias CBMATTError = CBATTError
diff --git a/CoreBluetoothMock/Classes/CBMPeer.swift b/CoreBluetoothMock/Classes/CBMPeer.swift
@@ -0,0 +1,7 @@
+import Foundation
+
+open class CBMPeer: NSObject {
+    var identifier: UUID {
+        fatalError()
+    }
+}
diff --git a/CoreBluetoothMock/Classes/CBMPeripheral.swift b/CoreBluetoothMock/Classes/CBMPeripheral.swift
@@ -30,7 +30,7 @@
 
 import CoreBluetooth
 
-public protocol CBMPeripheral: class {
+public protocol CBMPeripheral: AnyObject {
     
     /// The unique, persistent identifier associated with the peer.
     var identifier: UUID { get }
diff --git a/CoreBluetoothMock/Classes/CBMPeripheralDelegate.swift b/CoreBluetoothMock/Classes/CBMPeripheralDelegate.swift
@@ -30,7 +30,7 @@
 
 import CoreBluetooth
 
-public protocol CBMPeripheralDelegate: class {
+public protocol CBMPeripheralDelegate: AnyObject {
     
     /// This method is invoked when the name of peripheral changes.
     /// - Parameter peripheral: The peripheral providing this update.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - CoreBluetoothMock (0.12.0)
+  - CoreBluetoothMock (0.12.1)
 
 DEPENDENCIES:
   - CoreBluetoothMock (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  CoreBluetoothMock: 064e0be151a9182679fc92e7549cacd30d1239eb
+  CoreBluetoothMock: b9c3c1c3d316c5a6eab03aab74971a93f942128a
 
 PODFILE CHECKSUM: 254d1c78543186e7159c621729d31f797f3b1083
 
-COCOAPODS: 1.10.0.rc.1
+COCOAPODS: 1.10.1
diff --git a/Example/Pods/Local Podspecs/CoreBluetoothMock.podspec.json b/Example/Pods/Local Podspecs/CoreBluetoothMock.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/CoreBluetoothMock.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/CoreBluetoothMock.xcscheme
diff --git a/Example/Pods/Target Support Files/CoreBluetoothMock/CoreBluetoothMock-Info.plist b/Example/Pods/Target Support Files/CoreBluetoothMock/CoreBluetoothMock-Info.plist
diff --git a/Example/nRFBlinky.xcodeproj/project.pbxproj b/Example/nRFBlinky.xcodeproj/project.pbxproj
@@ -404,7 +404,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1130;
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					526EA539240D2F8100BF70B2 = {
@@ -733,7 +733,7 @@
 				DEVELOPMENT_TEAM = P3R8YQEV4L;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "UI Tests/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -764,7 +764,7 @@
 				DEVELOPMENT_TEAM = P3R8YQEV4L;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = nRFBlinky_UITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
@@ -793,7 +793,7 @@
 				DEVELOPMENT_TEAM = P3R8YQEV4L;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = Tests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -821,7 +821,7 @@
 				DEVELOPMENT_TEAM = P3R8YQEV4L;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = nRFBlinky_Tests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nordicsemi.nRFBlinky-Tests";
diff --git a/Example/nRFBlinky.xcodeproj/xcshareddata/xcschemes/nRFBlinky.xcscheme b/Example/nRFBlinky.xcodeproj/xcshareddata/xcschemes/nRFBlinky.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Example/nRFBlinky.xcodeproj/xcshareddata/xcschemes/nRFBlinky_Tests.xcscheme b/Example/nRFBlinky.xcodeproj/xcshareddata/xcschemes/nRFBlinky_Tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Example/nRFBlinky.xcodeproj/xcshareddata/xcschemes/nRFBlinky_UITests.xcscheme b/Example/nRFBlinky.xcodeproj/xcshareddata/xcschemes/nRFBlinky_UITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Example/nRFBlinky/CoreBluetoothTypeAliases.swift b/Example/nRFBlinky/CoreBluetoothTypeAliases.swift
@@ -35,8 +35,10 @@ import CoreBluetoothMock
 // the imports to CoreBluetooth to fix conflicts and initiate the manager
 // using CBCentralManagerFactory, instad of just creating a CBCentralManager.
 
+// disabled for Xcode 12.5 beta
+//typealias CBPeer                          = CBMPeer
+//typealias CBAttribute                     = CBMAttribute
 typealias CBCentralManagerFactory         = CBMCentralManagerFactory
-typealias CBPeer                          = CBMPeer
 typealias CBUUID                          = CBMUUID
 typealias CBError                         = CBMError
 typealias CBATTError                      = CBMATTError
@@ -46,7 +48,6 @@ typealias CBCentralManager                = CBMCentralManager
 typealias CBCentralManagerDelegate        = CBMCentralManagerDelegate
 typealias CBPeripheral                    = CBMPeripheral
 typealias CBPeripheralDelegate            = CBMPeripheralDelegate
-typealias CBAttribute                     = CBMAttribute
 typealias CBService                       = CBMService
 typealias CBCharacteristic                = CBMCharacteristic
 typealias CBCharacteristicWriteType       = CBMCharacteristicWriteType
diff --git a/Example/nRFBlinky/UI/Base.lproj/Main.storyboard b/Example/nRFBlinky/UI/Base.lproj/Main.storyboard
diff --git a/Package.swift b/Package.swift

Original file line number	Diff line number	Diff line change
`@@ -38,3 +38,4 @@ Carthage/Build`
`38`	`38`	# `pod install` in .travis.yml
`39`	`39`	`#`
`40`	`40`	`# Pods/`
	`41`	`+.swiftpm`