Merge pull request #76 from atfinke/3.6.6

3.6.6
atfinke · Nov 10, 2019 · c4a6f85 · c4a6f85
2 parents 8104904 + 4231b8d
commit c4a6f85
Show file tree

Hide file tree

Showing 213 changed files with 4,659 additions and 1,191 deletions.
diff --git a/.gitignore b/.gitignore
@@ -84,3 +84,7 @@ WikiRaces/culprits.txt
 WikiRaces/fastlane/report.xml
 
 WikiRaces/fastlane/README.md
+
+WikiRaces/fastlane/Preview.html
+
+WikiRaces/fastlane/Appfile
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10.2
+osx_image: xcode11
 
 matrix:
   include:
@@ -15,4 +15,4 @@ install:
   - ./install_swiftlint.sh
 
 script:
-  - "xcodebuild clean $TYPE -workspace WikiRaces.xcworkspace -scheme $SCHEME -destination 'platform=iOS Simulator,name=iPad Pro (12.9-inch),OS=12.2'"
+  - "xcodebuild clean $TYPE -workspace WikiRaces.xcworkspace -scheme $SCHEME -destination 'platform=iOS Simulator,name=iPhone 11 Pro Max,OS=13.0'"
diff --git a/WKRArticlesPreviewer/WKRArticlesPreviewer.xcodeproj/project.pbxproj b/WKRArticlesPreviewer/WKRArticlesPreviewer.xcodeproj/project.pbxproj
@@ -90,7 +90,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1020;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = "Andrew Finke";
 				TargetAttributes = {
 					1434C24D22238E5C0099C53A = {
@@ -277,6 +277,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = WKRArticlesPreviewer/WKRArticlesPreviewer.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 72S993BNAV;
@@ -296,6 +297,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = WKRArticlesPreviewer/WKRArticlesPreviewer.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 72S993BNAV;

diff --git a/...clesPreviewer/WKRArticlesPreviewer.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/...clesPreviewer/WKRArticlesPreviewer.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/.../WKRArticlesPreviewer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/.../WKRArticlesPreviewer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/WKRArticlesPreviewer/WKRArticlesPreviewer/ViewController.swift b/WKRArticlesPreviewer/WKRArticlesPreviewer/ViewController.swift
@@ -28,6 +28,20 @@ class ViewController: NSViewController {
         super.viewDidLoad()
         webView.load(URLRequest(url: URL(string: "https://en.m.wikipedia.org")!))
         NSWorkspace.shared.openFile(NSTemporaryDirectory())
+
+        NSEvent.addLocalMonitorForEvents(matching: .keyUp) {
+            print($0.keyCode)
+            if $0.keyCode == 124 {
+                self.keepArticle(0)
+            } else if $0.keyCode == 126 {
+                self.removeArticle(0)
+            } else if $0.keyCode == 123 {
+                self.undoLastAction(0)
+            } else {
+                return nil
+            }
+            return $0
+        }
     }
 
     func moveToNextArticle(keepCurrent: Bool) {

diff --git a/WKRCloudStats/WKRCloudStats.xcodeproj/project.pbxproj b/WKRCloudStats/WKRCloudStats.xcodeproj/project.pbxproj
@@ -108,7 +108,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = "Andrew Finke";
 				TargetAttributes = {
 					145623D31F8DE63C00B1ECAC = {
@@ -300,6 +300,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = WKRCloudStats/WKRCloudStats.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 72S993BNAV;
@@ -316,6 +317,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = WKRCloudStats/WKRCloudStats.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 72S993BNAV;

diff --git a/WKRCloudStats/WKRCloudStats.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/WKRCloudStats/WKRCloudStats.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...udStats/WKRCloudStats.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/...udStats/WKRCloudStats.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/WKRCloudStats/WKRCloudStats.xcodeproj/xcshareddata/xcschemes/WKRCloudStats.xcscheme b/WKRCloudStats/WKRCloudStats.xcodeproj/xcshareddata/xcschemes/WKRCloudStats.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:WKRCloudStats.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:WKRCloudStats.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/WKRCloudStats/WKRCloudStats/Base.lproj/Main.storyboard b/WKRCloudStats/WKRCloudStats/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14854.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14854.2"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -620,7 +620,7 @@
                                         <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                             <connections>
-                                                <action selector="toggleSourceList:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
+                                                <action selector="toggleSidebar:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
@@ -685,7 +685,7 @@
         <scene sceneID="R2V-B0-nI4">
             <objects>
                 <windowController id="B8D-0N-5wS" sceneMemberID="viewController">
-                    <window key="window" title="WKRCloudStats" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
+                    <window key="window" title="WKRCloudStats" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
                         <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
                         <rect key="contentRect" x="196" y="240" width="480" height="270"/>
@@ -712,26 +712,26 @@
                         <subviews>
                             <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NM2-Hr-yXW">
                                 <rect key="frame" x="20" y="20" width="440" height="189"/>
-                                <clipView key="contentView" id="fkl-jE-QER">
+                                <clipView key="contentView" drawsBackground="NO" id="fkl-jE-QER">
                                     <rect key="frame" x="1" y="1" width="438" height="187"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textView importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="XYd-Sh-HSm">
                                             <rect key="frame" x="0.0" y="0.0" width="438" height="187"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <size key="minSize" width="438" height="187"/>
                                             <size key="maxSize" width="463" height="10000000"/>
                                             <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         </textView>
                                     </subviews>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </clipView>
-                                <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="LhW-3T-OXJ">
+                                <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="LhW-3T-OXJ">
                                     <rect key="frame" x="-100" y="-100" width="87" height="18"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
-                                <scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="m9N-97-nKY">
+                                <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="m9N-97-nKY">
                                     <rect key="frame" x="423" y="1" width="16" height="187"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>

diff --git a/WKRCloudStats/WKRCloudStats/ViewController+Player.swift b/WKRCloudStats/WKRCloudStats/ViewController+Player.swift
@@ -11,13 +11,13 @@ import Cocoa
 
 extension ViewController {
 
-    // MARK: - CloudKit Querying
+    // MARK: - CloudKit Querying -
 
     func queryPlayerStats() {
         textView.textStorage?.append(NSAttributedString(string: "Querying Player Stats\n"))
 
         let recordType = isUsingUserStatsV3 ? "UserStatsv3" : "UserStats"
-        let query = CKQuery(recordType: "UserStatsv3", predicate: NSPredicate(value: true))
+        let query = CKQuery(recordType: recordType, predicate: NSPredicate(value: true))
         query.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]
 
         let queryOperation = CKQueryOperation(query: query)
@@ -36,7 +36,7 @@ extension ViewController {
                 self.textView.textStorage?.append(NSAttributedString(string: "Error: \(error)\n"))
                 self.processPlayerStats()
             } else if let cursor = cursor {
-                self.textView.textStorage?.append(NSAttributedString(string: "Querying w/ Cursor\n"))
+                self.textView.textStorage?.append(NSAttributedString(string: "Querying w/ Cursor \(self.playerRecords.count)\n"))
                 self.queryPlayerStats(cursor: cursor)
             } else {
                 self.textView.textStorage?.append(NSAttributedString(string: "Got All Player Stats\n"))

diff --git a/WKRCloudStats/WKRCloudStats/ViewController+Race.swift b/WKRCloudStats/WKRCloudStats/ViewController+Race.swift
@@ -30,12 +30,19 @@ extension ViewController {
     }
 
     private func queryRaceCompleted(cursor: CKQueryOperation.Cursor?, error: Error?) {
+
         DispatchQueue.main.async {
+
+            if self.raceRecords.count > 200 {
+            self.processRaceStats()
+                        return
+                    }
+
             if let error = error {
                 self.textView.textStorage?.append(NSAttributedString(string: "Error: \(error)\n"))
                 self.processRaceStats()
             } else if let cursor = cursor {
-                self.textView.textStorage?.append(NSAttributedString(string: "Querying w/ Cursor\n"))
+                self.textView.textStorage?.append(NSAttributedString(string: "Querying w/ Cursor \(self.raceRecords.count)\n"))
                 self.queryRaceStats(cursor: cursor)
             } else {
                 self.textView.textStorage?.append(NSAttributedString(string: "Got All Race Stats\n"))

diff --git a/WKRCloudStats/WKRCloudStats/ViewController.swift b/WKRCloudStats/WKRCloudStats/ViewController.swift
@@ -11,7 +11,7 @@ import CloudKit
 
 class ViewController: NSViewController {
 
-    // MARK: - Properties
+    // MARK: - Properties -
 
     @IBOutlet var textView: NSTextView!
 
@@ -20,11 +20,12 @@ class ViewController: NSViewController {
     let publicDB = CKContainer(identifier: "iCloud.com.andrewfinke.wikiraces").publicCloudDatabase
 
     var isUsingUserStatsV3 = true
-    
-    // MARK: - View Life Cycle
+
+    // MARK: - View Life Cycle -
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        textView.textColor = NSColor.labelColor
     }
 
     @IBAction func downloadPlayerStats(_ sender: Any) {

diff --git a/WKRKit/WKRKit.xcodeproj/project.pbxproj b/WKRKit/WKRKit.xcodeproj/project.pbxproj
@@ -391,7 +391,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = "Andrew Finke";
 				TargetAttributes = {
 					149FF8071F362B3D000A5D96 = {
@@ -663,10 +663,12 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = WKRKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 3.6.6;
 				OTHER_SWIFT_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.WKRKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -682,18 +684,20 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CODE_SIGN_STYLE = Manual;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 72S993BNAV;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = WKRKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 3.6.6;
 				OTHER_SWIFT_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.WKRKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";

diff --git a/WKRKit/WKRKit.xcodeproj/xcshareddata/xcschemes/WKRKit.xcscheme b/WKRKit/WKRKit.xcodeproj/xcshareddata/xcschemes/WKRKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "149FF8071F362B3D000A5D96"
+            BuildableName = "WKRKit.framework"
+            BlueprintName = "WKRKit"
+            ReferencedContainer = "container:WKRKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "149FF8071F362B3D000A5D96"
-            BuildableName = "WKRKit.framework"
-            BlueprintName = "WKRKit"
-            ReferencedContainer = "container:WKRKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -78,8 +76,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"