Skip to content

Commit

Permalink
Merge pull request #81 from wordpress-mobile/fix/cocoapods-framework
Browse files Browse the repository at this point in the history
Adds Cocoapods framework support
  • Loading branch information
koke committed Nov 11, 2015
2 parents 88463e1 + ee48551 commit e963576
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ SPEC CHECKSUMS:
OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
OHHTTPStubs: cc1b9cb45b963daf891aa736f35d29d74308f0c9

COCOAPODS: 0.37.2
COCOAPODS: 0.39.0
36 changes: 18 additions & 18 deletions WordPress-iOS-Shared-Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
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 (2.6.2):
- AFNetworking/NSURLConnection (= 2.6.2)
- AFNetworking/NSURLSession (= 2.6.2)
- AFNetworking/Reachability (= 2.6.2)
- AFNetworking/Security (= 2.6.2)
- AFNetworking/Serialization (= 2.6.2)
- AFNetworking/UIKit (= 2.6.2)
- AFNetworking/NSURLConnection (2.6.2):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/NSURLSession (2.5.4):
- AFNetworking/NSURLSession (2.6.2):
- 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/Reachability (2.6.2)
- AFNetworking/Security (2.6.2)
- AFNetworking/Serialization (2.6.2)
- AFNetworking/UIKit (2.6.2):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- CocoaLumberjack (2.0.0):
Expand All @@ -28,7 +28,7 @@ PODS:
- CocoaLumberjack/Core
- CocoaLumberjack/Extensions (2.0.0):
- CocoaLumberjack/Default
- WordPress-iOS-Shared (0.4.3):
- WordPress-iOS-Shared (0.5.0):
- AFNetworking (~> 2.5)
- CocoaLumberjack (= 2.0.0)

Expand All @@ -37,11 +37,11 @@ DEPENDENCIES:

EXTERNAL SOURCES:
WordPress-iOS-Shared:
:path: ../
:path: "../"

SPEC CHECKSUMS:
AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
AFNetworking: 7f317038a9710cabfa43ec56396b307b45df72ab
CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
WordPress-iOS-Shared: 20307f6ca50f833cf6bbf98f3a7ef7643d90ce8c
WordPress-iOS-Shared: 5480e7b5c9c55158ea22c89ff44fca5597852224

COCOAPODS: 0.37.2
COCOAPODS: 0.39.0
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
852FBB42197755CC002C5249 /* Frameworks */,
852FBB43197755CC002C5249 /* Resources */,
BB9A98FF658A4D29953551D1 /* Copy Pods Resources */,
20790AE04201DFFC0FF9F3EB /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -207,6 +208,21 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
20790AE04201DFFC0FF9F3EB /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPress-iOS-Shared-Example/Pods-WordPress-iOS-Shared-Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
601245E04F1A43469E176EE1 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "ColorsTableViewController.h"
#import <WordPress-iOS-Shared/WPStyleGuide.h>
#import <WordPressShared/WPStyleGuide.h>

@interface ColorsTableViewController ()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#import "DeviceTableViewCell.h"
#import "DeviceTest.h"
#import "FontTableViewCell.h"
#import <WordPress-iOS-Shared/WPDeviceIdentification.h>
#import <WordPress-iOS-Shared/WPStyleGuide.h>
#import <WordPress-iOS-Shared/WPFontManager.h>
#import <WordPressShared/WPDeviceIdentification.h>
#import <WordPressShared/WPStyleGuide.h>
#import <WordPressShared/WPFontManager.h>

@interface DeviceTableViewController ()

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "FontsTableViewController.h"
#import "FontTableViewCell.h"
#import <WordPress-iOS-Shared/WPStyleGuide.h>
#import <WordPress-iOS-Shared/WPFontManager.h>
#import <WordPressShared/WPStyleGuide.h>
#import <WordPressShared/WPFontManager.h>

static const CGFloat FontSize = 20.0;

Expand Down
6 changes: 4 additions & 2 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.4.4"
s.version = "0.5.0"
s.summary = "Shared components used in building the WordPress iOS apps and other library components."

s.description = <<-DESC
Expand All @@ -15,11 +15,13 @@ Pod::Spec.new do |s|
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 }
s.source_files = 'WordPress-iOS-Shared/Core'
s.source_files = [ 'WordPress-iOS-Shared/Core', 'WordPress-iOS-Shared/Private' ]
s.public_header_files = 'WordPress-iOS-Shared/Core/*.h'
s.ios.resource_bundle = { 'WordPress-iOS-Shared' => 'WordPress-iOS-Shared/Assets/*.{ttf,otf}' }
s.exclude_files = 'WordPress-iOS-Shared/Exclude'
s.prefix_header_file = "WordPress-iOS-Shared/WordPress-iOS-Shared-Prefix.pch"
s.requires_arc = true
s.header_dir = 'WordPressShared'

s.dependency 'AFNetworking', '~> 2.5'
s.dependency 'CocoaLumberjack', '= 2.0.0'
Expand Down
32 changes: 28 additions & 4 deletions WordPress-iOS-Shared.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
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; name = WPAnimatedImageResponseSerializer.h; path = Core/WPAnimatedImageResponseSerializer.h; sourceTree = "<group>"; };
9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WPAnimatedImageResponseSerializer.m; path = Core/WPAnimatedImageResponseSerializer.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 @@ -168,6 +168,7 @@
931A0FEF192A9CDD00D3CC11 /* WordPress-iOS-Shared */ = {
isa = PBXGroup;
children = (
E13D93EF1BF235BA00CCBA7C /* Private */,
E154809F1A43035700FA4EDD /* Core */,
931A0FF0192A9CDD00D3CC11 /* Supporting Files */,
);
Expand Down Expand Up @@ -210,8 +211,6 @@
children = (
744DA844194F3A76002CD6E9 /* UIImage+Util.h */,
744DA845194F3A76002CD6E9 /* UIImage+Util.m */,
9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */,
9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */,
931A101A192A9DA500D3CC11 /* WPImageSource.h */,
931A101B192A9DA500D3CC11 /* WPImageSource.m */,
931A1014192A9D5200D3CC11 /* NSString+Util.h */,
Expand Down Expand Up @@ -265,6 +264,15 @@
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 Down Expand Up @@ -316,6 +324,7 @@
931A0FF7192A9CDD00D3CC11 /* Frameworks */,
931A0FF8192A9CDD00D3CC11 /* Resources */,
01EFB93CB9504D3780477772 /* Copy Pods Resources */,
0DD01DEF03ABC712BB9DEA89 /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -397,6 +406,21 @@
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
0DD01DEF03ABC712BB9DEA89 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPress-iOS-SharedTests/Pods-WordPress-iOS-SharedTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D2BBEB69E91E4B0798D536DF /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down

0 comments on commit e963576

Please sign in to comment.