Merge pull request #370 from CocoaPods/cp_110

Update CocoaPods for 1.1.1
CocoaPods · Dec 24, 2016 · 4107967 · 4107967
2 parents 88cb5bb + 39afebd
commit 4107967
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/Rakefile b/Rakefile
@@ -116,10 +116,10 @@ NCURSES_URL = "http://ftpmirror.gnu.org/ncurses/ncurses-#{NCURSES_VERSION}.tar.g
 READLINE_VERSION = '6.3'
 READLINE_URL = "http://ftpmirror.gnu.org/readline/readline-#{READLINE_VERSION}.tar.gz"
 
-RUBY__VERSION = '2.2.3'
+RUBY__VERSION = '2.2.6'
 RUBY_URL = "http://cache.ruby-lang.org/pub/ruby/2.2/ruby-#{RUBY__VERSION}.tar.gz"
 
-RUBYGEMS_VERSION = '2.5.0'
+RUBYGEMS_VERSION = '2.6.8'
 RUBYGEMS_URL = "https://rubygems.org/downloads/rubygems-update-#{RUBYGEMS_VERSION}.gem"
 
 CURL_VERSION = '7.41.0'
@@ -491,7 +491,7 @@ class RubyTasks < BundleDependencyTasks
   def define_install_libruby_task
     file installed_libruby_path => artefact_path do
       cp artefact_path, installed_libruby_path
-      %w{ bigdecimal date/date_core.a digest fiddle pathname psych stringio strscan }.each do |ext|
+      %w{ bigdecimal date/date_core.a digest digest/md5/md5.a fiddle pathname psych stringio strscan socket }.each do |ext|
         ext = "#{ext}/#{ext}.a" unless File.extname(ext) == '.a'
         execute '/usr/bin/libtool', '-static', '-o', installed_libruby_path, installed_libruby_path, File.join(build_dir, 'ext', ext)
       end
@@ -502,6 +502,9 @@ class RubyTasks < BundleDependencyTasks
       installed_dependencies.each do |installed_dependency|
         execute '/usr/bin/libtool', '-static', '-o', installed_libruby_path, installed_libruby_path, installed_dependency
       end
+
+      # `digest/md5/md5.a` requires "_MD5_Init" which is only available inside libcrypto.a
+      execute '/usr/bin/libtool', '-static', '-o', installed_libruby_path, installed_libruby_path, File.join(DESTROOT, 'dependencies', 'lib', 'libcrypto.a')
     end
   end
 
@@ -586,7 +589,7 @@ directory installed_cocoapods_plugins_install => installed_pod_bin do
 end
 
 pod_check = "cocoapods-check"
-pod_check_version = "0.2.1.beta.1"
+pod_check_version = "1.0.0"
 installed_cocoapods_check_install = File.join(GEM_HOME, 'gems', "#{pod_check}-#{pod_check_version}")
 directory installed_cocoapods_check_install => installed_pod_bin do
    install_gem pod_check, pod_check_version

diff --git a/app/CPReflectionService/Info.plist b/app/CPReflectionService/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
+	<string>1.1.1</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2016 CocoaPods. All rights reserved.</string>
 	<key>XPCService</key>

diff --git a/app/CPReflectionService/RBObject+CocoaPods.m b/app/CPReflectionService/RBObject+CocoaPods.m
@@ -53,6 +53,10 @@
   rb_provide("fiddle.so");
   INIT_EXT(psych);
   rb_provide("psych.so");
+  INIT_EXT(socket);
+  rb_provide("socket.so");
+  INIT_EXT(md5);
+  rb_provide("digest/md5.so");
 
   #define PROVIDE_EXT(name) INIT_EXT(name); rb_provide(#name);
   PROVIDE_EXT(bigdecimal);

diff --git a/app/CPReflectionService/RBObject+CocoaPods.rb b/app/CPReflectionService/RBObject+CocoaPods.rb
@@ -58,8 +58,7 @@ def self.analyze_podfile(podfile, installation_root)
       end
 
       uses_frameworks = config.podfile.target_definitions.first.last.to_hash["uses_frameworks"]
-      last_installed_version = config.sandbox.manifest.cocoapods_version.to_s
-
+      last_installed_version = config.sandbox.manifest && config.sandbox.manifest.cocoapods_version.to_s
       {
         "projects" => user_projects,
         "pod_targets" => pod_targets,

diff --git a/app/CocoaPods/Podfile.storyboard b/app/CocoaPods/Podfile.storyboard
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1212" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <scenes>
         <!--Window Controller-->
         <scene sceneID="R2V-B0-nI4">
             <objects>
                 <windowController storyboardIdentifier="Podfile Editor" id="jGA-0Y-lOj" customClass="CPPodFileWindowViewController" customModule="CocoaPods" customModuleProvider="target" sceneMemberID="viewController">
-                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="dummy" animationBehavior="default" id="Ckk-yw-fiv" customClass="CPModifiedDecorationsWindow" customModule="CocoaPods" customModuleProvider="target">
+                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="dummy" animationBehavior="default" id="Ckk-yw-fiv" customClass="CPModifiedDecorationsWindow" customModule="CocoaPods" customModuleProvider="target">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES" unifiedTitleAndToolbar="YES" fullSizeContentView="YES"/>
                         <rect key="contentRect" x="550" y="405" width="586" height="660"/>
                         <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
@@ -391,7 +391,7 @@
                                     </subviews>
                                     <nil key="backgroundColor"/>
                                 </clipView>
-                                <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="PHf-HC-OTM">
+                                <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="PHf-HC-OTM">
                                     <rect key="frame" x="1" y="178" width="411" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
@@ -458,7 +458,7 @@ Gw
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="63" rowSizeStyle="automatic" viewBased="YES" id="P0e-Iy-zg7">
-                                            <rect key="frame" x="0.0" y="0.0" width="400" height="408"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="400" height="0.0"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
@@ -597,8 +597,8 @@ Gw
                                     </subviews>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </clipView>
-                                <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="V71-OH-qaz">
-                                    <rect key="frame" x="1" y="391" width="398" height="16"/>
+                                <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="V71-OH-qaz">
+                                    <rect key="frame" x="0.0" y="392" width="400" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="6Vd-8N-c4T">

diff --git a/app/CocoaPods/Supporting Files/Info.plist b/app/CocoaPods/Supporting Files/Info.plist
@@ -56,7 +56,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -73,7 +73,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
+	<string>1.1.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>