Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ abstract_target 'Apps' do

pod 'Gridicons', '~> 1.1.0'

pod 'WordPressAuthenticator', '~> 1.42.1'
pod 'WordPressAuthenticator', '~> 1.42.2-beta.2'
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
# pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
Expand Down
12 changes: 4 additions & 8 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
PODS:
- 1PasswordExtension (1.8.6)
- Alamofire (4.8.0)
- AlamofireImage (3.5.2):
- Alamofire (~> 4.8)
Expand Down Expand Up @@ -455,8 +454,7 @@ PODS:
- WordPress-Aztec-iOS (1.19.7)
- WordPress-Editor-iOS (1.19.7):
- WordPress-Aztec-iOS (= 1.19.7)
- WordPressAuthenticator (1.42.1):
- 1PasswordExtension (~> 1.8.6)
- WordPressAuthenticator (1.42.2-beta.2):
- Alamofire (~> 4.8)
- CocoaLumberjack (~> 3.5)
- GoogleSignIn (~> 6.0.1)
Expand Down Expand Up @@ -570,7 +568,7 @@ DEPENDENCIES:
- Starscream (= 3.0.6)
- SVProgressHUD (= 2.2.5)
- WordPress-Editor-iOS (~> 1.19.7)
- WordPressAuthenticator (~> 1.42.1)
- WordPressAuthenticator (~> 1.42.2-beta.2)
- WordPressKit (~> 4.45.0)
- WordPressMocks (~> 0.0.15)
- WordPressShared (~> 1.17.0)
Expand All @@ -585,7 +583,6 @@ SPEC REPOS:
- WordPressAuthenticator
- WordPressUI
trunk:
- 1PasswordExtension
- Alamofire
- AlamofireImage
- AlamofireNetworkActivityIndicator
Expand Down Expand Up @@ -752,7 +749,6 @@ CHECKOUT OPTIONS:
:tag: v1.69.0-alpha2

SPEC CHECKSUMS:
1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794
Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
AlamofireImage: 63cfe3baf1370be6c498149687cf6db3e3b00999
AlamofireNetworkActivityIndicator: 9acc3de3ca6645bf0efed462396b0df13dd3e7b8
Expand Down Expand Up @@ -836,7 +832,7 @@ SPEC CHECKSUMS:
UIDeviceIdentifier: d0fee204f467dacf8808b7ac14ce43affeb271a5
WordPress-Aztec-iOS: 144f124148079084860368dfd27cb96e0952853e
WordPress-Editor-iOS: 20551d5a5e51f29832064f08faaaae8e1da7e1e2
WordPressAuthenticator: 111793c08fa8e9d9a72aed5b33a094c91ff4fd82
WordPressAuthenticator: 0456ec13c006ff819d2841e6cff20bb6417f3e01
WordPressKit: 7d4ecdcb62b3826b491dad9fb9b6fb02ac9702b5
WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
WordPressShared: a4b0308a6345d4dda20c8f7ad9317df4246b4a00
Expand All @@ -853,6 +849,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e

PODFILE CHECKSUM: 46d79f86fc93e23dfcaa5588e7f4698524d9bc0a
PODFILE CHECKSUM: 9d4e39c5bc98e4ce64b73aba6ee24ff945cd0421

COCOAPODS: 1.11.2
8 changes: 2 additions & 6 deletions WordPress/WordPress.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8517,7 +8517,7 @@
path = Classes;
sourceTree = "<group>";
};
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
29B97314FDCFA39411CA2CEA = {
isa = PBXGroup;
children = (
3F20FDF3276BF21000DA3CAD /* Packages */,
Expand Down Expand Up @@ -15289,7 +15289,7 @@
bg,
sk,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
mainGroup = 29B97314FDCFA39411CA2CEA;
packageReferences = (
3FF1442E266F3C2400138163 /* XCRemoteSwiftPackageReference "ScreenObject" */,
3FC2C33B26C4CF0A00C6D98F /* XCRemoteSwiftPackageReference "XCUITestHelpers" */,
Expand Down Expand Up @@ -16484,7 +16484,6 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/1PasswordExtension/OnePasswordExtensionResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Automattic-Tracks-iOS/DataModel.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/CropViewController/TOCropViewControllerBundle.bundle",
"${PODS_ROOT}/Down/Resources/DownView.bundle",
Expand Down Expand Up @@ -16520,7 +16519,6 @@
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/OnePasswordExtensionResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DataModel.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DownView.bundle",
Expand Down Expand Up @@ -16840,7 +16838,6 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/1PasswordExtension/OnePasswordExtensionResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Automattic-Tracks-iOS/DataModel.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/CropViewController/TOCropViewControllerBundle.bundle",
"${PODS_ROOT}/Down/Resources/DownView.bundle",
Expand Down Expand Up @@ -16876,7 +16873,6 @@
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/OnePasswordExtensionResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DataModel.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DownView.bundle",
Expand Down