From 8433243f049dcef51815a843b7f5692306c734e5 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Thu, 31 Dec 2015 07:32:59 +0000 Subject: [PATCH 1/8] Update toe 1.0.0.b1 --- app/CocoaPods/Supporting Files/Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/CocoaPods/Supporting Files/Info.plist b/app/CocoaPods/Supporting Files/Info.plist index 6a8da6f4..611d6d9f 100644 --- a/app/CocoaPods/Supporting Files/Info.plist +++ b/app/CocoaPods/Supporting Files/Info.plist @@ -56,7 +56,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.39.0 + 1.0.0.beta.1 CFBundleSignature ???? CFBundleURLTypes @@ -73,7 +73,7 @@ CFBundleVersion - 0.39.0 + 1.0.0.beta.1 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright From 17af94c2cbb328428bf2540d71b93f720ec9b95c Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Thu, 31 Dec 2015 07:33:20 +0000 Subject: [PATCH 2/8] increase label size for version number --- app/CocoaPods/Base.lproj/CPHomeWindowController.xib | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/CocoaPods/Base.lproj/CPHomeWindowController.xib b/app/CocoaPods/Base.lproj/CPHomeWindowController.xib index 9c7692cc..50293308 100644 --- a/app/CocoaPods/Base.lproj/CPHomeWindowController.xib +++ b/app/CocoaPods/Base.lproj/CPHomeWindowController.xib @@ -189,7 +189,7 @@ - + @@ -284,7 +284,7 @@ Command-Line Tools? - -> Alamofire (3.1.4) + -> Alamofire (3.1.4) Elegant HTTP Networking in Swift pod 'Alamofire', '~> 3.1.4' - Homepage: https://github.com/Alamofire/Alamofire @@ -299,7 +299,7 @@ Command-Line Tools? - Versions: 0.3.3, 0.3.2, 0.3.1, 0.3, 0.2, 0.1 [master repo] - Subspecs: - RxAlamofire/Core (0.3.3) - - RxAlamofire/RxCocoa (0.3.3) + - RxAlamofire/RxCocoa (0.3.3) From fece7e3de3897baf6b4d4fd3d03140b71926531f Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Thu, 31 Dec 2015 07:35:12 +0000 Subject: [PATCH 3/8] use cp 1.0.0b1 in the plugins dependency --- cocoapods-plugins-install/cocoapods-plugins-install.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocoapods-plugins-install/cocoapods-plugins-install.gemspec b/cocoapods-plugins-install/cocoapods-plugins-install.gemspec index f3c301ec..1dd0b0cb 100644 --- a/cocoapods-plugins-install/cocoapods-plugins-install.gemspec +++ b/cocoapods-plugins-install/cocoapods-plugins-install.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_runtime_dependency "cocoapods-plugins", "~> 0" + spec.add_runtime_dependency "cocoapods-plugins", "1.0.0.beta.1" spec.add_development_dependency "bundler", "~> 1.10" spec.add_development_dependency "rake", "~> 10.4" From 864f7b46ac7f14a9deff852bbaefdd9c488c7137 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Wed, 6 Jan 2016 09:53:02 +0000 Subject: [PATCH 4/8] [rakefile] use release platform sdk --- Rakefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index ce86e0f3..978653cb 100644 --- a/Rakefile +++ b/Rakefile @@ -3,7 +3,10 @@ VERBOSE = !!RakeFileUtils.verbose_flag RELEASE_PLATFORM = '10.11' DEPLOYMENT_TARGET = '10.10' -DEPLOYMENT_TARGET_SDK = "MacOSX#{DEPLOYMENT_TARGET}.sdk" + +# Ideally this would be deployment target, but +# we use generics which didn't exist in 10.10. +DEPLOYMENT_TARGET_SDK = "MacOSX#{RELEASE_PLATFORM}.sdk" $build_started_at = Time.now at_exit do From a605ff7ca65df04a5bc9e7e0d737b11ae73b8b3f Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Wed, 6 Jan 2016 12:28:51 +0000 Subject: [PATCH 5/8] [rakefile] Look into deployment on 1.0.0.b.2 --- app/CocoaPods/CPAppDelegate.m | 1 + app/CocoaPods/Supporting Files/Info.plist | 4 +- test/Podfile | 14 +- test/Test/Test.xcodeproj/project.pbxproj | 305 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + test/Test/Test/AppDelegate.h | 17 + test/Test/Test/AppDelegate.m | 45 +++ .../AppIcon.appiconset/Contents.json | 38 +++ .../Test/Base.lproj/LaunchScreen.storyboard | 27 ++ test/Test/Test/Base.lproj/Main.storyboard | 25 ++ test/Test/Test/Info.plist | 40 +++ test/Test/Test/ViewController.h | 15 + test/Test/Test/ViewController.m | 27 ++ test/Test/Test/main.m | 16 + 14 files changed, 573 insertions(+), 8 deletions(-) create mode 100644 test/Test/Test.xcodeproj/project.pbxproj create mode 100644 test/Test/Test.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 test/Test/Test/AppDelegate.h create mode 100644 test/Test/Test/AppDelegate.m create mode 100644 test/Test/Test/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 test/Test/Test/Base.lproj/LaunchScreen.storyboard create mode 100644 test/Test/Test/Base.lproj/Main.storyboard create mode 100644 test/Test/Test/Info.plist create mode 100644 test/Test/Test/ViewController.h create mode 100644 test/Test/Test/ViewController.m create mode 100644 test/Test/Test/main.m diff --git a/app/CocoaPods/CPAppDelegate.m b/app/CocoaPods/CPAppDelegate.m index 2ceeae53..a67a372a 100644 --- a/app/CocoaPods/CPAppDelegate.m +++ b/app/CocoaPods/CPAppDelegate.m @@ -6,6 +6,7 @@ #import "CPCLIToolInstallationController.h" #import + @interface CPAppDelegate () @property (nonatomic, strong) CPHomeWindowController *homeWindowController; @property (strong) NSXPCConnection *reflectionService; diff --git a/app/CocoaPods/Supporting Files/Info.plist b/app/CocoaPods/Supporting Files/Info.plist index 611d6d9f..bc622fbc 100644 --- a/app/CocoaPods/Supporting Files/Info.plist +++ b/app/CocoaPods/Supporting Files/Info.plist @@ -56,7 +56,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0.beta.1 + 1.0.0.beta.2 CFBundleSignature ???? CFBundleURLTypes @@ -73,7 +73,7 @@ CFBundleVersion - 1.0.0.beta.1 + 1.0.0.beta.2 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/test/Podfile b/test/Podfile index 894f8efc..ba7867e4 100644 --- a/test/Podfile +++ b/test/Podfile @@ -1,4 +1,4 @@ -install :cocoapods, :integrate_targets => false +install! "cocoapods", :integrate_targets => false platform :ios, '8' @@ -10,9 +10,11 @@ pods = [ # TODO no public bazaar repos? :/ ] -cache_dir = File.expand_path('~/Library/Caches/CocoaPods/Pods/Release') -pods.each do |name| - # Ensure the downloaders are actually tested. - FileUtils.rm_rf(File.join(cache_dir, name)) - pod(name) +target "Test" do + cache_dir = File.expand_path('~/Library/Caches/CocoaPods/Pods/Release') + pods.each do |name| + # Ensure the downloaders are actually tested. + FileUtils.rm_rf(File.join(cache_dir, name)) + pod(name) + end end diff --git a/test/Test/Test.xcodeproj/project.pbxproj b/test/Test/Test.xcodeproj/project.pbxproj new file mode 100644 index 00000000..3cd85bd3 --- /dev/null +++ b/test/Test/Test.xcodeproj/project.pbxproj @@ -0,0 +1,305 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 60F647D11C3D3E5000BB93FB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 60F647D01C3D3E5000BB93FB /* main.m */; }; + 60F647D41C3D3E5000BB93FB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 60F647D31C3D3E5000BB93FB /* AppDelegate.m */; }; + 60F647D71C3D3E5000BB93FB /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 60F647D61C3D3E5000BB93FB /* ViewController.m */; }; + 60F647DA1C3D3E5000BB93FB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60F647D81C3D3E5000BB93FB /* Main.storyboard */; }; + 60F647DC1C3D3E5000BB93FB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 60F647DB1C3D3E5000BB93FB /* Assets.xcassets */; }; + 60F647DF1C3D3E5000BB93FB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60F647DD1C3D3E5000BB93FB /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 60F647CC1C3D3E5000BB93FB /* Test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Test.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 60F647D01C3D3E5000BB93FB /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 60F647D21C3D3E5000BB93FB /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 60F647D31C3D3E5000BB93FB /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 60F647D51C3D3E5000BB93FB /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + 60F647D61C3D3E5000BB93FB /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; + 60F647D91C3D3E5000BB93FB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 60F647DB1C3D3E5000BB93FB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 60F647DE1C3D3E5000BB93FB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 60F647E01C3D3E5000BB93FB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 60F647C91C3D3E5000BB93FB /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 60F647C31C3D3E5000BB93FB = { + isa = PBXGroup; + children = ( + 60F647CE1C3D3E5000BB93FB /* Test */, + 60F647CD1C3D3E5000BB93FB /* Products */, + ); + sourceTree = ""; + }; + 60F647CD1C3D3E5000BB93FB /* Products */ = { + isa = PBXGroup; + children = ( + 60F647CC1C3D3E5000BB93FB /* Test.app */, + ); + name = Products; + sourceTree = ""; + }; + 60F647CE1C3D3E5000BB93FB /* Test */ = { + isa = PBXGroup; + children = ( + 60F647D21C3D3E5000BB93FB /* AppDelegate.h */, + 60F647D31C3D3E5000BB93FB /* AppDelegate.m */, + 60F647D51C3D3E5000BB93FB /* ViewController.h */, + 60F647D61C3D3E5000BB93FB /* ViewController.m */, + 60F647D81C3D3E5000BB93FB /* Main.storyboard */, + 60F647DB1C3D3E5000BB93FB /* Assets.xcassets */, + 60F647DD1C3D3E5000BB93FB /* LaunchScreen.storyboard */, + 60F647E01C3D3E5000BB93FB /* Info.plist */, + 60F647CF1C3D3E5000BB93FB /* Supporting Files */, + ); + path = Test; + sourceTree = ""; + }; + 60F647CF1C3D3E5000BB93FB /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 60F647D01C3D3E5000BB93FB /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 60F647CB1C3D3E5000BB93FB /* Test */ = { + isa = PBXNativeTarget; + buildConfigurationList = 60F647E31C3D3E5000BB93FB /* Build configuration list for PBXNativeTarget "Test" */; + buildPhases = ( + 60F647C81C3D3E5000BB93FB /* Sources */, + 60F647C91C3D3E5000BB93FB /* Frameworks */, + 60F647CA1C3D3E5000BB93FB /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Test; + productName = Test; + productReference = 60F647CC1C3D3E5000BB93FB /* Test.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 60F647C41C3D3E5000BB93FB /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0720; + ORGANIZATIONNAME = CocoaPods; + TargetAttributes = { + 60F647CB1C3D3E5000BB93FB = { + CreatedOnToolsVersion = 7.2; + }; + }; + }; + buildConfigurationList = 60F647C71C3D3E5000BB93FB /* Build configuration list for PBXProject "Test" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 60F647C31C3D3E5000BB93FB; + productRefGroup = 60F647CD1C3D3E5000BB93FB /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 60F647CB1C3D3E5000BB93FB /* Test */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 60F647CA1C3D3E5000BB93FB /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 60F647DF1C3D3E5000BB93FB /* LaunchScreen.storyboard in Resources */, + 60F647DC1C3D3E5000BB93FB /* Assets.xcassets in Resources */, + 60F647DA1C3D3E5000BB93FB /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 60F647C81C3D3E5000BB93FB /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 60F647D71C3D3E5000BB93FB /* ViewController.m in Sources */, + 60F647D41C3D3E5000BB93FB /* AppDelegate.m in Sources */, + 60F647D11C3D3E5000BB93FB /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 60F647D81C3D3E5000BB93FB /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 60F647D91C3D3E5000BB93FB /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 60F647DD1C3D3E5000BB93FB /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 60F647DE1C3D3E5000BB93FB /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 60F647E11C3D3E5000BB93FB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.2; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + }; + name = Debug; + }; + 60F647E21C3D3E5000BB93FB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.2; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 60F647E41C3D3E5000BB93FB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = Test/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.Test; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 60F647E51C3D3E5000BB93FB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = Test/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.Test; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 60F647C71C3D3E5000BB93FB /* Build configuration list for PBXProject "Test" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 60F647E11C3D3E5000BB93FB /* Debug */, + 60F647E21C3D3E5000BB93FB /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 60F647E31C3D3E5000BB93FB /* Build configuration list for PBXNativeTarget "Test" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 60F647E41C3D3E5000BB93FB /* Debug */, + 60F647E51C3D3E5000BB93FB /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 60F647C41C3D3E5000BB93FB /* Project object */; +} diff --git a/test/Test/Test.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/test/Test/Test.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..87cc241f --- /dev/null +++ b/test/Test/Test.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/test/Test/Test/AppDelegate.h b/test/Test/Test/AppDelegate.h new file mode 100644 index 00000000..77d662e7 --- /dev/null +++ b/test/Test/Test/AppDelegate.h @@ -0,0 +1,17 @@ +// +// AppDelegate.h +// Test +// +// Created by Orta Therox on 06/01/2016. +// Copyright © 2016 CocoaPods. All rights reserved. +// + +#import + +@interface AppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + + +@end + diff --git a/test/Test/Test/AppDelegate.m b/test/Test/Test/AppDelegate.m new file mode 100644 index 00000000..89ba54ca --- /dev/null +++ b/test/Test/Test/AppDelegate.m @@ -0,0 +1,45 @@ +// +// AppDelegate.m +// Test +// +// Created by Orta Therox on 06/01/2016. +// Copyright © 2016 CocoaPods. All rights reserved. +// + +#import "AppDelegate.h" + +@interface AppDelegate () + +@end + +@implementation AppDelegate + + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + // Override point for customization after application launch. + return YES; +} + +- (void)applicationWillResignActive:(UIApplication *)application { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. +} + +- (void)applicationDidEnterBackground:(UIApplication *)application { + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. +} + +- (void)applicationWillEnterForeground:(UIApplication *)application { + // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. +} + +- (void)applicationDidBecomeActive:(UIApplication *)application { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. +} + +- (void)applicationWillTerminate:(UIApplication *)application { + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. +} + +@end diff --git a/test/Test/Test/Assets.xcassets/AppIcon.appiconset/Contents.json b/test/Test/Test/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..118c98f7 --- /dev/null +++ b/test/Test/Test/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,38 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/test/Test/Test/Base.lproj/LaunchScreen.storyboard b/test/Test/Test/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000..2e721e18 --- /dev/null +++ b/test/Test/Test/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Test/Test/Base.lproj/Main.storyboard b/test/Test/Test/Base.lproj/Main.storyboard new file mode 100644 index 00000000..f56d2f3b --- /dev/null +++ b/test/Test/Test/Base.lproj/Main.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Test/Test/Info.plist b/test/Test/Test/Info.plist new file mode 100644 index 00000000..6905cc67 --- /dev/null +++ b/test/Test/Test/Info.plist @@ -0,0 +1,40 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/test/Test/Test/ViewController.h b/test/Test/Test/ViewController.h new file mode 100644 index 00000000..0e91ec1e --- /dev/null +++ b/test/Test/Test/ViewController.h @@ -0,0 +1,15 @@ +// +// ViewController.h +// Test +// +// Created by Orta Therox on 06/01/2016. +// Copyright © 2016 CocoaPods. All rights reserved. +// + +#import + +@interface ViewController : UIViewController + + +@end + diff --git a/test/Test/Test/ViewController.m b/test/Test/Test/ViewController.m new file mode 100644 index 00000000..8084fde8 --- /dev/null +++ b/test/Test/Test/ViewController.m @@ -0,0 +1,27 @@ +// +// ViewController.m +// Test +// +// Created by Orta Therox on 06/01/2016. +// Copyright © 2016 CocoaPods. All rights reserved. +// + +#import "ViewController.h" + +@interface ViewController () + +@end + +@implementation ViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view, typically from a nib. +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +@end diff --git a/test/Test/Test/main.m b/test/Test/Test/main.m new file mode 100644 index 00000000..49ccac9c --- /dev/null +++ b/test/Test/Test/main.m @@ -0,0 +1,16 @@ +// +// main.m +// Test +// +// Created by Orta Therox on 06/01/2016. +// Copyright © 2016 CocoaPods. All rights reserved. +// + +#import +#import "AppDelegate.h" + +int main(int argc, char * argv[]) { + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} From e72ec34afaa824699eaf93f5d1238a71a9e73831 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Wed, 6 Jan 2016 12:43:05 +0000 Subject: [PATCH 6/8] [install plugins plugin] ensure it always hooks up to the latest CP release --- cocoapods-plugins-install/cocoapods-plugins-install.gemspec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cocoapods-plugins-install/cocoapods-plugins-install.gemspec b/cocoapods-plugins-install/cocoapods-plugins-install.gemspec index 1dd0b0cb..58bfced6 100644 --- a/cocoapods-plugins-install/cocoapods-plugins-install.gemspec +++ b/cocoapods-plugins-install/cocoapods-plugins-install.gemspec @@ -2,6 +2,7 @@ lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'cocoapods-plugins-install/gem_version.rb' +require 'yaml' Gem::Specification.new do |spec| spec.name = "cocoapods-plugins-install" @@ -16,7 +17,10 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_runtime_dependency "cocoapods-plugins", "1.0.0.beta.1" + version_file = File.expand_path('~/.cocoapods/repos/master/CocoaPods-version.yml') + install_cocoapods_version = YAML.load(File.read(version_file))['last'] + + spec.add_runtime_dependency "cocoapods-plugins", installed_cocoapods_version spec.add_development_dependency "bundler", "~> 1.10" spec.add_development_dependency "rake", "~> 10.4" From 944abf414ffb363c14e24ba09fd6202aac0b471d Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Wed, 6 Jan 2016 12:45:58 +0000 Subject: [PATCH 7/8] [build test] Removed the xcodeproj that I was using to test hooking up pods --- test/Test/Test.xcodeproj/project.pbxproj | 305 ------------------ .../contents.xcworkspacedata | 7 - test/Test/Test/AppDelegate.h | 17 - test/Test/Test/AppDelegate.m | 45 --- .../AppIcon.appiconset/Contents.json | 38 --- .../Test/Base.lproj/LaunchScreen.storyboard | 27 -- test/Test/Test/Base.lproj/Main.storyboard | 25 -- test/Test/Test/Info.plist | 40 --- test/Test/Test/ViewController.h | 15 - test/Test/Test/ViewController.m | 27 -- test/Test/Test/main.m | 16 - 11 files changed, 562 deletions(-) delete mode 100644 test/Test/Test.xcodeproj/project.pbxproj delete mode 100644 test/Test/Test.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 test/Test/Test/AppDelegate.h delete mode 100644 test/Test/Test/AppDelegate.m delete mode 100644 test/Test/Test/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 test/Test/Test/Base.lproj/LaunchScreen.storyboard delete mode 100644 test/Test/Test/Base.lproj/Main.storyboard delete mode 100644 test/Test/Test/Info.plist delete mode 100644 test/Test/Test/ViewController.h delete mode 100644 test/Test/Test/ViewController.m delete mode 100644 test/Test/Test/main.m diff --git a/test/Test/Test.xcodeproj/project.pbxproj b/test/Test/Test.xcodeproj/project.pbxproj deleted file mode 100644 index 3cd85bd3..00000000 --- a/test/Test/Test.xcodeproj/project.pbxproj +++ /dev/null @@ -1,305 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 60F647D11C3D3E5000BB93FB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 60F647D01C3D3E5000BB93FB /* main.m */; }; - 60F647D41C3D3E5000BB93FB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 60F647D31C3D3E5000BB93FB /* AppDelegate.m */; }; - 60F647D71C3D3E5000BB93FB /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 60F647D61C3D3E5000BB93FB /* ViewController.m */; }; - 60F647DA1C3D3E5000BB93FB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60F647D81C3D3E5000BB93FB /* Main.storyboard */; }; - 60F647DC1C3D3E5000BB93FB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 60F647DB1C3D3E5000BB93FB /* Assets.xcassets */; }; - 60F647DF1C3D3E5000BB93FB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60F647DD1C3D3E5000BB93FB /* LaunchScreen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 60F647CC1C3D3E5000BB93FB /* Test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Test.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 60F647D01C3D3E5000BB93FB /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 60F647D21C3D3E5000BB93FB /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 60F647D31C3D3E5000BB93FB /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 60F647D51C3D3E5000BB93FB /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 60F647D61C3D3E5000BB93FB /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - 60F647D91C3D3E5000BB93FB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 60F647DB1C3D3E5000BB93FB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 60F647DE1C3D3E5000BB93FB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 60F647E01C3D3E5000BB93FB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 60F647C91C3D3E5000BB93FB /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 60F647C31C3D3E5000BB93FB = { - isa = PBXGroup; - children = ( - 60F647CE1C3D3E5000BB93FB /* Test */, - 60F647CD1C3D3E5000BB93FB /* Products */, - ); - sourceTree = ""; - }; - 60F647CD1C3D3E5000BB93FB /* Products */ = { - isa = PBXGroup; - children = ( - 60F647CC1C3D3E5000BB93FB /* Test.app */, - ); - name = Products; - sourceTree = ""; - }; - 60F647CE1C3D3E5000BB93FB /* Test */ = { - isa = PBXGroup; - children = ( - 60F647D21C3D3E5000BB93FB /* AppDelegate.h */, - 60F647D31C3D3E5000BB93FB /* AppDelegate.m */, - 60F647D51C3D3E5000BB93FB /* ViewController.h */, - 60F647D61C3D3E5000BB93FB /* ViewController.m */, - 60F647D81C3D3E5000BB93FB /* Main.storyboard */, - 60F647DB1C3D3E5000BB93FB /* Assets.xcassets */, - 60F647DD1C3D3E5000BB93FB /* LaunchScreen.storyboard */, - 60F647E01C3D3E5000BB93FB /* Info.plist */, - 60F647CF1C3D3E5000BB93FB /* Supporting Files */, - ); - path = Test; - sourceTree = ""; - }; - 60F647CF1C3D3E5000BB93FB /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 60F647D01C3D3E5000BB93FB /* main.m */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 60F647CB1C3D3E5000BB93FB /* Test */ = { - isa = PBXNativeTarget; - buildConfigurationList = 60F647E31C3D3E5000BB93FB /* Build configuration list for PBXNativeTarget "Test" */; - buildPhases = ( - 60F647C81C3D3E5000BB93FB /* Sources */, - 60F647C91C3D3E5000BB93FB /* Frameworks */, - 60F647CA1C3D3E5000BB93FB /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Test; - productName = Test; - productReference = 60F647CC1C3D3E5000BB93FB /* Test.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 60F647C41C3D3E5000BB93FB /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0720; - ORGANIZATIONNAME = CocoaPods; - TargetAttributes = { - 60F647CB1C3D3E5000BB93FB = { - CreatedOnToolsVersion = 7.2; - }; - }; - }; - buildConfigurationList = 60F647C71C3D3E5000BB93FB /* Build configuration list for PBXProject "Test" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 60F647C31C3D3E5000BB93FB; - productRefGroup = 60F647CD1C3D3E5000BB93FB /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 60F647CB1C3D3E5000BB93FB /* Test */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 60F647CA1C3D3E5000BB93FB /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 60F647DF1C3D3E5000BB93FB /* LaunchScreen.storyboard in Resources */, - 60F647DC1C3D3E5000BB93FB /* Assets.xcassets in Resources */, - 60F647DA1C3D3E5000BB93FB /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 60F647C81C3D3E5000BB93FB /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 60F647D71C3D3E5000BB93FB /* ViewController.m in Sources */, - 60F647D41C3D3E5000BB93FB /* AppDelegate.m in Sources */, - 60F647D11C3D3E5000BB93FB /* main.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 60F647D81C3D3E5000BB93FB /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 60F647D91C3D3E5000BB93FB /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 60F647DD1C3D3E5000BB93FB /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 60F647DE1C3D3E5000BB93FB /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 60F647E11C3D3E5000BB93FB /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - 60F647E21C3D3E5000BB93FB /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 60F647E41C3D3E5000BB93FB /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = Test/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.Test; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 60F647E51C3D3E5000BB93FB /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = Test/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.Test; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 60F647C71C3D3E5000BB93FB /* Build configuration list for PBXProject "Test" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 60F647E11C3D3E5000BB93FB /* Debug */, - 60F647E21C3D3E5000BB93FB /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 60F647E31C3D3E5000BB93FB /* Build configuration list for PBXNativeTarget "Test" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 60F647E41C3D3E5000BB93FB /* Debug */, - 60F647E51C3D3E5000BB93FB /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; -/* End XCConfigurationList section */ - }; - rootObject = 60F647C41C3D3E5000BB93FB /* Project object */; -} diff --git a/test/Test/Test.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/test/Test/Test.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 87cc241f..00000000 --- a/test/Test/Test.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/test/Test/Test/AppDelegate.h b/test/Test/Test/AppDelegate.h deleted file mode 100644 index 77d662e7..00000000 --- a/test/Test/Test/AppDelegate.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// AppDelegate.h -// Test -// -// Created by Orta Therox on 06/01/2016. -// Copyright © 2016 CocoaPods. All rights reserved. -// - -#import - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - - -@end - diff --git a/test/Test/Test/AppDelegate.m b/test/Test/Test/AppDelegate.m deleted file mode 100644 index 89ba54ca..00000000 --- a/test/Test/Test/AppDelegate.m +++ /dev/null @@ -1,45 +0,0 @@ -// -// AppDelegate.m -// Test -// -// Created by Orta Therox on 06/01/2016. -// Copyright © 2016 CocoaPods. All rights reserved. -// - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. -} - -@end diff --git a/test/Test/Test/Assets.xcassets/AppIcon.appiconset/Contents.json b/test/Test/Test/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 118c98f7..00000000 --- a/test/Test/Test/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/test/Test/Test/Base.lproj/LaunchScreen.storyboard b/test/Test/Test/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index 2e721e18..00000000 --- a/test/Test/Test/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/Test/Test/Base.lproj/Main.storyboard b/test/Test/Test/Base.lproj/Main.storyboard deleted file mode 100644 index f56d2f3b..00000000 --- a/test/Test/Test/Base.lproj/Main.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/Test/Test/Info.plist b/test/Test/Test/Info.plist deleted file mode 100644 index 6905cc67..00000000 --- a/test/Test/Test/Info.plist +++ /dev/null @@ -1,40 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/test/Test/Test/ViewController.h b/test/Test/Test/ViewController.h deleted file mode 100644 index 0e91ec1e..00000000 --- a/test/Test/Test/ViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// ViewController.h -// Test -// -// Created by Orta Therox on 06/01/2016. -// Copyright © 2016 CocoaPods. All rights reserved. -// - -#import - -@interface ViewController : UIViewController - - -@end - diff --git a/test/Test/Test/ViewController.m b/test/Test/Test/ViewController.m deleted file mode 100644 index 8084fde8..00000000 --- a/test/Test/Test/ViewController.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// ViewController.m -// Test -// -// Created by Orta Therox on 06/01/2016. -// Copyright © 2016 CocoaPods. All rights reserved. -// - -#import "ViewController.h" - -@interface ViewController () - -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -@end diff --git a/test/Test/Test/main.m b/test/Test/Test/main.m deleted file mode 100644 index 49ccac9c..00000000 --- a/test/Test/Test/main.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// main.m -// Test -// -// Created by Orta Therox on 06/01/2016. -// Copyright © 2016 CocoaPods. All rights reserved. -// - -#import -#import "AppDelegate.h" - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} From bbf6ac59688b36e1b1c4b3d2250549437536fc9d Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Wed, 6 Jan 2016 13:01:10 +0000 Subject: [PATCH 8/8] [fragaria] make deployment target 10.10 --- app/CocoaPods.xcodeproj/project.pbxproj | 6 ++---- app/Fragaria.podspec.json | 2 +- app/Pods/Pods.xcodeproj/project.pbxproj | 8 ++++---- .../cocoapods-plugins-install.gemspec | 5 +---- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/CocoaPods.xcodeproj/project.pbxproj b/app/CocoaPods.xcodeproj/project.pbxproj index a71d2fb2..e1acacb6 100644 --- a/app/CocoaPods.xcodeproj/project.pbxproj +++ b/app/CocoaPods.xcodeproj/project.pbxproj @@ -973,7 +973,6 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -991,7 +990,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; }; @@ -1014,7 +1013,6 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -1026,7 +1024,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; }; name = Release; diff --git a/app/Fragaria.podspec.json b/app/Fragaria.podspec.json index 35e7aaaa..73f5d9d0 100644 --- a/app/Fragaria.podspec.json +++ b/app/Fragaria.podspec.json @@ -26,7 +26,7 @@ ], "public_header_files": "*.h", "platforms": { - "osx": null + "osx": "10.10" }, "libraries": "icucore", "license": "BSD", diff --git a/app/Pods/Pods.xcodeproj/project.pbxproj b/app/Pods/Pods.xcodeproj/project.pbxproj index e2b9f337..db9d3b29 100644 --- a/app/Pods/Pods.xcodeproj/project.pbxproj +++ b/app/Pods/Pods.xcodeproj/project.pbxproj @@ -1471,7 +1471,7 @@ INFOPLIST_FILE = "Target Support Files/ANSIEscapeHelper/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.10; MODULEMAP_FILE = "Target Support Files/ANSIEscapeHelper/ANSIEscapeHelper.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = ANSIEscapeHelper; @@ -1536,7 +1536,7 @@ INFOPLIST_FILE = "Target Support Files/Fragaria/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.10; MODULEMAP_FILE = "Target Support Files/Fragaria/Fragaria.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = Fragaria; @@ -1566,7 +1566,7 @@ INFOPLIST_FILE = "Target Support Files/Fragaria/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.10; MODULEMAP_FILE = "Target Support Files/Fragaria/Fragaria.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = Fragaria; @@ -1694,7 +1694,7 @@ INFOPLIST_FILE = "Target Support Files/ANSIEscapeHelper/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.10; MODULEMAP_FILE = "Target Support Files/ANSIEscapeHelper/ANSIEscapeHelper.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = ANSIEscapeHelper; diff --git a/cocoapods-plugins-install/cocoapods-plugins-install.gemspec b/cocoapods-plugins-install/cocoapods-plugins-install.gemspec index 58bfced6..7165d0ba 100644 --- a/cocoapods-plugins-install/cocoapods-plugins-install.gemspec +++ b/cocoapods-plugins-install/cocoapods-plugins-install.gemspec @@ -17,10 +17,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - version_file = File.expand_path('~/.cocoapods/repos/master/CocoaPods-version.yml') - install_cocoapods_version = YAML.load(File.read(version_file))['last'] - - spec.add_runtime_dependency "cocoapods-plugins", installed_cocoapods_version + spec.add_runtime_dependency "cocoapods-plugins" spec.add_development_dependency "bundler", "~> 1.10" spec.add_development_dependency "rake", "~> 10.4"