Merge pull request #72 from atfinke/3.6.5

3.6.5

WKRCloudStats/WKRCloudStats/ViewController+Player.swift

@@ -16,7 +16,8 @@ extension ViewController {
     func queryPlayerStats() {
         textView.textStorage?.append(NSAttributedString(string: "Querying Player Stats\n"))
 
-        let query = CKQuery(recordType: "UserStats", predicate: NSPredicate(value: true))
+        let recordType = isUsingUserStatsV3 ? "UserStatsv3" : "UserStats"
+        let query = CKQuery(recordType: "UserStatsv3", predicate: NSPredicate(value: true))
         query.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]
 
         let queryOperation = CKQueryOperation(query: query)
@@ -58,7 +59,7 @@ extension ViewController {
     // MARK: - Processing
 
     private func processPlayerStats() {
-        let keys = [
+        let v1Keys = [
             "CustomName",
             "DeviceName",
             "GCAlias",
@@ -78,6 +79,68 @@ extension ViewController {
             "ModifiedAt"
         ]
 
+        let v3Keys = [
+            "CustomNames",
+            "DeviceNames",
+            "GCAliases",
+
+            "gkFastestTime",
+            "gkHelp",
+            "gkInvitedToMatch",
+            "gkMatch",
+            "gkPages",
+            "gkPixelsScrolled",
+            "gkPoints",
+            "gkPressedJoin",
+            "gkRaceDNF",
+            "gkRaceFinishFirst",
+            "gkRaceFinishSecond",
+            "gkRaceFinishThird",
+            "gkRaces",
+            "gkTotalPlayers",
+            "gkTotalTime",
+            "gkUniquePlayers",
+            "gkVotes",
+            "mpcFastestTime",
+            "mpcHelp",
+            "mpcMatch",
+            "mpcPages",
+            "mpcPixelsScrolled",
+            "mpcPoints",
+            "mpcPressedHost",
+            "mpcPressedJoin",
+            "mpcRaceDNF",
+            "mpcRaceFinishFirst",
+            "mpcRaceFinishSecond",
+            "mpcRaceFinishThird",
+            "mpcRaces",
+            "mpcTotalPlayers",
+            "mpcTotalTime",
+            "mpcUniquePlayers",
+            "mpcVotes",
+            "multiplayerAverage",
+            "soloFastestTime",
+            "soloHelp",
+            "soloMatch",
+            "soloPages",
+            "soloPixelsScrolled",
+            "soloPressedHost",
+            "soloRaceDNF",
+            "soloRaceFinishFirst",
+            "soloRaces",
+            "soloTotalTime",
+            "soloVotes",
+            "triggeredEasterEgg",
+
+            "osVersion",
+            "coreVersion",
+            "coreBuild",
+            "CreatedAt",
+            "ModifiedAt"
+        ]
+
+        let keys = isUsingUserStatsV3 ? v3Keys : v1Keys
+
         var csvString = ""
         for key in keys {
             csvString += key + ","
@@ -86,7 +149,7 @@ extension ViewController {
         for record in playerRecords {
             for key in keys {
                 if let object = record.object(forKey: key) {
-                    csvString += "\(object)"
+                    csvString += "\(object)".replacingOccurrences(of: ",", with: "|").replacingOccurrences(of: "\n", with: "")
                 } else if key == "CreatedAt", let date = record.creationDate {
                     csvString += "\(date)"
                 } else if key == "ModifiedAt", let date = record.modificationDate {

WKRCloudStats/WKRCloudStats/ViewController.swift

@@ -19,6 +19,8 @@ class ViewController: NSViewController {
     var playerRecords = [CKRecord]()
     let publicDB = CKContainer(identifier: "iCloud.com.andrewfinke.wikiraces").publicCloudDatabase
 
+    var isUsingUserStatsV3 = true
+
     // MARK: - View Life Cycle
 
     override func viewDidLoad() {

WKRKit/WKRKit/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.6.4</string>
 	<key>CFBundleVersion</key>
-	<string>8694</string>
+	<string>8765</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

WKRPython/requirements.txt

@@ -26,7 +26,7 @@ six=1.12.0=py37_0
 soupsieve=1.7.1=py37_0
 sqlite=3.26.0=ha441bb4_0
 tk=8.6.8=ha441bb4_0
-urllib3=1.24.1=py37_0
+urllib3=1.24.2=py37_0
 wheel=0.32.3=py37_0
 xz=5.2.4=h1de35cc_4
 zlib=1.2.11=h1de35cc_3

WKRUIKit/WKRUIKit/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.6.4</string>
 	<key>CFBundleVersion</key>
-	<string>9202</string>
+	<string>9274</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

WikiRaces/Shared/Frameworks/Analytics/FirebaseABTesting.framework/Headers/FIRExperimentController.h

@@ -12,6 +12,7 @@ extern const ABTExperimentPayload_ExperimentOverflowPolicy FIRDefaultExperimentO
 
 /// This class is for Firebase services to handle experiments updates to Firebase Analytics.
 /// Experiments can be set, cleared and updated through this controller.
+NS_SWIFT_NAME(ExperimentController)
 @interface FIRExperimentController : NSObject
 
 /// Returns the FIRExperimentController singleton.

WikiRaces/Shared/Frameworks/Analytics/FirebaseABTesting.framework/Headers/FIRLifecycleEvents.h

@@ -3,18 +3,23 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /// Default event name for when an experiment is set.
-extern NSString *const FIRSetExperimentEventName;
+extern NSString *const FIRSetExperimentEventName NS_SWIFT_NAME(DefaultSetExperimentEventName);
 /// Default event name for when an experiment is activated.
-extern NSString *const FIRActivateExperimentEventName;
+extern NSString *const FIRActivateExperimentEventName
+    NS_SWIFT_NAME(DefaultActivateExperimentEventName);
 /// Default event name for when an experiment is cleared.
-extern NSString *const FIRClearExperimentEventName;
+extern NSString *const FIRClearExperimentEventName
+    NS_SWIFT_NAME(DefaultClearExperimentEventName);
 /// Default event name for when an experiment times out for being activated.
-extern NSString *const FIRTimeoutExperimentEventName;
+extern NSString *const FIRTimeoutExperimentEventName
+    NS_SWIFT_NAME(DefaultTimeoutExperimentEventName);
 /// Default event name for when an experiment is expired as it reaches the end of TTL.
-extern NSString *const FIRExpireExperimentEventName;
+extern NSString *const FIRExpireExperimentEventName
+    NS_SWIFT_NAME(DefaultExpireExperimentEventName);
 
 /// An Experiment Lifecycle Event Object that specifies the name of the experiment event to be
 /// logged by Firebase Analytics.
+NS_SWIFT_NAME(LifecycleEvents)
 @interface FIRLifecycleEvents : NSObject
 
 /// Event name for when an experiment is set. It is default to FIRSetExperimentEventName and can be

WikiRaces/Shared/Frameworks/Analytics/FirebaseABTesting.framework/Modules/module.modulemap

@@ -1,7 +1,9 @@
 framework module FirebaseABTesting {
   umbrella header "FirebaseABTesting.h"
   export *
-  module * { export *}
-  link "z"
+  module * { export * }
+  link framework "CoreFoundation"
+  link framework "Foundation"
   link framework "Security"
-  link framework "SystemConfiguration"}
+  link framework "SystemConfiguration"
+}

WikiRaces/Shared/Frameworks/Analytics/FirebaseAnalytics.framework/Headers/FIRUserPropertyNames.h

@@ -15,3 +15,15 @@
 /// The method used to sign in. For example, "google", "facebook" or "twitter".
 static NSString *const kFIRUserPropertySignUpMethod
     NS_SWIFT_NAME(AnalyticsUserPropertySignUpMethod) = @"sign_up_method";
+
+/// Indicates whether events logged by Google Analytics can be used to personalize ads for the user.
+/// Set to "YES" to enable, or "NO" to disable. Default is enabled. See the
+/// <a href="https://firebase.google.com/support/guides/disable-analytics">documentation</a> for
+/// more details and information about related settings.
+///
+/// <pre>
+///     [FIRAnalytics setUserPropertyString:@"NO"
+///                                 forName:kFIRUserPropertyAllowAdPersonalizationSignals];
+/// </pre>
+static NSString *const kFIRUserPropertyAllowAdPersonalizationSignals
+    NS_SWIFT_NAME(AnalyticsUserPropertyAllowAdPersonalizationSignals) = @"allow_personalized_ads";

WikiRaces/Shared/Frameworks/Analytics/FirebaseCore.framework/Headers/FIRConfiguration.h

@@ -16,26 +16,19 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAnalyticsConfiguration.h"
-#import "FIRLoggerLevel.h"
+#import <FirebaseCore/FIRLoggerLevel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- * This interface provides global level properties that the developer can tweak, and the singleton
- * of the Firebase Analytics configuration class.
+ * This interface provides global level properties that the developer can tweak.
  */
 NS_SWIFT_NAME(FirebaseConfiguration)
 @interface FIRConfiguration : NSObject
 
 /** Returns the shared configuration object. */
 @property(class, nonatomic, readonly) FIRConfiguration *sharedInstance NS_SWIFT_NAME(shared);
 
-/** The configuration class for Firebase Analytics. */
-@property(nonatomic, readwrite)
-    FIRAnalyticsConfiguration *analyticsConfiguration DEPRECATED_MSG_ATTRIBUTE(
-        "Use the methods available here directly on the `Analytics` class.");
-
 /**
  * Sets the logging level for internal Firebase logging. Firebase will only log messages
  * that are logged at or below loggerLevel. The messages are logged both to the Xcode

WikiRaces/Shared/Frameworks/Analytics/FirebaseCore.framework/Headers/FirebaseCore.h

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#import "FIRAnalyticsConfiguration.h"
 #import "FIRApp.h"
 #import "FIRConfiguration.h"
 #import "FIRLoggerLevel.h"

WikiRaces/Shared/Frameworks/Analytics/FirebaseCoreDiagnostics.framework/Modules/module.modulemap

@@ -2,6 +2,8 @@ framework module FirebaseCoreDiagnostics {
   export *
   module * { export * }
   link "z"
+  link framework "Foundation"
   link framework "Security"
   link framework "SystemConfiguration"
+  link framework "UIKit"
 }

WikiRaces/Shared/Frameworks/Analytics/FirebaseInstanceID.framework/Headers/FIRInstanceID.h

@@ -208,14 +208,6 @@ NS_SWIFT_NAME(InstanceID)
  */
 - (void)instanceIDWithHandler:(FIRInstanceIDResultHandler)handler;
 
-/**
- *  Returns a Firebase Messaging scoped token for the firebase app.
- *
- *  @return Returns the stored token if the device has registered with Firebase Messaging, otherwise
- *          returns nil.
- */
-- (nullable NSString *)token __deprecated_msg("Use instanceIDWithHandler: instead.");
-
 /**
  *  Returns a token that authorizes an Entity (example: cloud service) to perform
  *  an action on behalf of the application identified by Instance ID.

WikiRaces/Shared/Frameworks/Analytics/FirebasePerformance.framework/Headers/FIRPerformance.h

@@ -2,8 +2,9 @@
 
 #import "FIRTrace.h"
 
-/** This class allows you to configure the Firebase Performance Reporting SDK. It also provides the
- *  interfaces to create timers and enable or disable automatic metrics capture.
+/**
+ * This class allows you to configure the Firebase Performance Reporting SDK. It also provides the
+ * interfaces to create timers and enable or disable automatic metrics capture.
  *
  * This SDK uses a Firebase Instance ID token to identify the app instance and periodically sends
  * data to the Firebase backend. (see `[FIRInstanceID getIDWithHandler:]`).

WikiRaces/Shared/Frameworks/Analytics/FirebasePerformance.framework/Headers/FIRTrace.h

@@ -28,33 +28,6 @@ NS_SWIFT_NAME(Trace)
  */
 - (void)stop;
 
-/**
- * Increments the counter for the provided counter name by 1. If it is a new counter name, the
- * counter value will be initialized to 1. Does nothing if the trace has not been started or has
- * already been stopped.
- *
- * Note: This API has been deprecated. Please use -incrementMetric:byInt: instead.
- *
- * @param counterName The name of the counter to increment.
- */
-- (void)incrementCounterNamed:(nonnull NSString *)counterName
-    NS_SWIFT_NAME(incrementCounter(named:))
-    DEPRECATED_MSG_ATTRIBUTE("Please use -incrementMetric:byInt: instead.");
-
-/**
- * Increments the counter for the provided counter name with the provided value. If it is a new
- * counter name, the counter value will be initialized to the value. Does nothing if the trace has
- * not been started or has already been stopped.
- *
- * Note: This API has been deprecated. Please use -incrementMetric:byInt: instead.
- *
- * @param counterName The name of the counter to increment.
- * @param incrementValue The value the counter would be incremented with.
- */
-- (void)incrementCounterNamed:(nonnull NSString *)counterName by:(NSInteger)incrementValue
-    NS_SWIFT_NAME(incrementCounter(named:by:))
-    DEPRECATED_MSG_ATTRIBUTE("Please use -incrementMetric:byInt: instead.");
-
 #pragma mark - Metrics API
 
 /**

WikiRaces/Shared/Frameworks/Analytics/FirebasePerformance.framework/Modules/module.modulemap

@@ -5,7 +5,9 @@ framework module FirebasePerformance {
   link "c++"
   link "sqlite3"
   link "z"
+  link framework "CoreFoundation"
   link framework "CoreTelephony"
+  link framework "Foundation"
   link framework "QuartzCore"
   link framework "Security"
   link framework "StoreKit"