Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jleandroperez committed Apr 14, 2016
2 parents 512f672 + 44fa921 commit 12a4109
Show file tree
Hide file tree
Showing 23 changed files with 520 additions and 69 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
osx_image: xcode7.1
osx_image: xcode7.3
language: objective-c
xcode_workspace: WordPress-iOS-Shared.xcworkspace
xcode_scheme: WordPress-iOS-Shared
xcode_sdk: iphonesimulator
script:
- set -o pipefail && xcodebuild -workspace WordPress-iOS-Shared.xcworkspace -scheme WordPressShared -sdk iphonesimulator build test ONLY_ACTIVE_ARCH=NO | xcpretty -c
3 changes: 2 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '7.0'
use_frameworks!
platform :ios, '8.0'

pod 'CocoaLumberjack', '~> 2.2.0'

Expand Down
3 changes: 2 additions & 1 deletion WordPress-iOS-Shared-Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
platform :ios, '7.0'
platform :ios, '8.0'
use_frameworks!

target "WordPress-iOS-Shared-Example" do
pod "WordPress-iOS-Shared", :path => "../"
Expand Down
4 changes: 2 additions & 2 deletions WordPress-iOS-Shared-Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ DEPENDENCIES:

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

SPEC CHECKSUMS:
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
WordPress-iOS-Shared: e9e81a6a3cc3b45de93c8a565422c11395813c49
WordPress-iOS-Shared: 99fd974e8831cc02edb48429fa689155c85de79f

COCOAPODS: 0.39.0
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
0E3752D7BFA5FF869DAF7D6B /* Pods_WordPress_iOS_Shared_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849A3B7F7FFC8895BF865DBE /* Pods_WordPress_iOS_Shared_Example.framework */; };
598E77111A8E4F2C0020DC05 /* DeviceTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 598E77101A8E4F2C0020DC05 /* DeviceTableViewController.m */; };
598E77141A8E535F0020DC05 /* DeviceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 598E77131A8E535F0020DC05 /* DeviceTest.m */; };
598E77171A8E53EE0020DC05 /* DeviceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 598E77161A8E53EE0020DC05 /* DeviceTableViewCell.m */; };
Expand All @@ -21,19 +22,18 @@
85A420C51977993100F0F603 /* FontTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 85A420C41977993100F0F603 /* FontTableViewCell.m */; };
85D9A73D1977891600480221 /* FontsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 85D9A73C1977891600480221 /* FontsTableViewController.m */; };
85D9A7401977891F00480221 /* ColorsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 85D9A73F1977891F00480221 /* ColorsTableViewController.m */; };
EC81CE668DE94D458BA9910B /* libPods-WordPress-iOS-Shared-Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 37B298F8355D4CE69AA04521 /* libPods-WordPress-iOS-Shared-Example.a */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
2AE838413EB18EF1792640E7 /* Pods-WordPress-iOS-Shared-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPress-iOS-Shared-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-WordPress-iOS-Shared-Example/Pods-WordPress-iOS-Shared-Example.release.xcconfig"; sourceTree = "<group>"; };
2FEB7BA7F0B0C7DC85D5391A /* Pods-WordPress-iOS-Shared-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPress-iOS-Shared-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WordPress-iOS-Shared-Example/Pods-WordPress-iOS-Shared-Example.debug.xcconfig"; sourceTree = "<group>"; };
37B298F8355D4CE69AA04521 /* libPods-WordPress-iOS-Shared-Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WordPress-iOS-Shared-Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
598E770F1A8E4F2C0020DC05 /* DeviceTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceTableViewController.h; sourceTree = "<group>"; };
598E77101A8E4F2C0020DC05 /* DeviceTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeviceTableViewController.m; sourceTree = "<group>"; };
598E77121A8E535F0020DC05 /* DeviceTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceTest.h; sourceTree = "<group>"; };
598E77131A8E535F0020DC05 /* DeviceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeviceTest.m; sourceTree = "<group>"; };
598E77151A8E53EE0020DC05 /* DeviceTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceTableViewCell.h; sourceTree = "<group>"; };
598E77161A8E53EE0020DC05 /* DeviceTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeviceTableViewCell.m; sourceTree = "<group>"; };
849A3B7F7FFC8895BF865DBE /* Pods_WordPress_iOS_Shared_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WordPress_iOS_Shared_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
852FBB45197755CC002C5249 /* WordPress-iOS-Shared-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "WordPress-iOS-Shared-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
852FBB48197755CC002C5249 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
852FBB4A197755CC002C5249 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -63,7 +63,7 @@
852FBB4B197755CC002C5249 /* CoreGraphics.framework in Frameworks */,
852FBB4D197755CC002C5249 /* UIKit.framework in Frameworks */,
852FBB49197755CC002C5249 /* Foundation.framework in Frameworks */,
EC81CE668DE94D458BA9910B /* libPods-WordPress-iOS-Shared-Example.a in Frameworks */,
0E3752D7BFA5FF869DAF7D6B /* Pods_WordPress_iOS_Shared_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -95,7 +95,7 @@
852FBB4A197755CC002C5249 /* CoreGraphics.framework */,
852FBB4C197755CC002C5249 /* UIKit.framework */,
852FBB6A197755CC002C5249 /* XCTest.framework */,
37B298F8355D4CE69AA04521 /* libPods-WordPress-iOS-Shared-Example.a */,
849A3B7F7FFC8895BF865DBE /* Pods_WordPress_iOS_Shared_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -374,6 +374,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example-Prefix.pch";
INFOPLIST_FILE = "WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
Expand All @@ -388,6 +389,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example-Prefix.pch";
INFOPLIST_FILE = "WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
Expand Down
4 changes: 2 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.5.5"
s.version = "0.5.6"
s.summary = "Shared components used in building the WordPress iOS apps and other library components."

s.description = <<-DESC
Expand All @@ -13,7 +13,7 @@ Pod::Spec.new do |s|
s.license = "GPLv2"
s.author = { "Automattic" => "[email protected]", "Aaron Douglas" => "[email protected]", "Sergio Estevao" => "[email protected]" }
s.social_media_url = "http://twitter.com/WordPressiOS"
s.platform = :ios, "7.0"
s.platform = :ios, "8.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', 'WordPress-iOS-Shared/Private' ]
s.public_header_files = 'WordPress-iOS-Shared/Core/*.h'
Expand Down
Loading

0 comments on commit 12a4109

Please sign in to comment.