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

Commit 12a4109

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 512f672 + 44fa921 commit 12a4109

23 files changed

+520
-69
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
osx_image: xcode7.1
1+
osx_image: xcode7.3
22
language: objective-c
3-
xcode_workspace: WordPress-iOS-Shared.xcworkspace
4-
xcode_scheme: WordPress-iOS-Shared
5-
xcode_sdk: iphonesimulator
3+
script:
4+
- set -o pipefail && xcodebuild -workspace WordPress-iOS-Shared.xcworkspace -scheme WordPressShared -sdk iphonesimulator build test ONLY_ACTIVE_ARCH=NO | xcpretty -c

Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22

3-
platform :ios, '7.0'
3+
use_frameworks!
4+
platform :ios, '8.0'
45

56
pod 'CocoaLumberjack', '~> 2.2.0'
67

WordPress-iOS-Shared-Example/Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
platform :ios, '7.0'
1+
platform :ios, '8.0'
2+
use_frameworks!
23

34
target "WordPress-iOS-Shared-Example" do
45
pod "WordPress-iOS-Shared", :path => "../"

WordPress-iOS-Shared-Example/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ DEPENDENCIES:
1515

1616
EXTERNAL SOURCES:
1717
WordPress-iOS-Shared:
18-
:path: ../
18+
:path: "../"
1919

2020
SPEC CHECKSUMS:
2121
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
22-
WordPress-iOS-Shared: e9e81a6a3cc3b45de93c8a565422c11395813c49
22+
WordPress-iOS-Shared: 99fd974e8831cc02edb48429fa689155c85de79f
2323

2424
COCOAPODS: 0.39.0

WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example.xcodeproj/project.pbxproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

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

2727
/* Begin PBXFileReference section */
2828
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>"; };
2929
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>"; };
30-
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; };
3130
598E770F1A8E4F2C0020DC05 /* DeviceTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceTableViewController.h; sourceTree = "<group>"; };
3231
598E77101A8E4F2C0020DC05 /* DeviceTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeviceTableViewController.m; sourceTree = "<group>"; };
3332
598E77121A8E535F0020DC05 /* DeviceTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceTest.h; sourceTree = "<group>"; };
3433
598E77131A8E535F0020DC05 /* DeviceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeviceTest.m; sourceTree = "<group>"; };
3534
598E77151A8E53EE0020DC05 /* DeviceTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceTableViewCell.h; sourceTree = "<group>"; };
3635
598E77161A8E53EE0020DC05 /* DeviceTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeviceTableViewCell.m; sourceTree = "<group>"; };
36+
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; };
3737
852FBB45197755CC002C5249 /* WordPress-iOS-Shared-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "WordPress-iOS-Shared-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3838
852FBB48197755CC002C5249 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
3939
852FBB4A197755CC002C5249 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -63,7 +63,7 @@
6363
852FBB4B197755CC002C5249 /* CoreGraphics.framework in Frameworks */,
6464
852FBB4D197755CC002C5249 /* UIKit.framework in Frameworks */,
6565
852FBB49197755CC002C5249 /* Foundation.framework in Frameworks */,
66-
EC81CE668DE94D458BA9910B /* libPods-WordPress-iOS-Shared-Example.a in Frameworks */,
66+
0E3752D7BFA5FF869DAF7D6B /* Pods_WordPress_iOS_Shared_Example.framework in Frameworks */,
6767
);
6868
runOnlyForDeploymentPostprocessing = 0;
6969
};
@@ -95,7 +95,7 @@
9595
852FBB4A197755CC002C5249 /* CoreGraphics.framework */,
9696
852FBB4C197755CC002C5249 /* UIKit.framework */,
9797
852FBB6A197755CC002C5249 /* XCTest.framework */,
98-
37B298F8355D4CE69AA04521 /* libPods-WordPress-iOS-Shared-Example.a */,
98+
849A3B7F7FFC8895BF865DBE /* Pods_WordPress_iOS_Shared_Example.framework */,
9999
);
100100
name = Frameworks;
101101
sourceTree = "<group>";
@@ -374,6 +374,7 @@
374374
GCC_PRECOMPILE_PREFIX_HEADER = YES;
375375
GCC_PREFIX_HEADER = "WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example-Prefix.pch";
376376
INFOPLIST_FILE = "WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example-Info.plist";
377+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
377378
PRODUCT_NAME = "$(TARGET_NAME)";
378379
WRAPPER_EXTENSION = app;
379380
};
@@ -388,6 +389,7 @@
388389
GCC_PRECOMPILE_PREFIX_HEADER = YES;
389390
GCC_PREFIX_HEADER = "WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example-Prefix.pch";
390391
INFOPLIST_FILE = "WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example-Info.plist";
392+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
391393
PRODUCT_NAME = "$(TARGET_NAME)";
392394
WRAPPER_EXTENSION = app;
393395
};

WordPress-iOS-Shared.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WordPress-iOS-Shared"
3-
s.version = "0.5.5"
3+
s.version = "0.5.6"
44
s.summary = "Shared components used in building the WordPress iOS apps and other library components."
55

66
s.description = <<-DESC
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
1313
s.license = "GPLv2"
1414
s.author = { "Automattic" => "[email protected]", "Aaron Douglas" => "[email protected]", "Sergio Estevao" => "[email protected]" }
1515
s.social_media_url = "http://twitter.com/WordPressiOS"
16-
s.platform = :ios, "7.0"
16+
s.platform = :ios, "8.0"
1717
s.source = { :git => "https://github.com/wordpress-mobile/WordPress-iOS-Shared.git", :tag => s.version.to_s }
1818
s.source_files = [ 'WordPress-iOS-Shared/Core', 'WordPress-iOS-Shared/Private' ]
1919
s.public_header_files = 'WordPress-iOS-Shared/Core/*.h'

0 commit comments

Comments
 (0)