From ee4855172dc0b46cd236828638bd563623349230 Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Wed, 11 Nov 2015 12:57:42 +0100 Subject: [PATCH] Fixed sample project --- WordPress-iOS-Shared-Example/Podfile.lock | 36 +++++++++---------- .../project.pbxproj | 16 +++++++++ .../ColorsTableViewController.m | 2 +- .../DeviceTableViewController.m | 6 ++-- .../FontsTableViewController.m | 4 +-- 5 files changed, 40 insertions(+), 24 deletions(-) diff --git a/WordPress-iOS-Shared-Example/Podfile.lock b/WordPress-iOS-Shared-Example/Podfile.lock index a5a49ff..5506677 100644 --- a/WordPress-iOS-Shared-Example/Podfile.lock +++ b/WordPress-iOS-Shared-Example/Podfile.lock @@ -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): @@ -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) @@ -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 diff --git a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example.xcodeproj/project.pbxproj b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example.xcodeproj/project.pbxproj index 5edf679..cc09d2c 100644 --- a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example.xcodeproj/project.pbxproj +++ b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example.xcodeproj/project.pbxproj @@ -156,6 +156,7 @@ 852FBB42197755CC002C5249 /* Frameworks */, 852FBB43197755CC002C5249 /* Resources */, BB9A98FF658A4D29953551D1 /* Copy Pods Resources */, + 20790AE04201DFFC0FF9F3EB /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -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; diff --git a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/ColorsTableViewController.m b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/ColorsTableViewController.m index c82c2a4..d8c42bd 100644 --- a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/ColorsTableViewController.m +++ b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/ColorsTableViewController.m @@ -1,5 +1,5 @@ #import "ColorsTableViewController.h" -#import +#import @interface ColorsTableViewController () diff --git a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/DeviceTableViewController.m b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/DeviceTableViewController.m index 4a825e7..7dcc34a 100644 --- a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/DeviceTableViewController.m +++ b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/DeviceTableViewController.m @@ -2,9 +2,9 @@ #import "DeviceTableViewCell.h" #import "DeviceTest.h" #import "FontTableViewCell.h" -#import -#import -#import +#import +#import +#import @interface DeviceTableViewController () diff --git a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/FontsTableViewController.m b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/FontsTableViewController.m index c3270d3..12c0614 100644 --- a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/FontsTableViewController.m +++ b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/FontsTableViewController.m @@ -1,7 +1,7 @@ #import "FontsTableViewController.h" #import "FontTableViewCell.h" -#import -#import +#import +#import static const CGFloat FontSize = 20.0;