Skip to content

Commit

Permalink
Merge branch 'release/0.5.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
SergioEstevao committed Apr 13, 2016
2 parents 0ed676e + e41bd51 commit 512f672
Show file tree
Hide file tree
Showing 12 changed files with 155 additions and 259 deletions.
6 changes: 3 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '7.0'
pod 'AFNetworking', '~> 2.5'
pod 'CocoaLumberjack', '= 2.0.0'

pod 'CocoaLumberjack', '~> 2.2.0'

target 'WordPress-iOS-SharedTests', :exclusive => true do
pod 'OHHTTPStubs', '3.1.1'
pod 'OHHTTPStubs'
pod 'OCMock'
end
61 changes: 25 additions & 36 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,46 +1,35 @@
PODS:
- AFNetworking (2.5.4):
- AFNetworking/NSURLConnection (= 2.5.4)
- AFNetworking/NSURLSession (= 2.5.4)
- AFNetworking/Reachability (= 2.5.4)
- AFNetworking/Security (= 2.5.4)
- AFNetworking/Serialization (= 2.5.4)
- AFNetworking/UIKit (= 2.5.4)
- AFNetworking/NSURLConnection (2.5.4):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/NSURLSession (2.5.4):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/Reachability (2.5.4)
- AFNetworking/Security (2.5.4)
- AFNetworking/Serialization (2.5.4)
- AFNetworking/UIKit (2.5.4):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- CocoaLumberjack (2.0.0):
- CocoaLumberjack/Default (= 2.0.0)
- CocoaLumberjack/Extensions (= 2.0.0)
- CocoaLumberjack/Core (2.0.0)
- CocoaLumberjack/Default (2.0.0):
- CocoaLumberjack (2.2.0):
- CocoaLumberjack/Default (= 2.2.0)
- CocoaLumberjack/Extensions (= 2.2.0)
- CocoaLumberjack/Core (2.2.0)
- CocoaLumberjack/Default (2.2.0):
- CocoaLumberjack/Core
- CocoaLumberjack/Extensions (2.0.0):
- CocoaLumberjack/Extensions (2.2.0):
- CocoaLumberjack/Default
- OCMock (3.1.2)
- OHHTTPStubs (3.1.1)
- OCMock (3.2.2)
- OHHTTPStubs (5.0.0):
- OHHTTPStubs/Default (= 5.0.0)
- OHHTTPStubs/Core (5.0.0)
- OHHTTPStubs/Default (5.0.0):
- OHHTTPStubs/Core
- OHHTTPStubs/JSON
- OHHTTPStubs/NSURLSession
- OHHTTPStubs/OHPathHelpers
- OHHTTPStubs/JSON (5.0.0):
- OHHTTPStubs/Core
- OHHTTPStubs/NSURLSession (5.0.0):
- OHHTTPStubs/Core
- OHHTTPStubs/OHPathHelpers (5.0.0)

DEPENDENCIES:
- AFNetworking (~> 2.5)
- CocoaLumberjack (= 2.0.0)
- CocoaLumberjack (~> 2.2.0)
- OCMock
- OHHTTPStubs (= 3.1.1)
- OHHTTPStubs

SPEC CHECKSUMS:
AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
OHHTTPStubs: cc1b9cb45b963daf891aa736f35d29d74308f0c9
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
OCMock: 18c9b7e67d4c2770e95bb77a9cc1ae0c91fe3835
OHHTTPStubs: a5d2e9eea07869d42ec03338325f398bc520e159

COCOAPODS: 0.39.0
27 changes: 2 additions & 25 deletions WordPress-iOS-Shared-Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,25 +1,4 @@
PODS:
- AFNetworking (2.6.3):
- AFNetworking/NSURLConnection (= 2.6.3)
- AFNetworking/NSURLSession (= 2.6.3)
- AFNetworking/Reachability (= 2.6.3)
- AFNetworking/Security (= 2.6.3)
- AFNetworking/Serialization (= 2.6.3)
- AFNetworking/UIKit (= 2.6.3)
- AFNetworking/NSURLConnection (2.6.3):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/NSURLSession (2.6.3):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/Reachability (2.6.3)
- AFNetworking/Security (2.6.3)
- AFNetworking/Serialization (2.6.3)
- AFNetworking/UIKit (2.6.3):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- CocoaLumberjack (2.2.0):
- CocoaLumberjack/Default (= 2.2.0)
- CocoaLumberjack/Extensions (= 2.2.0)
Expand All @@ -28,8 +7,7 @@ PODS:
- CocoaLumberjack/Core
- CocoaLumberjack/Extensions (2.2.0):
- CocoaLumberjack/Default
- WordPress-iOS-Shared (0.5.3):
- AFNetworking (~> 2.5)
- WordPress-iOS-Shared (0.5.5):
- CocoaLumberjack (~> 2.2.0)

DEPENDENCIES:
Expand All @@ -40,8 +18,7 @@ EXTERNAL SOURCES:
:path: ../

SPEC CHECKSUMS:
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
WordPress-iOS-Shared: 43f55f24f0685e431167084071b7914d7c7134a8
WordPress-iOS-Shared: e9e81a6a3cc3b45de93c8a565422c11395813c49

COCOAPODS: 0.39.0
7 changes: 3 additions & 4 deletions WordPress-iOS-Shared.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "WordPress-iOS-Shared"
s.version = "0.5.4"
s.version = "0.5.5"
s.summary = "Shared components used in building the WordPress iOS apps and other library components."

s.description = <<-DESC
Expand All @@ -9,9 +9,9 @@ Pod::Spec.new do |s|
This is the first step required to build WordPress-iOS with UI components.
DESC

s.homepage = "http://apps.wordpress.org"
s.homepage = "http://apps.wordpress.com"
s.license = "GPLv2"
s.author = { "Aaron Douglas" => "[email protected]" }
s.author = { "Automattic" => "[email protected]", "Aaron Douglas" => "astralbodies@gmail.com", "Sergio Estevao" => "sergioestevao@gmail.com" }
s.social_media_url = "http://twitter.com/WordPressiOS"
s.platform = :ios, "7.0"
s.source = { :git => "https://github.com/wordpress-mobile/WordPress-iOS-Shared.git", :tag => s.version.to_s }
Expand All @@ -23,6 +23,5 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.header_dir = 'WordPressShared'

s.dependency 'AFNetworking', '~> 2.5'
s.dependency 'CocoaLumberjack', '~> 2.2.0'
end
40 changes: 20 additions & 20 deletions WordPress-iOS-Shared.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
744DA846194F3A76002CD6E9 /* UIImage+Util.m in Sources */ = {isa = PBXBuildFile; fileRef = 744DA845194F3A76002CD6E9 /* UIImage+Util.m */; };
7462F3401961FAAB00CC8EED /* WPFontManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 74F535F71961F7E6002D4320 /* WPFontManager.m */; };
9309B52D192BEECC00B69F69 /* WordPressShared.m in Sources */ = {isa = PBXBuildFile; fileRef = 9309B52C192BEECC00B69F69 /* WordPressShared.m */; };
9309B533192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */; };
931A0FEE192A9CDD00D3CC11 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 931A0FED192A9CDD00D3CC11 /* Foundation.framework */; };
931A0FFC192A9CDD00D3CC11 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 931A0FFB192A9CDD00D3CC11 /* XCTest.framework */; };
931A0FFD192A9CDD00D3CC11 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 931A0FED192A9CDD00D3CC11 /* Foundation.framework */; };
Expand All @@ -29,10 +28,10 @@
931A102E192A9E3200D3CC11 /* WPTableViewSectionHeaderFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 931A102B192A9E3200D3CC11 /* WPTableViewSectionHeaderFooterView.m */; };
931A1035192AA03600D3CC11 /* UIColor+Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 931A1034192AA03600D3CC11 /* UIColor+Helpers.m */; };
931A1038192AA34300D3CC11 /* WPImageSourceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 931A1037192AA34300D3CC11 /* WPImageSourceTest.m */; };
931A103B192AA35B00D3CC11 /* AsyncTestHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 931A103A192AA35B00D3CC11 /* AsyncTestHelper.m */; };
931A103E192AA3DB00D3CC11 /* test-image.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 931A103D192AA3DB00D3CC11 /* test-image.jpg */; };
F45AF04D6E344F4CBD2A4B65 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AB8B405468864FD7A0D16B74 /* libPods.a */; };
FF8DDCE11B5E91050098826F /* WPTextFieldTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FF8DDCE01B5E91050098826F /* WPTextFieldTableViewCell.m */; };
FFBC2B371CBBE10300B0379E /* anim-reader.gif in Resources */ = {isa = PBXBuildFile; fileRef = FFBC2B361CBBE10300B0379E /* anim-reader.gif */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -68,8 +67,6 @@
897FA2B40A6E81DB4E7F0435 /* Pods-WordPress-iOS-SharedTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPress-iOS-SharedTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WordPress-iOS-SharedTests/Pods-WordPress-iOS-SharedTests.debug.xcconfig"; sourceTree = "<group>"; };
9309B52B192BEECC00B69F69 /* WordPressShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WordPressShared.h; path = Exclude/WordPressShared.h; sourceTree = "<group>"; };
9309B52C192BEECC00B69F69 /* WordPressShared.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WordPressShared.m; path = Exclude/WordPressShared.m; sourceTree = "<group>"; };
9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WPAnimatedImageResponseSerializer.h; sourceTree = "<group>"; };
9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPAnimatedImageResponseSerializer.m; sourceTree = "<group>"; };
931A0FEA192A9CDD00D3CC11 /* libWordPress-iOS-Shared.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libWordPress-iOS-Shared.a"; sourceTree = BUILT_PRODUCTS_DIR; };
931A0FED192A9CDD00D3CC11 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
931A0FF1192A9CDD00D3CC11 /* WordPress-iOS-Shared-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WordPress-iOS-Shared-Prefix.pch"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -98,14 +95,17 @@
931A1033192AA03600D3CC11 /* UIColor+Helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIColor+Helpers.h"; path = "Core/UIColor+Helpers.h"; sourceTree = "<group>"; };
931A1034192AA03600D3CC11 /* UIColor+Helpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIColor+Helpers.m"; path = "Core/UIColor+Helpers.m"; sourceTree = "<group>"; };
931A1037192AA34300D3CC11 /* WPImageSourceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPImageSourceTest.m; sourceTree = "<group>"; };
931A1039192AA35B00D3CC11 /* AsyncTestHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncTestHelper.h; sourceTree = "<group>"; };
931A103A192AA35B00D3CC11 /* AsyncTestHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AsyncTestHelper.m; sourceTree = "<group>"; };
931A103D192AA3DB00D3CC11 /* test-image.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "test-image.jpg"; sourceTree = "<group>"; };
98398B801DD76BC0326A4729 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
A7CDA9068CC847B2AD67DE41 /* libPods-WordPress-iOS-SharedTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WordPress-iOS-SharedTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
AB8B405468864FD7A0D16B74 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
E95607083C359C14B48BA503 /* Pods-WordPress-iOS-SharedTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPress-iOS-SharedTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-WordPress-iOS-SharedTests/Pods-WordPress-iOS-SharedTests.release.xcconfig"; sourceTree = "<group>"; };
FF14587C1CBE6D37004A5A0B /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
FF14587D1CBE6D37004A5A0B /* Podfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; };
FF14587E1CBE6D37004A5A0B /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
FF1458801CBE6D59004A5A0B /* WordPress-iOS-Shared.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "WordPress-iOS-Shared.podspec"; sourceTree = "<group>"; };
FF8DDCE01B5E91050098826F /* WPTextFieldTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WPTextFieldTableViewCell.m; path = Core/WPTextFieldTableViewCell.m; sourceTree = "<group>"; };
FFBC2B361CBBE10300B0379E /* anim-reader.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "anim-reader.gif"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -136,6 +136,7 @@
931A0FE1192A9CDD00D3CC11 = {
isa = PBXGroup;
children = (
FF14587B1CBE6D24004A5A0B /* Podspec Metadata */,
931A0FEF192A9CDD00D3CC11 /* WordPress-iOS-Shared */,
931A1003192A9CDD00D3CC11 /* WordPress-iOS-SharedTests */,
931A0FEC192A9CDD00D3CC11 /* Frameworks */,
Expand Down Expand Up @@ -168,7 +169,6 @@
931A0FEF192A9CDD00D3CC11 /* WordPress-iOS-Shared */ = {
isa = PBXGroup;
children = (
E13D93EF1BF235BA00CCBA7C /* Private */,
E154809F1A43035700FA4EDD /* Core */,
931A0FF0192A9CDD00D3CC11 /* Supporting Files */,
);
Expand Down Expand Up @@ -198,8 +198,6 @@
931A1004192A9CDD00D3CC11 /* Supporting Files */ = {
isa = PBXGroup;
children = (
931A1039192AA35B00D3CC11 /* AsyncTestHelper.h */,
931A103A192AA35B00D3CC11 /* AsyncTestHelper.m */,
931A1005192A9CDD00D3CC11 /* WordPress-iOS-SharedTests-Info.plist */,
931A1006192A9CDD00D3CC11 /* InfoPlist.strings */,
);
Expand Down Expand Up @@ -259,20 +257,12 @@
931A103C192AA3B500D3CC11 /* Test Data */ = {
isa = PBXGroup;
children = (
FFBC2B361CBBE10300B0379E /* anim-reader.gif */,
931A103D192AA3DB00D3CC11 /* test-image.jpg */,
);
name = "Test Data";
sourceTree = "<group>";
};
E13D93EF1BF235BA00CCBA7C /* Private */ = {
isa = PBXGroup;
children = (
9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */,
9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */,
);
path = Private;
sourceTree = "<group>";
};
E154809F1A43035700FA4EDD /* Core */ = {
isa = PBXGroup;
children = (
Expand All @@ -293,6 +283,17 @@
name = Pods;
sourceTree = "<group>";
};
FF14587B1CBE6D24004A5A0B /* Podspec Metadata */ = {
isa = PBXGroup;
children = (
FF1458801CBE6D59004A5A0B /* WordPress-iOS-Shared.podspec */,
FF14587C1CBE6D37004A5A0B /* README.md */,
FF14587D1CBE6D37004A5A0B /* Podfile */,
FF14587E1CBE6D37004A5A0B /* LICENSE */,
);
name = "Podspec Metadata";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -369,6 +370,7 @@
buildActionMask = 2147483647;
files = (
931A1008192A9CDD00D3CC11 /* InfoPlist.strings in Resources */,
FFBC2B371CBBE10300B0379E /* anim-reader.gif in Resources */,
931A103E192AA3DB00D3CC11 /* test-image.jpg in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -468,7 +470,6 @@
744DA846194F3A76002CD6E9 /* UIImage+Util.m in Sources */,
931A1020192A9DD500D3CC11 /* WPNoResultsView.m in Sources */,
931A1026192A9E0B00D3CC11 /* WPNUXUtility.m in Sources */,
9309B533192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m in Sources */,
931A1035192AA03600D3CC11 /* UIColor+Helpers.m in Sources */,
931A1019192A9D6E00D3CC11 /* NSString+XMLExtensions.m in Sources */,
931A101C192A9DA500D3CC11 /* WPImageSource.m in Sources */,
Expand All @@ -480,7 +481,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
931A103B192AA35B00D3CC11 /* AsyncTestHelper.m in Sources */,
931A1038192AA34300D3CC11 /* WPImageSourceTest.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Loading

0 comments on commit 512f672

Please sign in to comment.