diff --git a/Rakefile b/Rakefile index 691d20e7..a04415dc 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 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/CocoaPods/Base.lproj/CPHomeWindowController.xib b/app/CocoaPods/Base.lproj/CPHomeWindowController.xib index 9a7a37ec..5947c573 100644 --- a/app/CocoaPods/Base.lproj/CPHomeWindowController.xib +++ b/app/CocoaPods/Base.lproj/CPHomeWindowController.xib @@ -190,7 +190,7 @@ - + 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 6a8da6f4..bc622fbc 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.2 CFBundleSignature ???? CFBundleURLTypes @@ -73,7 +73,7 @@ CFBundleVersion - 0.39.0 + 1.0.0.beta.2 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright 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 f3c301ec..7165d0ba 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,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" spec.add_development_dependency "bundler", "~> 1.10" spec.add_development_dependency "rake", "~> 10.4" 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