Merge pull request #377 from CocoaPods/prepare_for_120

Prepare for 1.2.0
CocoaPods · Jan 29, 2017 · 8dfb269 · 8dfb269
2 parents 4423045 + 927ea76
commit 8dfb269
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ branches:
     - /.+-stable$/
 
 install:
+  - gem install bundler
   - gem install danger
   - danger
   - rake app:prerequisites --quiet

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Master
 
+## [1.2.0](https://github.com/CocoaPods/CocoaPods-app/releases/tag/1.2.0)
+   [CocoaPods](https://github.com/CocoaPods/CocoaPods/blob/master/CHANGELOG.md)
+
+* Fix for loading the gh-inspector inside the ruby helper process, which should fix a lot of underlying UI issues
+  [orta](https://github.com/orta)
+  [#377](https://github.com/CocoaPods/CocoaPods-app/pull/377)
+
+## [1.1.0](https://github.com/CocoaPods/CocoaPods-app/releases/tag/1.1.0)
+   [CocoaPods](https://github.com/CocoaPods/CocoaPods/blob/master/CHANGELOG.md)
+
 * Pod version completion
   [flufff42](https://github.com/flufff42)
   [#313](https://github.com/CocoaPods/CocoaPods-app/pull/313)

diff --git a/Rakefile b/Rakefile
@@ -102,7 +102,7 @@ LIBYAML_VERSION = '0.1.6'
 LIBYAML_URL = "http://pyyaml.org/download/libyaml/yaml-#{LIBYAML_VERSION}.tar.gz"
 
 ZLIB_VERSION = '1.2.8'
-ZLIB_URL = "http://zlib.net/zlib-#{ZLIB_VERSION}.tar.gz"
+ZLIB_URL = "http://zlib.net/fossils/zlib-#{ZLIB_VERSION}.tar.gz"
 
 OPENSSL_VERSION = '1.0.2'
 OPENSSL_PATCH = 'd'

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

diff --git a/app/CPReflectionService/RBObject+CocoaPods.m b/app/CPReflectionService/RBObject+CocoaPods.m
@@ -44,6 +44,7 @@
   INIT_EXT(utf_16be);
   INIT_EXT(utf_32le);
   INIT_EXT(utf_32be);
+  INIT_EXT(windows_31j);
 
   INIT_EXT(pathname);
   rb_provide("pathname.so");

diff --git a/app/CocoaPods.xcodeproj/project.pbxproj b/app/CocoaPods.xcodeproj/project.pbxproj
@@ -1171,7 +1171,7 @@
 		510254301C0A60680045FCD8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				FRAMEWORK_SEARCH_PATHS = (

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.1.1</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -73,11 +73,11 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.1</string>
+	<string>1.2.0</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 CocoaPods. All rights reserved.</string>
+	<string>Copyright © 2017 CocoaPods. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>