Merge branch 'trunk' into issue/7686-fix-card-reader-connection-modal-transitions

Author: joshheald

Networking/Networking/Network/WordPressOrgNetwork.swift

@@ -25,7 +25,7 @@ public final class WordPressOrgNetwork: Network {
         return sessionManager
     }()
 
-    public init(authenticator: Authenticator? = nil, userAgent: String? = nil) {
+    public init(authenticator: Authenticator? = nil, userAgent: String = UserAgent.defaultUserAgent) {
         self.authenticator = authenticator
         self.userAgent = userAgent
     }

Podfile

@@ -52,8 +52,8 @@ target 'WooCommerce' do
   pod 'Gridicons', '~> 1.2.0'
 
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressAuthenticator', '~> 2.4.0'
-  # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
+  pod 'WordPressAuthenticator', '~> 3.1.0-beta.1'
+#   pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
 

Podfile.lock

@@ -42,7 +42,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (2.4.0):
+  - WordPressAuthenticator (3.1.0-beta.1):
     - Alamofire (~> 4.8)
     - CocoaLumberjack (~> 3.5)
     - GoogleSignIn (~> 6.0.1)
@@ -92,7 +92,7 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.7)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 2.4.0)
+  - WordPressAuthenticator (~> 3.1.0-beta.1)
   - WordPressKit (~> 4.49.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.5)
@@ -163,7 +163,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: afc1b7ec564f2b8e71c3d2ab8afa29df70ed6d03
+  WordPressAuthenticator: 7adf1ab6dea0b1e01c519feb5cd2fc160f47798e
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: a9915adfd885798e630904e5ae74f77f8555ccfe
+PODFILE CHECKSUM: 777d68ac2ad78e410f8930be0fecb3b38338c2ae
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -5,6 +5,7 @@
 - [*] Help center: Added help center web page with FAQs for "Pick a WooCommerce Store" screen. [https://github.com/woocommerce/woocommerce-ios/pull/7641]
 - [*] In-Person Payments: Fixed a bug where cancelling a card reader connection would temporarily prevent further connections [https://github.com/woocommerce/woocommerce-ios/pull/7689]
 - [*] In-Person Payments: Improvements to the card reader connection flow UI [https://github.com/woocommerce/woocommerce-ios/pull/7687]
+- [*] Login: Users can now set up the Jetpack connection between a self-hosted site and their WP.com account. [https://github.com/woocommerce/woocommerce-ios/pull/7608]
 
 10.3
 -----

Scripts/build-phases/LintAppLocalizedStringsUsage.sh

@@ -0,0 +1,21 @@
+#!/bin/bash -eu
+
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+SCRIPT_SRC="${SCRIPT_DIR}/LintAppLocalizedStringsUsage.swift"
+
+LINTER_BUILD_DIR="${BUILD_DIR:-${TMPDIR}}"
+LINTER_EXEC="${LINTER_BUILD_DIR}/$(basename "${SCRIPT_SRC}" .swift)"
+
+if [ ! -x "${LINTER_EXEC}" ] || ! (shasum -c "${LINTER_EXEC}.shasum" >/dev/null 2>/dev/null); then
+  echo "Pre-compiling linter script to ${LINTER_EXEC}..."
+  swiftc -O -sdk "$(xcrun --sdk macosx --show-sdk-path)" "${SCRIPT_SRC}" -o "${LINTER_EXEC}"
+  shasum "${SCRIPT_SRC}" >"${LINTER_EXEC}.shasum"
+  chmod +x "${LINTER_EXEC}"
+  echo "Pre-compiled linter script ready"
+fi
+
+if [ -z "${PROJECT_FILE_PATH:=${1:-}}" ]; then
+  echo "error: Please provide the path to the xcodeproj to scan"
+  exit 1
+fi
+"$LINTER_EXEC" "${PROJECT_FILE_PATH}" "${@:2}"