Merge pull request #149 from atfinke/2020.10

2020.10

WKRKit/WKRKit.xcodeproj/project.pbxproj

@@ -479,7 +479,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Andrew Finke";
 				TargetAttributes = {
 					146E052324AE3E59001E1917 = {
@@ -756,6 +756,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;
@@ -818,6 +819,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;
@@ -863,7 +865,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = WKRKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 2020.08;
 				OTHER_SWIFT_FLAGS = "";
@@ -894,7 +896,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = WKRKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 2020.08;
 				OTHER_SWIFT_FLAGS = "";
@@ -915,7 +917,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				DEVELOPMENT_TEAM = 72S993BNAV;
 				INFOPLIST_FILE = WKRKitTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.WKRKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -930,7 +932,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				DEVELOPMENT_TEAM = 72S993BNAV;
 				INFOPLIST_FILE = WKRKitTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.WKRKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";

WKRKit/WKRKit.xcodeproj/xcshareddata/xcschemes/WKRKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

WKRKit/WKRKit.xcodeproj/xcshareddata/xcschemes/WKRKitCore.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

WKRKit/WKRKit.xcodeproj/xcshareddata/xcschemes/WKRKitOfflineTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

WKRKit/WKRKit.xcodeproj/xcshareddata/xcschemes/WKRKitTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

WKRKit/WKRKit/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>13457</string>
+	<string>13611</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

WKRKit/WKRKit/Web Logic/WKRConnectionTester.swift

@@ -18,9 +18,7 @@ public struct WKRConnectionTester {
     ///   - completionHandler: Handler with Bool indicating connectivity.
     public static func start(timeout: Double = WKRKitConstants.current.connectionTestTimeout,
                              completionHandler: @escaping (_ connected: Bool) -> Void) {
-        let startDate = Date()
         var timedOut = false
-
         let timer = Timer.scheduledTimer(withTimeInterval: timeout, repeats: false) { _ in
             timedOut = true
             completionHandler(false)
@@ -31,7 +29,7 @@ public struct WKRConnectionTester {
             if timedOut {
                 // Timer fired, completion handler already called
                 return
-            } else if page != nil, startDate.timeIntervalSinceNow > -3.0 {
+            } else if page != nil {
                 // Have valid page, loaded in time
                 completionHandler(true)
             } else {

WKRUIKit/WKRUIKit.xcodeproj/project.pbxproj

@@ -303,7 +303,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1000;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Andrew Finke";
 				TargetAttributes = {
 					149FF7F21F362B0D000A5D96 = {
@@ -510,6 +510,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;
@@ -572,6 +573,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;
@@ -617,7 +619,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = WKRUIKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 2020.08;
 				PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.WKRUIKit;
@@ -645,7 +647,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = WKRUIKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 2020.08;
 				PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.WKRUIKit;

WKRUIKit/WKRUIKit.xcodeproj/xcshareddata/xcschemes/WKRUIKit (UI Catalog).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

WKRUIKit/WKRUIKit.xcodeproj/xcshareddata/xcschemes/WKRUIKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

WKRUIKit/WKRUIKit/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>14365</string>
+	<string>14519</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

WKRUIKit/WKRUIKit/Views/Web View/WKRUIWebView.swift

@@ -84,6 +84,8 @@ final public class WKRUIWebView: WKWebView, WKScriptMessageHandler {
 
         allowsLinkPreview = false
         allowsBackForwardNavigationGestures = false
+
+        scrollView.layer.masksToBounds = false
 
         let features: [[UIFontDescriptor.FeatureKey: Int]] = [
             [

WKRUIKit/WKRUIKit/WKRUIPlayerImageManager.swift

@@ -46,8 +46,6 @@ public class WKRUIPlayerImageManager {
 
     public func connected(to player: GKPlayer, completion: (() -> Void)?) {
         DispatchQueue.main.async {
-            assert(Thread.isMainThread)
-
             let placeholder = WKRUIPlayerPlaceholderImageRenderer.render(name: player.displayName)
             os_log("%{public}s: generated placeholder for %{public}s", log: .imageManager, type: .info, #function, player.alias)
 

WikiRaces/Shared/Frameworks/Analytics/Firebase.h

@@ -22,6 +22,10 @@
     #import <FirebaseAnalytics/FirebaseAnalytics.h>
   #endif
 
+  #if __has_include(<FirebaseAppDistribution/FirebaseAppDistribution.h>)
+    #import <FirebaseAppDistribution/FirebaseAppDistribution.h>
+  #endif
+
   #if __has_include(<FirebaseAuth/FirebaseAuth.h>)
     #import <FirebaseAuth/FirebaseAuth.h>
   #endif
@@ -36,11 +40,10 @@
 
   #if __has_include(<FirebaseDynamicLinks/FirebaseDynamicLinks.h>)
     #import <FirebaseDynamicLinks/FirebaseDynamicLinks.h>
-    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+    #if TARGET_OS_IOS && !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
       #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
-        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
-`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
-Firebase Dynamic Links works as intended."
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add the \
+FirebaseAnalytics dependency to your project to ensure Firebase Dynamic Links works as intended."
       #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
     #endif
   #endif
@@ -55,11 +58,10 @@ Firebase Dynamic Links works as intended."
 
   #if __has_include(<FirebaseInAppMessaging/FirebaseInAppMessaging.h>)
     #import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
-    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+    #if TARGET_OS_IOS && !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
       #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
-        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
-`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
-Firebase In App Messaging works as intended."
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add the \
+FirebaseAnalytics dependency to your project to ensure Firebase In App Messaging works as intended."
       #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
     #endif
   #endif
@@ -70,14 +72,14 @@ Firebase In App Messaging works as intended."
 
   #if __has_include(<FirebaseMessaging/FirebaseMessaging.h>)
     #import <FirebaseMessaging/FirebaseMessaging.h>
-      #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #if TARGET_OS_IOS && !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
       #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
-        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
-`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
-Firebase Messaging works as intended."
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add the \
+FirebaseAnalytics dependency to your project to ensure Messaging works as intended."
+
       #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
     #endif
-#endif
+  #endif
 
   #if __has_include(<FirebaseMLCommon/FirebaseMLCommon.h>)
     #import <FirebaseMLCommon/FirebaseMLCommon.h>
@@ -133,22 +135,20 @@ Firebase Messaging works as intended."
 
   #if __has_include(<FirebasePerformance/FirebasePerformance.h>)
     #import <FirebasePerformance/FirebasePerformance.h>
-    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+    #if TARGET_OS_IOS && !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
       #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
-        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
-`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
-Firebase Performance works as intended."
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add the \
+FirebaseAnalytics dependency to your project to ensure Firebase Performance works as intended."
       #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
     #endif
   #endif
 
   #if __has_include(<FirebaseRemoteConfig/FirebaseRemoteConfig.h>)
     #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
-    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+    #if TARGET_OS_IOS && !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
       #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
-        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
-`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
-Firebase Remote Config works as intended."
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add the \
+FirebaseAnalytics dependency to your project to ensure Firebase Remote Config works as intended."
       #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
     #endif
   #endif

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

@@ -39,7 +39,6 @@ NS_SWIFT_NAME(Analytics)
 ///     <li>notification_open</li>
 ///     <li>notification_receive</li>
 ///     <li>os_update</li>
-///     <li>screen_view</li>
 ///     <li>session_start</li>
 ///     <li>user_engagement</li>
 /// </ul>
@@ -49,7 +48,7 @@ NS_SWIFT_NAME(Analytics)
 ///     reserved. See FIREventNames.h for the list of reserved event names. The "firebase_",
 ///     "google_", and "ga_" prefixes are reserved and should not be used. Note that event names are
 ///     case-sensitive and that logging two events whose names differ only in case will result in
-///     two distinct events.
+///     two distinct events. To manually log screen view events, use the `screen_view` event name.
 /// @param parameters The dictionary of event parameters. Passing nil indicates that the event has
 ///     no parameters. Parameter names can be up to 40 characters long and must start with an
 ///     alphabetic character and contain only alphanumeric characters and underscores. Only NSString
@@ -85,31 +84,36 @@ NS_SWIFT_NAME(Analytics)
 ///     non-empty and no more than 256 characters long. Setting userID to nil removes the user ID.
 + (void)setUserID:(nullable NSString *)userID;
 
+/// This method was deprecated in Firebase 6.29.0.
+///
 /// Sets the current screen name, which specifies the current visual context in your app. This helps
 /// identify the areas in your app where users spend their time and how they interact with your app.
 /// Must be called on the main thread.
 ///
 /// Note that screen reporting is enabled automatically and records the class name of the current
-/// UIViewController for you without requiring you to call this method. If you implement
-/// viewDidAppear in your UIViewController but do not call [super viewDidAppear:], that screen class
-/// will not be automatically tracked. The class name can optionally be overridden by calling this
-/// method in the viewDidAppear callback of your UIViewController and specifying the
-/// screenClassOverride parameter. setScreenName:screenClass: must be called after
-/// [super viewDidAppear:].
+/// UIViewController for you without requiring you to call this method. The class name can
+/// optionally be overridden by calling this method in the viewDidAppear callback of your
+/// UIViewController and specifying the screenClassOverride parameter.
+/// `setScreenName:screenClass:` must be called after `[super viewDidAppear:]`.
 ///
 /// If your app does not use a distinct UIViewController for each screen, you should call this
 /// method and specify a distinct screenName each time a new screen is presented to the user.
 ///
 /// The screen name and screen class remain in effect until the current UIViewController changes or
 /// a new call to setScreenName:screenClass: is made.
 ///
+/// @warning If you override `viewDidAppear:` in your UIViewController but do not call
+///     `[super viewDidAppear:]`, that screen class will not be tracked.
+///
 /// @param screenName The name of the current screen. Should contain 1 to 100 characters. Set to nil
 ///     to clear the current screen name.
 /// @param screenClassOverride The name of the screen class. Should contain 1 to 100 characters. By
 ///     default this is the class name of the current UIViewController. Set to nil to revert to the
 ///     default class name.
 + (void)setScreenName:(nullable NSString *)screenName
-          screenClass:(nullable NSString *)screenClassOverride;
+          screenClass:(nullable NSString *)screenClassOverride
+    DEPRECATED_MSG_ATTRIBUTE(
+        "Use +[FIRAnalytics logEventWithName:kFIREventScreenView parameters:] instead.");
 
 /// Sets whether analytics collection is enabled for this app on this device. This setting is
 /// persisted across app sessions. By default it is enabled.
@@ -131,6 +135,20 @@ NS_SWIFT_NAME(Analytics)
 /// FIRAnalyticsConfiguration values will be reset to the default values.
 + (void)resetAnalyticsData;
 
+/// Adds parameters that will be set on every event logged from the SDK, including automatic ones.
+/// The values passed in the parameters dictionary will be added to the dictionary of default event
+/// parameters. These parameters persist across app runs. They are of lower precedence than event
+/// parameters, so if an event parameter and a parameter set using this API have the same name, the
+/// value of the event parameter will be used. The same limitations on event parameters apply to
+/// default event parameters.
+///
+/// @param parameters Parameters to be added to the dictionary of parameters added to every event.
+///     They will be added to the dictionary of default event parameters, replacing any existing
+///     parameter with the same name. Valid parameters are NSString and NSNumber (signed 64-bit
+///     integer and 64-bit floating-point number). Setting a key's value to [NSNull null] will clear
+///     that parameter. Passing in a nil dictionary will clear all parameters.
++ (void)setDefaultEventParameters:(nullable NSDictionary<NSString *, id> *)parameters;
+
 @end
 
 NS_ASSUME_NONNULL_END