Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Commit 7c81a86

Browse files
authored
Merge pull request #63 from wordpress-mobile/feature/relaxed-podfile-pinning
Relaxed podfile pinning
2 parents 25ee7ca + b9e3966 commit 7c81a86

File tree

4 files changed

+26
-22
lines changed

4 files changed

+26
-22
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ target 'WordPressAuthenticator' do
1717
##
1818
pod 'Gridicons', '~> 0.15'
1919
pod 'WordPressUI', '~> 1.0'
20-
pod 'WordPressKit', '~> 3.1.1'
20+
pod 'WordPressKit', '~> 3.1'
2121
pod 'WordPressShared', '~> 1.4'
2222

2323
## Third party libraries

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ PODS:
5252
- UIDeviceIdentifier (~> 1.1.4)
5353
- WordPressShared (~> 1.4)
5454
- wpxmlrpc (= 0.8.4)
55-
- WordPressShared (1.7.0):
55+
- WordPressShared (1.7.2):
5656
- CocoaLumberjack (~> 3.4)
5757
- FormatterKit/TimeIntervalFormatter (= 1.8.2)
5858
- WordPressUI (1.2.0)
@@ -72,7 +72,7 @@ DEPENDENCIES:
7272
- OHHTTPStubs/Swift (= 6.1.0)
7373
- Specta (= 1.0.7)
7474
- SVProgressHUD (= 2.2.5)
75-
- WordPressKit (~> 3.1.1)
75+
- WordPressKit (~> 3.1)
7676
- WordPressShared (~> 1.4)
7777
- WordPressUI (~> 1.0)
7878

@@ -117,10 +117,10 @@ SPEC CHECKSUMS:
117117
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
118118
UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
119119
WordPressKit: 9af12361492d12c6c5512d3d7de594aa415ad670
120-
WordPressShared: cfbda56868419842dd7a106a4e807069a0c17aa9
120+
WordPressShared: 63d57a4a07ad9f9a1ee5e8a7162e48fbb5192014
121121
WordPressUI: 44fe43a9c5c504dfd534286e39e1ce6ebcd69ff5
122122
wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
123123

124-
PODFILE CHECKSUM: 27c0c28bb071b03e83e1290c82e593579299f1ff
124+
PODFILE CHECKSUM: 220853b585b7b73f8958c30e6f9c1c5760d4c7a3
125125

126126
COCOAPODS: 1.5.3

WordPressAuthenticator.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WordPressAuthenticator"
3-
s.version = "1.1.11"
3+
s.version = "1.1.12-beta.1"
44
s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
55

66
s.description = <<-DESC

WordPressAuthenticator.xcodeproj/project.pbxproj

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@
602602
B5ED78FA207E976500A8FD8C /* Frameworks */,
603603
B5ED78FB207E976500A8FD8C /* Resources */,
604604
E708E1947D7E55D6347CD251 /* [CP] Embed Pods Frameworks */,
605-
71F680A7544A0E8C4C7C945A /* [CP] Copy Pods Resources */,
605+
557F1B615C0496D7C3F3DDAB /* [CP] Copy Pods Resources */,
606606
);
607607
buildRules = (
608608
);
@@ -679,58 +679,62 @@
679679
/* End PBXResourcesBuildPhase section */
680680

681681
/* Begin PBXShellScriptBuildPhase section */
682-
5ABD4390CE7F425565FA9BD2 /* [CP] Copy Pods Resources */ = {
682+
557F1B615C0496D7C3F3DDAB /* [CP] Copy Pods Resources */ = {
683683
isa = PBXShellScriptBuildPhase;
684684
buildActionMask = 2147483647;
685685
files = (
686686
);
687+
inputFileListPaths = (
688+
);
687689
inputPaths = (
688-
"${SRCROOT}/Pods/Target Support Files/Pods-WordPressAuthenticator/Pods-WordPressAuthenticator-resources.sh",
690+
"${SRCROOT}/Pods/Target Support Files/Pods-WordPressAuthenticatorTests/Pods-WordPressAuthenticatorTests-resources.sh",
689691
"${PODS_ROOT}/GoogleSignInRepacked/Resources/GoogleSignIn.bundle",
690692
);
691693
name = "[CP] Copy Pods Resources";
694+
outputFileListPaths = (
695+
);
692696
outputPaths = (
693697
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
694698
);
695699
runOnlyForDeploymentPostprocessing = 0;
696700
shellPath = /bin/sh;
697-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPressAuthenticator/Pods-WordPressAuthenticator-resources.sh\"\n";
701+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPressAuthenticatorTests/Pods-WordPressAuthenticatorTests-resources.sh\"\n";
698702
showEnvVarsInLog = 0;
699703
};
700-
6CD6648B820552D8638F8EDA /* [CP] Check Pods Manifest.lock */ = {
704+
5ABD4390CE7F425565FA9BD2 /* [CP] Copy Pods Resources */ = {
701705
isa = PBXShellScriptBuildPhase;
702706
buildActionMask = 2147483647;
703707
files = (
704708
);
705709
inputPaths = (
706-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
707-
"${PODS_ROOT}/Manifest.lock",
710+
"${SRCROOT}/Pods/Target Support Files/Pods-WordPressAuthenticator/Pods-WordPressAuthenticator-resources.sh",
711+
"${PODS_ROOT}/GoogleSignInRepacked/Resources/GoogleSignIn.bundle",
708712
);
709-
name = "[CP] Check Pods Manifest.lock";
713+
name = "[CP] Copy Pods Resources";
710714
outputPaths = (
711-
"$(DERIVED_FILE_DIR)/Pods-WordPressAuthenticator-checkManifestLockResult.txt",
715+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
712716
);
713717
runOnlyForDeploymentPostprocessing = 0;
714718
shellPath = /bin/sh;
715-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
719+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPressAuthenticator/Pods-WordPressAuthenticator-resources.sh\"\n";
716720
showEnvVarsInLog = 0;
717721
};
718-
71F680A7544A0E8C4C7C945A /* [CP] Copy Pods Resources */ = {
722+
6CD6648B820552D8638F8EDA /* [CP] Check Pods Manifest.lock */ = {
719723
isa = PBXShellScriptBuildPhase;
720724
buildActionMask = 2147483647;
721725
files = (
722726
);
723727
inputPaths = (
724-
"${SRCROOT}/Pods/Target Support Files/Pods-WordPressAuthenticatorTests/Pods-WordPressAuthenticatorTests-resources.sh",
725-
"${PODS_ROOT}/GoogleSignInRepacked/Resources/GoogleSignIn.bundle",
728+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
729+
"${PODS_ROOT}/Manifest.lock",
726730
);
727-
name = "[CP] Copy Pods Resources";
731+
name = "[CP] Check Pods Manifest.lock";
728732
outputPaths = (
729-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
733+
"$(DERIVED_FILE_DIR)/Pods-WordPressAuthenticator-checkManifestLockResult.txt",
730734
);
731735
runOnlyForDeploymentPostprocessing = 0;
732736
shellPath = /bin/sh;
733-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPressAuthenticatorTests/Pods-WordPressAuthenticatorTests-resources.sh\"\n";
737+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
734738
showEnvVarsInLog = 0;
735739
};
736740
C150DDA15A22C70B0B89A809 /* [CP] Check Pods Manifest.lock */ = {

0 commit comments

Comments
 (0)