chore: update dependencies of example app

chrs1885 · Aug 11, 2019 · 46af798 · 46af798
1 parent 9746480
commit 46af798
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 57 deletions.
diff --git a/Example/Podfile b/Example/Podfile
@@ -8,7 +8,7 @@ target 'Example-iOS' do
 
   sharedPods
   pod 'SheetyColors', '1.0.0'
-  pod 'AppCenter/Analytics', '1.14.0'
+  pod 'AppCenter/Analytics'
   pod 'Fabric'
   pod 'Answers'
   pod 'Firebase/Core'

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,61 +1,73 @@
 PODS:
-  - Answers (1.4.0):
-    - Fabric (~> 1.8.0)
-  - AppCenter/Analytics (1.14.0):
+  - Answers (1.4.1):
+    - Fabric (~> 1.10.2)
+  - AppCenter/Analytics (2.2.0):
     - AppCenter/Core
-  - AppCenter/Core (1.14.0)
+  - AppCenter/Core (2.2.0)
   - Capable (1.0.1):
     - Capable/Colors (= 1.0.1)
     - Capable/Features (= 1.0.1)
     - Capable/Fonts (= 1.0.1)
   - Capable/Colors (1.0.1)
   - Capable/Features (1.0.1)
   - Capable/Fonts (1.0.1)
-  - Fabric (1.8.2)
-  - Firebase/Core (6.1.0):
+  - Fabric (1.10.2)
+  - Firebase/Core (6.6.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (= 6.0.1)
-  - Firebase/CoreOnly (6.1.0):
-    - FirebaseCore (= 6.0.1)
-  - FirebaseAnalytics (6.0.1):
-    - FirebaseCore (~> 6.0)
-    - FirebaseInstanceID (~> 4.1)
-    - GoogleAppMeasurement (= 6.0.1)
+    - FirebaseAnalytics (= 6.1.0)
+  - Firebase/CoreOnly (6.6.0):
+    - FirebaseCore (= 6.2.0)
+  - FirebaseAnalytics (6.1.0):
+    - FirebaseCore (~> 6.2)
+    - FirebaseInstanceID (~> 4.2)
+    - GoogleAppMeasurement (= 6.1.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
     - GoogleUtilities/MethodSwizzler (~> 6.0)
     - GoogleUtilities/Network (~> 6.0)
     - "GoogleUtilities/NSData+zlib (~> 6.0)"
     - nanopb (~> 0.3)
-  - FirebaseCore (6.0.1):
-    - GoogleUtilities/Environment (~> 6.0)
-    - GoogleUtilities/Logger (~> 6.0)
-  - FirebaseInstanceID (4.1.0):
+  - FirebaseCore (6.2.0):
+    - FirebaseCoreDiagnostics (~> 1.0)
+    - FirebaseCoreDiagnosticsInterop (~> 1.0)
+    - GoogleUtilities/Environment (~> 6.2)
+    - GoogleUtilities/Logger (~> 6.2)
+  - FirebaseCoreDiagnostics (1.0.0):
+    - FirebaseCoreDiagnosticsInterop (~> 1.0)
+    - GoogleDataTransportCCTSupport (~> 1.0)
+    - GoogleUtilities/Environment (~> 6.2)
+    - GoogleUtilities/Logger (~> 6.2)
+  - FirebaseCoreDiagnosticsInterop (1.0.0)
+  - FirebaseInstanceID (4.2.3):
     - FirebaseCore (~> 6.0)
     - GoogleUtilities/Environment (~> 6.0)
     - GoogleUtilities/UserDefaults (~> 6.0)
-  - GoogleAppMeasurement (6.0.1):
+  - GoogleAppMeasurement (6.1.0):
     - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
     - GoogleUtilities/MethodSwizzler (~> 6.0)
     - GoogleUtilities/Network (~> 6.0)
     - "GoogleUtilities/NSData+zlib (~> 6.0)"
     - nanopb (~> 0.3)
-  - GoogleUtilities/AppDelegateSwizzler (6.2.0):
+  - GoogleDataTransport (1.0.0)
+  - GoogleDataTransportCCTSupport (1.0.0):
+    - GoogleDataTransport (~> 1.0)
+    - nanopb
+  - GoogleUtilities/AppDelegateSwizzler (6.2.4):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (6.2.0)
-  - GoogleUtilities/Logger (6.2.0):
+  - GoogleUtilities/Environment (6.2.4)
+  - GoogleUtilities/Logger (6.2.4):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (6.2.0):
+  - GoogleUtilities/MethodSwizzler (6.2.4):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (6.2.0):
+  - GoogleUtilities/Network (6.2.4):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (6.2.0)"
-  - GoogleUtilities/Reachability (6.2.0):
+  - "GoogleUtilities/NSData+zlib (6.2.4)"
+  - GoogleUtilities/Reachability (6.2.4):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (6.2.0):
+  - GoogleUtilities/UserDefaults (6.2.4):
     - GoogleUtilities/Logger
   - nanopb (0.3.901):
     - nanopb/decode (= 0.3.901)
@@ -67,7 +79,7 @@ PODS:
 
 DEPENDENCIES:
   - Answers
-  - AppCenter/Analytics (= 1.14.0)
+  - AppCenter/Analytics
   - Capable (from `../`)
   - Fabric
   - Firebase/Core
@@ -81,8 +93,12 @@ SPEC REPOS:
     - Firebase
     - FirebaseAnalytics
     - FirebaseCore
+    - FirebaseCoreDiagnostics
+    - FirebaseCoreDiagnosticsInterop
     - FirebaseInstanceID
     - GoogleAppMeasurement
+    - GoogleDataTransport
+    - GoogleDataTransportCCTSupport
     - GoogleUtilities
     - nanopb
     - SheetyColors
@@ -92,19 +108,23 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Answers: e7317ccd30e7bf55c3bacfe28adbe2304b082e49
-  AppCenter: 02c5efe08d3bbab5421ae41d5f7aa7238906b817
+  Answers: 7d5ff1f77fea900eb75032b37b4288482b824055
+  AppCenter: c809e69d93218b9861b4f8e54ded8dcf4d2131e7
   Capable: 49d8637d06ee50dac258757071ea27cbce0e1bf6
-  Fabric: d2b22f443ba195d8a7cc204da230977c72733b40
-  Firebase: 8d77bb33624ae9b62d745d82ec023de5f70f7e4f
-  FirebaseAnalytics: 629301c2b9925f3537d4093a17a72751ae5b7084
-  FirebaseCore: 66bdef3b310a026880e2a5bc8aa586ab62ce4543
-  FirebaseInstanceID: 27bed93a59b6685f5c3e0c028a878a764fd75c33
-  GoogleAppMeasurement: 51d8d9ea48f0ca44484d29cfbdef976fbd4fc336
-  GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba
+  Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
+  Firebase: a2b5951f30ff38fd3b3bdae9c7d340f940fd3c51
+  FirebaseAnalytics: 48414ae5cbf6976d8a2f7177e0466540e5ab33ce
+  FirebaseCore: 8c9e08bce0c72a3affd83927d8184cf244918bc8
+  FirebaseCoreDiagnostics: 5807d8a32ea4455d6476da6de828675f89a8d8f3
+  FirebaseCoreDiagnosticsInterop: 6829da2b8d1fc795ff1bd99df751d3788035d2cb
+  FirebaseInstanceID: 8b42755db950682e7de0d167bc6fb26a57b244af
+  GoogleAppMeasurement: 47285fa897e5a125df56b9ef8750a1d81e4598a8
+  GoogleDataTransport: fe6af28a312ae5a56d5cec00ff14f6e3ded3beef
+  GoogleDataTransportCCTSupport: e6fa721757b147d7f1481d7367b8dab3e9010889
+  GoogleUtilities: 64b5e3982b1b01bda26712affd5c523ef32563cf
   nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
   SheetyColors: dbf4b6b427d10f0316a2237b8a00cd8d576466dd
 
-PODFILE CHECKSUM: 5dbd3f14150c8d61f0a07bd9d65f8e2e2ba37daf
+PODFILE CHECKSUM: 281f4c067013ef97112498d527050bb7d1b70f3b
 
 COCOAPODS: 1.7.5
diff --git a/README.md b/README.md
@@ -355,7 +355,7 @@ The following table contains all features that are available AND settable on eac
 | .boldText                  | :white_check_mark: |                                | :white_check_mark: | &nbsp;:white_check_mark:**\*** |
 | .closedCaptioning          | :white_check_mark: |                                | :white_check_mark: |                                |
 | .darkerSystemColors        | :white_check_mark: |                                |                    |                                |
-| .differentiateWithoutColor | :white_check_mark: |                                | :white_check_mark: |                                |
+| .differentiateWithoutColor | :white_check_mark: | :white_check_mark:             |                    |                                |
 | .fullKeyboardAccess        |                    | &nbsp;:white_check_mark:**\*** |                    |                                |
 | .grayscale                 | :white_check_mark: |                                | :white_check_mark: |                                |
 | .guidedAccess              | :white_check_mark: |                                |                    |                                |

diff --git a/Source/Features/Notifications/Notifications.swift b/Source/Features/Notifications/Notifications.swift
@@ -224,6 +224,10 @@ extension Notifications {
         self.postNotification(withFeature: .largerText, statusString: self.featureStatusesProvider.largerTextCatagory.stringValue)
     }
 
+    @objc func onOffSwitchLabelsStatusChanged() {
+        self.postNotification(withFeature: .onOffSwitchLabels, statusString: self.featureStatusesProvider.isOnOffSwitchLabelsEnabled.statusString)
+    }
+
     @objc func shakeToUndoStatusChanged() {
         self.postNotification(withFeature: .shakeToUndo, statusString: self.featureStatusesProvider.isShakeToUndoEnabled.statusString)
     }
@@ -264,10 +268,6 @@ extension Notifications {
         self.postNotification(withFeature: .monoAudio, statusString: self.featureStatusesProvider.isMonoAudioEnabled.statusString)
     }
 
-    @objc func onOffSwitchLabelsStatusChanged() {
-        self.postNotification(withFeature: .onOffSwitchLabels, statusString: self.featureStatusesProvider.isOnOffSwitchLabelsEnabled.statusString)
-    }
-
     @objc func reduceTransparencyStatusChanged() {
         self.postNotification(withFeature: .reduceTransparency, statusString: self.featureStatusesProvider.isReduceTransparencyEnabled.statusString)
     }

diff --git a/Source/Features/Statuses/FeatureStatusesProvider.swift b/Source/Features/Statuses/FeatureStatusesProvider.swift
@@ -30,7 +30,7 @@ class FeatureStatusesProvider: FeatureStatusesProviderProtocol {
     }
 
     var isDifferentiateWithoutColorEnabled: Bool {
-        if #available(iOS 13.0, tvOS 13.0, *) {
+        if #available(iOS 13.0, *) {
             return UIAccessibility.shouldDifferentiateWithoutColor
         } else {
             Logger.warning("Unable to determine status for isDifferentiateWithoutColorEnabled since it is only available on iOS 13 or later.")

diff --git a/Source/Features/Statuses/FeatureStatusesProviderProtocol.swift b/Source/Features/Statuses/FeatureStatusesProviderProtocol.swift
@@ -17,6 +17,7 @@ protocol FeatureStatusesProviderProtocol {
     var isGuidedAccessEnabled: Bool { get }
     var hearingDevicePairedEar: UIAccessibility.HearingDeviceEar { get }
     var largerTextCatagory: UIContentSizeCategory { get }
+    var isOnOffSwitchLabelsEnabled: Bool { get }
     var isShakeToUndoEnabled: Bool { get }
     var isSpeakScreenEnabled: Bool { get }
     var isSpeakSelectionEnabled: Bool { get }
@@ -26,7 +27,6 @@ protocol FeatureStatusesProviderProtocol {
     var isClosedCaptioningEnabled: Bool { get }
     var isGrayscaleEnabled: Bool { get }
     var isMonoAudioEnabled: Bool { get }
-    var isOnOffSwitchLabelsEnabled: Bool { get }
     var isVideoAutoplayEnabled: Bool { get }
     #endif
 

diff --git a/Tests/Features/FeatureStatusesProviderTests.swift b/Tests/Features/FeatureStatusesProviderTests.swift
@@ -84,6 +84,16 @@ class FeatureStatusesProviderTests: QuickSpec {
                     }
                 }
 
+                context("for OnOffSwitchLabels") {
+                    beforeEach {
+                        sut!.onOffSwitchLabelsEnabled = true
+                    }
+
+                    it("returns correct state") {
+                        expect(sut!.isFeatureEnabled(feature: .onOffSwitchLabels)).to(beTrue())
+                    }
+                }
+
                 context("for ShakeToUndo") {
                     beforeEach {
                         sut!.shakeToUndoEnabled = true
@@ -182,16 +192,6 @@ class FeatureStatusesProviderTests: QuickSpec {
                     }
                 }
 
-                context("for OnOffSwitchLabels") {
-                    beforeEach {
-                        sut!.onOffSwitchLabelsEnabled = true
-                    }
-
-                    it("returns correct state") {
-                        expect(sut!.isFeatureEnabled(feature: .onOffSwitchLabels)).to(beTrue())
-                    }
-                }
-
                 context("for VideoAutoplay") {
                     beforeEach {
                         sut!.videoAutoplayEnabled = true

diff --git a/Tests/Features/Mocks/FeatureStatusesProviderMock.swift b/Tests/Features/Mocks/FeatureStatusesProviderMock.swift
@@ -21,6 +21,7 @@ class FeatureStatusesProviderMock: FeatureStatusesProvider {
     var darkerSystemColorsEnabled = false
     var guidedAccessEnabled = false
     var hearingDeviceEar: UIAccessibility.HearingDeviceEar = UIAccessibility.HearingDeviceEar(rawValue: 0)
+    var onOffSwitchLabelsEnabled = false
     var shakeToUndoEnabled = false
     var speakScreenEnabled = false
     var speakSelectionEnabled = false
@@ -37,7 +38,6 @@ class FeatureStatusesProviderMock: FeatureStatusesProvider {
     var closedCaptioningEnabled = false
     var grayscaleEnabled = false
     var monoAudioEnabled = false
-    var onOffSwitchLabelsEnabled = false
     var videoAutoplayEnabled = false
     #endif
 
@@ -160,6 +160,7 @@ class FeatureStatusesProviderMock: FeatureStatusesProvider {
         self.textCatagory = .accessibilityExtraExtraExtraLarge
         self.guidedAccessEnabled = true
         self.hearingDeviceEar = .both
+        self.onOffSwitchLabelsEnabled = true
         self.shakeToUndoEnabled = true
         self.speakScreenEnabled = true
         self.speakSelectionEnabled = true
@@ -179,12 +180,16 @@ class FeatureStatusesProviderMock: FeatureStatusesProvider {
         self.closedCaptioningEnabled = true
         self.grayscaleEnabled = true
         self.monoAudioEnabled = true
-        self.onOffSwitchLabelsEnabled = true
         self.videoAutoplayEnabled = true
 
         #endif
 
+        #if os(iOS) || os(OSX)
+
         self.differentiateWithoutColor = true
+
+        #endif
+
         self.invertColorsEnabled = true
         self.reduceMotionEnabled = true
         self.reduceTransparencyEnabled = true