Merge pull request #140 from atfinke/2020.05

2020.05
atfinke · May 7, 2020 · 4a33793 · 4a33793
2 parents ce7d4ab + 7ae8082
commit 4a33793
Show file tree

Hide file tree

Showing 108 changed files with 3,597 additions and 679 deletions.
diff --git a/.github/workflows/iOS-App.yml b/.github/workflows/iOS-App.yml
@@ -0,0 +1,16 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+    build:
+        name: iOS App
+        runs-on: macOS-latest
+        strategy:
+            matrix:
+                destination: ["name=iPhone 11 Pro"]
+        steps:
+            - uses: actions/checkout@v1
+            - name: Build WikiRaces
+              run: xcodebuild clean build -workspace WikiRaces.xcworkspace -scheme WikiRaces -destination '${{ matrix.destination }}' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
+            - name: Test WikiRaces
+              run: xcodebuild clean test -workspace WikiRaces.xcworkspace -scheme WikiRacesTests -destination '${{ matrix.destination }}' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
diff --git a/.github/workflows/iOS-WKRKit.yml b/.github/workflows/iOS-WKRKit.yml
@@ -0,0 +1,16 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+    build:
+        name: iOS WKRKit
+        runs-on: macOS-latest
+        strategy:
+            matrix:
+                destination: ["name=iPhone 11 Pro"]
+        steps:
+            - uses: actions/checkout@v1
+            - name: Build WKRKit
+              run: xcodebuild clean build -workspace WikiRaces.xcworkspace -scheme WKRKit -destination '${{ matrix.destination }}' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
+            - name: Test WKRKit
+              run: xcodebuild clean test -workspace WikiRaces.xcworkspace -scheme WKRKitOfflineTests -destination '${{ matrix.destination }}' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
diff --git a/.github/workflows/iOS-WKRUIKit.yml b/.github/workflows/iOS-WKRUIKit.yml
@@ -0,0 +1,14 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+    build:
+        name: iOS WKRUIKit
+        runs-on: macOS-latest
+        strategy:
+            matrix:
+                destination: ["name=iPhone 11 Pro"]
+        steps:
+            - uses: actions/checkout@v1
+            - name: Build WKRUIKit
+              run: xcodebuild clean build -workspace WikiRaces.xcworkspace -scheme WKRUIKit -destination '${{ matrix.destination }}' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# WikiRaces [![Build Status](https://travis-ci.org/atfinke/WikiRaces.svg?branch=master)](https://travis-ci.org/atfinke/WikiRaces)
+# WikiRaces ![Build Status](https://github.com/atfinke/WikiRaces/workflows/CI/badge.svg)
 
 The source code for [WikiRaces 3](https://itunes.apple.com/us/app/wikiraces-3/id1030997904?mt=8) on the App Store.
 

diff --git a/WKRKit/WKRKit.xcodeproj/project.pbxproj b/WKRKit/WKRKit.xcodeproj/project.pbxproj
@@ -36,6 +36,8 @@
 		14AF1CB81F57C52E000EFC2B /* WKRUIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14AF1CB91F57C52E000EFC2B /* WKRUIKit.framework */; };
 		14B4DB87222674E2007D4B54 /* WKRLogEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B4DB86222674E2007D4B54 /* WKRLogEvent.swift */; };
 		14BA31021FF60E7B00B10C70 /* WKRPlayerAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14BA31011FF60E7B00B10C70 /* WKRPlayerAction.swift */; };
+		14D7DC73245FC58300772E6F /* WKRRaceSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14D7DC72245FC58300772E6F /* WKRRaceSettings.swift */; };
+		14D7DC74245FC58300772E6F /* WKRRaceSettings+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14D7DC71245FC58200772E6F /* WKRRaceSettings+Codable.swift */; };
 		14E1B1981F7954A00082F4FA /* WKRKitConstants.plist in Resources */ = {isa = PBXBuildFile; fileRef = 14E1B1971F7954A00082F4FA /* WKRKitConstants.plist */; };
 		14E6DFAE1F3685B8002755C3 /* WKRPreRaceConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14E6DFAD1F3685B8002755C3 /* WKRPreRaceConfig.swift */; };
 		14E6DFB01F3685EF002755C3 /* WKRKit+Array.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14E6DFAF1F3685EF002755C3 /* WKRKit+Array.swift */; };
@@ -104,6 +106,8 @@
 		14AF1CB91F57C52E000EFC2B /* WKRUIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WKRUIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		14B4DB86222674E2007D4B54 /* WKRLogEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKRLogEvent.swift; sourceTree = "<group>"; };
 		14BA31011FF60E7B00B10C70 /* WKRPlayerAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKRPlayerAction.swift; sourceTree = "<group>"; };
+		14D7DC71245FC58200772E6F /* WKRRaceSettings+Codable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WKRRaceSettings+Codable.swift"; sourceTree = "<group>"; };
+		14D7DC72245FC58300772E6F /* WKRRaceSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WKRRaceSettings.swift; sourceTree = "<group>"; };
 		14E1B1971F7954A00082F4FA /* WKRKitConstants.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = WKRKitConstants.plist; sourceTree = "<group>"; };
 		14E6DFAD1F3685B8002755C3 /* WKRPreRaceConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKRPreRaceConfig.swift; sourceTree = "<group>"; };
 		14E6DFAF1F3685EF002755C3 /* WKRKit+Array.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WKRKit+Array.swift"; sourceTree = "<group>"; };
@@ -245,6 +249,8 @@
 		14E6DFB31F3686EE002755C3 /* Game */ = {
 			isa = PBXGroup;
 			children = (
+				14D7DC72245FC58300772E6F /* WKRRaceSettings.swift */,
+				14D7DC71245FC58200772E6F /* WKRRaceSettings+Codable.swift */,
 				14EB9F4F1F3682CA00FF1A9E /* WKRGame.swift */,
 				1497F3191F588EBE001653DE /* WKRReadyStates.swift */,
 				14EB9F491F3682A000FF1A9E /* WKRGameState.swift */,
@@ -495,11 +501,13 @@
 				14EB9F6A1F36834E00FF1A9E /* WKRPageNavigation.swift in Sources */,
 				14EB9F521F3682D000FF1A9E /* WKRManager.swift in Sources */,
 				1452B3741F36529300E81FD8 /* WKRKitConstants.swift in Sources */,
+				14D7DC73245FC58300772E6F /* WKRRaceSettings.swift in Sources */,
 				14EB9F711F36850800FF1A9E /* WKRInt.swift in Sources */,
 				14B4DB87222674E2007D4B54 /* WKRLogEvent.swift in Sources */,
 				14EB9F561F3682E500FF1A9E /* WKRManager+PeerNetwork.swift in Sources */,
 				14EB9F4A1F3682A000FF1A9E /* WKRGameState.swift in Sources */,
 				142CB29A202EAC6B00BC6A33 /* WKRSoloNetwork.swift in Sources */,
+				14D7DC74245FC58300772E6F /* WKRRaceSettings+Codable.swift in Sources */,
 				14E6DFAE1F3685B8002755C3 /* WKRPreRaceConfig.swift in Sources */,
 				1452B3721F36524400E81FD8 /* WKRPage.swift in Sources */,
 				142CB29E202EC42000BC6A33 /* WKRPeerNetworkConfig.swift in Sources */,
@@ -666,9 +674,9 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = WKRKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2020.03.1;
+				MARKETING_VERSION = 2020.05.1;
 				OTHER_SWIFT_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.WKRKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -695,9 +703,9 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = WKRKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2020.03.1;
+				MARKETING_VERSION = 2020.05.1;
 				OTHER_SWIFT_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.WKRKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -714,6 +722,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				DEVELOPMENT_TEAM = 72S993BNAV;
 				INFOPLIST_FILE = WKRKitTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.WKRKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -728,6 +737,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				DEVELOPMENT_TEAM = 72S993BNAV;
 				INFOPLIST_FILE = WKRKitTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.WKRKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/WKRKit/WKRKit/Constants/WKRKitConstants-TESTING_ONLY.plist b/WKRKit/WKRKit/Constants/WKRKitConstants-TESTING_ONLY.plist
@@ -24,7 +24,7 @@
 	<key>RandomURLString</key>
 	<string>https://en.m.wikipedia.org/wiki/Special:Random</string>
 	<key>Version</key>
-	<integer>10000</integer>
+	<real>10000</real>
 	<key>WhatLinksHereURLString</key>
 	<string>https://en.m.wikipedia.org/w/index.php?title=Special:WhatLinksHere</string>
 	<key>MaxFoundPagePlayers</key>
@@ -39,5 +39,7 @@
 	<integer>4</integer>
 	<key>MaxLocalRacePlayers</key>
 	<integer>8</integer>
+	<key>PageTitleMaxRandomLength</key>
+	<integer>30</integer>
 </dict>
 </plist>
diff --git a/WKRKit/WKRKit/Constants/WKRKitConstants.plist b/WKRKit/WKRKit/Constants/WKRKitConstants.plist
@@ -7,7 +7,6 @@
 		<string>/wiki/File</string>
 		<string>org/wiki/Wikipedia:</string>
 		<string>org/wiki/Special:</string>
-		<string>org/wiki/Portal:</string>
 		<string>org/wiki/Template:</string>
 		<string>org/wiki/Help:</string>
 		<string>org/wiki/Category:</string>
@@ -20,14 +19,16 @@
 	<integer>0</integer>
 	<key>PageTitleStringToReplace</key>
 	<string> - Wikipedia</string>
+	<key>PageTitleMaxRandomLength</key>
+	<integer>30</integer>
 	<key>QuickRace</key>
 	<false/>
 	<key>ConnectionTestTimeout</key>
 	<integer>4</integer>
 	<key>RandomURLString</key>
 	<string>https://en.m.wikipedia.org/wiki/Special:Random</string>
 	<key>Version</key>
-	<integer>22</integer>
+	<integer>26</integer>
 	<key>WhatLinksHereURLString</key>
 	<string>https://en.m.wikipedia.org/w/index.php?title=Special:WhatLinksHere</string>
 	<key>MaxFoundPagePlayers</key>