Merge branch 'hotfix/3.7.7' into master

RoverPlatform · Jan 5, 2021 · 585b6da · 585b6da
2 parents da3aca0 + ef65198
commit 585b6da
Show file tree

Hide file tree

Showing 23 changed files with 225 additions and 57 deletions.
diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1220"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DB637A392278F93C00F0E791"
+               BuildableName = "Example.app"
+               BlueprintName = "Example"
+               ReferencedContainer = "container:Example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DB637A392278F93C00F0E791"
+            BuildableName = "Example.app"
+            BlueprintName = "Example"
+            ReferencedContainer = "container:Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DB637A392278F93C00F0E791"
+            BuildableName = "Example.app"
+            BlueprintName = "Example"
+            ReferencedContainer = "container:Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1220"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DB637A7222790AD200F0E791"
+               BuildableName = "NotificationService.appex"
+               BlueprintName = "NotificationService"
+               ReferencedContainer = "container:Example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DB637A392278F93C00F0E791"
+               BuildableName = "Example.app"
+               BlueprintName = "Example"
+               ReferencedContainer = "container:Example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DB637A392278F93C00F0E791"
+            BuildableName = "Example.app"
+            BlueprintName = "Example"
+            ReferencedContainer = "container:Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DB637A392278F93C00F0E791"
+            BuildableName = "Example.app"
+            BlueprintName = "Example"
+            ReferencedContainer = "container:Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Example/Example/Info.plist b/Example/Example/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.6</string>
+	<string>3.7.7</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,30 +1,30 @@
 PODS:
   - Rover (3.7.1)
-  - RoverAppExtensions (3.7.6)
-  - RoverCampaigns/AdSupport (3.7.6):
+  - RoverAppExtensions (3.7.7)
+  - RoverCampaigns/AdSupport (3.7.7):
     - RoverCampaigns/Data
-  - RoverCampaigns/Core (3.7.6):
+  - RoverCampaigns/Core (3.7.7):
     - RoverCampaigns/Debug
     - RoverCampaigns/Experiences
     - RoverCampaigns/Location
     - RoverCampaigns/Notifications
-  - RoverCampaigns/Data (3.7.6):
+  - RoverCampaigns/Data (3.7.7):
     - RoverCampaigns/Foundation
-  - RoverCampaigns/Debug (3.7.6):
+  - RoverCampaigns/Debug (3.7.7):
     - RoverCampaigns/UI
-  - RoverCampaigns/Experiences (3.7.6):
-    - Rover (~> 3.7.1)
+  - RoverCampaigns/Experiences (3.7.7):
+    - Rover (~> 3.7)
     - RoverCampaigns/UI
-  - RoverCampaigns/Foundation (3.7.6)
-  - RoverCampaigns/Location (3.7.6):
+  - RoverCampaigns/Foundation (3.7.7)
+  - RoverCampaigns/Location (3.7.7):
     - RoverCampaigns/Data
-  - RoverCampaigns/Notifications (3.7.6):
+  - RoverCampaigns/Notifications (3.7.7):
     - RoverCampaigns/UI
-  - RoverCampaigns/Telephony (3.7.6):
+  - RoverCampaigns/Telephony (3.7.7):
     - RoverCampaigns/Data
-  - RoverCampaigns/Ticketmaster (3.7.6):
+  - RoverCampaigns/Ticketmaster (3.7.7):
     - RoverCampaigns/Data
-  - RoverCampaigns/UI (3.7.6):
+  - RoverCampaigns/UI (3.7.7):
     - RoverCampaigns/Data
 
 DEPENDENCIES:
@@ -46,9 +46,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Rover: fdc06ea6cc6afe26f0eca0e495ed0fada7adefe8
-  RoverAppExtensions: 6021cc5f0f70fb7c43a3bd5aa25f67240a173404
-  RoverCampaigns: a821d8cc35983ebb3fb26a94057ec8643dd67daa
+  RoverAppExtensions: 02cf7bf1f313c0b512244cb4690cabb560d649d8
+  RoverCampaigns: 02116e1ba585769c702a80a40d96d7d63023e0b8
 
 PODFILE CHECKSUM: 9d356855be9da26a7642e120d5ec51da4bb10995
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.0
diff --git a/README.md b/README.md
@@ -20,20 +20,20 @@ The simplest approach is to specify `Rover` as a dependency of your app's target
 
 ```ruby
 target 'MyAppTarget' do
-  pod 'RoverCampaigns', '~> 3.7.6'
+  pod 'RoverCampaigns', '~> 3.7.7'
 end
 ```
 
 Alternatively you can specify the exact set of subspecs you want to include.
 
 ```ruby
 target 'MyAppTarget' do
-    pod 'RoverCampaigns/Foundation',    '~> 3.7.6'
-    pod 'RoverCampaigns/Data',          '~> 3.7.6'
-    pod 'RoverCampaigns/UI',            '~> 3.7.6'
-    pod 'RoverCampaigns/Notifications', '~> 3.7.6'
-    pod 'RoverCampaigns/Location',      '~> 3.7.6'
-    pod 'RoverCampaigns/Debug',         '~> 3.7.6'
+    pod 'RoverCampaigns/Foundation',    '~> 3.7.7'
+    pod 'RoverCampaigns/Data',          '~> 3.7.7'
+    pod 'RoverCampaigns/UI',            '~> 3.7.7'
+    pod 'RoverCampaigns/Notifications', '~> 3.7.7'
+    pod 'RoverCampaigns/Location',      '~> 3.7.7'
+    pod 'RoverCampaigns/Debug',         '~> 3.7.7'
 end
 ```
 

diff --git a/RoverAppExtensions.podspec b/RoverAppExtensions.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = "RoverAppExtensions"
-  s.version           = "3.7.6"
+  s.version           = "3.7.7"
   s.summary           = "Rover Campaigns iOS App Extensions"
   s.homepage          = "https://www.rover.io"
   s.license           = "Apache License, Version 2.0"

diff --git a/RoverCampaigns.podspec b/RoverCampaigns.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = "RoverCampaigns"
-  s.version           = "3.7.6"
+  s.version           = "3.7.7"
   s.summary           = "iOS framework for the Rover Campaigns app"
   s.homepage          = "https://www.rover.io"
   s.license           = "Apache License, Version 2.0"
@@ -38,7 +38,7 @@ Pod::Spec.new do |s|
   s.subspec "Experiences" do |ss|
     ss.source_files = "Sources/Experiences/**/*.swift"
     ss.dependency "RoverCampaigns/UI"
-    ss.dependency "Rover", "~> 3.7.1"
+    ss.dependency "Rover", "~> 3.7"
     ss.frameworks = "WebKit"
   end
 

diff --git a/Sources/AdSupport/Info.plist b/Sources/AdSupport/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.6</string>
+	<string>3.7.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/Sources/AppExtensions/Info.plist b/Sources/AppExtensions/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.6</string>
+	<string>3.7.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Bluetooth/Info.plist b/Sources/Bluetooth/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.6</string>
+	<string>3.7.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Data/Info.plist b/Sources/Data/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.6</string>
+	<string>3.7.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Data/SyncCoordinator/PagingSyncParticipant.swift b/Sources/Data/SyncCoordinator/PagingSyncParticipant.swift
@@ -76,6 +76,11 @@ extension PagingSyncParticipant {
             os_signpost(.begin, log: .sync, name: "insertObjects", "count=%d", nodes.count)
         }
 
+        if (context.persistentStoreCoordinator?.persistentStores.count).map({ $0 == 0 }) ?? true {
+            os_log("Rover's Core Data persistent store not configured, unable to insert objects.", type: .error)
+            return false
+        }
+
         var saveError: Error?
         context.performAndWait { [context] in
             for node in nodes {

diff --git a/Sources/Debug/Info.plist b/Sources/Debug/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.6</string>
+	<string>3.7.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Experiences/Info.plist b/Sources/Experiences/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.6</string>
+	<string>3.7.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/Sources/Foundation/Attributes.swift b/Sources/Foundation/Attributes.swift
@@ -9,7 +9,7 @@
 import Foundation
 import os
 
-// We have a strong guarantee that this will complete. Very determnistic, done in static context at startup, so silence the force try warning.
+// We have a strong guarantee that this will complete. Very deterministic, done in static context at startup, so silence the force try warning.
 // swiftlint:disable:next force_try
 private let roverKeyRegex = try! NSRegularExpression(pattern: "^[a-zA-Z_][a-zA-Z_0-9]*$")
 

diff --git a/Sources/Foundation/Info.plist b/Sources/Foundation/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.6</string>
+	<string>3.7.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Location/Info.plist b/Sources/Location/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.6</string>
+	<string>3.7.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>