Skip to content

Commit a907d25

Browse files
author
Momo Ozawa
committed
Merge branch 'trunk' into task/18389-all-tours-complete-notice
2 parents bd5a6fd + 444a8fe commit a907d25

60 files changed

Lines changed: 1665 additions & 887 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def wordpress_ui
4747
end
4848

4949
def wordpress_kit
50-
pod 'WordPressKit', '~> 4.51.0-beta'
50+
pod 'WordPressKit', '~> 4.51.0'
5151
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
5252
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
5353
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''

Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ PODS:
487487
- WordPressKit (~> 4.18-beta)
488488
- WordPressShared (~> 1.12-beta)
489489
- WordPressUI (~> 1.7-beta)
490-
- WordPressKit (4.51.0-beta.2):
490+
- WordPressKit (4.51.0):
491491
- Alamofire (~> 4.8.0)
492492
- CocoaLumberjack (~> 3.4)
493493
- NSObject-SafeExpectations (= 0.0.4)
@@ -591,7 +591,7 @@ DEPENDENCIES:
591591
- SVProgressHUD (= 2.2.5)
592592
- WordPress-Editor-iOS (~> 1.19.8)
593593
- WordPressAuthenticator (~> 2.0.0)
594-
- WordPressKit (~> 4.51.0-beta)
594+
- WordPressKit (~> 4.51.0)
595595
- WordPressMocks (~> 0.0.15)
596596
- WordPressShared (~> 1.17.1)
597597
- WordPressUI (~> 1.12.5)
@@ -603,7 +603,6 @@ DEPENDENCIES:
603603
SPEC REPOS:
604604
https://github.com/wordpress-mobile/cocoapods-specs.git:
605605
- WordPressAuthenticator
606-
- WordPressKit
607606
trunk:
608607
- Alamofire
609608
- AlamofireImage
@@ -641,6 +640,7 @@ SPEC REPOS:
641640
- UIDeviceIdentifier
642641
- WordPress-Aztec-iOS
643642
- WordPress-Editor-iOS
643+
- WordPressKit
644644
- WordPressMocks
645645
- WordPressShared
646646
- WordPressUI
@@ -853,7 +853,7 @@ SPEC CHECKSUMS:
853853
WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504
854854
WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
855855
WordPressAuthenticator: 5163f732e4e529781f931f158f54b1a1545bc536
856-
WordPressKit: 78ef3c3b083ecc933dca771b7db0a4bfb4be6ba3
856+
WordPressKit: 79d309801a09fabe9564ac9e1e06554274fc5022
857857
WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
858858
WordPressShared: 0c4bc5e25765732fcf5d07f28c81970ab28493fb
859859
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -869,6 +869,6 @@ SPEC CHECKSUMS:
869869
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
870870
ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
871871

872-
PODFILE CHECKSUM: 3fa477a11aa74117f1a71675a488092c5cd5d560
872+
PODFILE CHECKSUM: 13184db128ca32c81524a8b7237063aed84a2deb
873873

874874
COCOAPODS: 1.11.2

RELEASE-NOTES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
19.9
2+
-----
3+
4+
15
19.8
26
-----
37
* [**] Self hosted sites are not restricted by video length during media uploads [https://github.com/wordpress-mobile/WordPress-iOS/pull/18414]

Scripts/BuildPhases/LintAppLocalizedStringsUsage.rb

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash -eu
2+
3+
SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
4+
SCRIPT_SRC="${SCRIPT_DIR}/LintAppLocalizedStringsUsage.swift"
5+
6+
LINTER_BUILD_DIR="${BUILD_DIR:-${TMPDIR}}"
7+
LINTER_EXEC="${LINTER_BUILD_DIR}/$(basename "${SCRIPT_SRC}" .swift)"
8+
9+
if [ ! -x "${LINTER_EXEC}" ] || ! (shasum -c "${LINTER_EXEC}.shasum" >/dev/null 2>/dev/null); then
10+
echo "Pre-compiling linter script to ${LINTER_EXEC}..."
11+
swiftc -sdk "$(xcrun --sdk macosx --show-sdk-path)" "${SCRIPT_SRC}" -o "${LINTER_EXEC}"
12+
shasum "${SCRIPT_SRC}" >"${LINTER_EXEC}.shasum"
13+
chmod +x "${LINTER_EXEC}"
14+
echo "Pre-compiled linter script ready"
15+
fi
16+
17+
"$LINTER_EXEC" "${PROJECT_FILE_PATH:-$1}" # "${TARGET_NAME:-$2}"

0 commit comments

Comments
 (0)