Fix for finding updates via Sparkle

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+* Fixes to Sparkle updates, by returning to CocoaPods' version numbers  
+  [orta](https://github.com/orta)  
+  [#300](https://github.com/CocoaPods/CocoaPods-app/pull/300)
+
 * Show an alert if CP is going to re-integrate your project  
   [orta](https://github.com/orta)  
   [#299](https://github.com/CocoaPods/CocoaPods-app/pull/299)

Rakefile

@@ -85,15 +85,9 @@ def install_cocoapods_version
   @install_cocoapods_version = YAML.load(File.read(version_file))['last']
 end
 
-# Used to differentiate app builds from CocoaPods releases.
-def cocoapods_app_build_version
-  require 'Date'
-  DateTime.now.strftime("%Y.%m.%d")
-end
-
 def update_plist_versions(info_plist)
   execute 'App', ['/usr/libexec/PlistBuddy', '-c', "Set :CFBundleShortVersionString #{install_cocoapods_version}", info_plist]
-  execute 'App', ['/usr/libexec/PlistBuddy', '-c', "Set :CFBundleVersion #{cocoapods_app_build_version}", info_plist]
+  execute 'App', ['/usr/libexec/PlistBuddy', '-c', "Set :CFBundleVersion #{install_cocoapods_version}", info_plist]
   execute 'App', ['/usr/libexec/PlistBuddy', '-c', "Set :NSHumanReadableCopyright Copyright © #{Time.new.year} CocoaPods. All rights reserved.", info_plist]
 end
 

app/CPReflectionService/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0.beta.8</string>
+	<string>1.0.0.rc.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2016.04.20</string>
+	<string>1.0.0.rc.1</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2016 CocoaPods. All rights reserved.</string>
 	<key>XPCService</key>

app/CocoaPods.xcodeproj/project.pbxproj

@@ -717,15 +717,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 51165E3C1A17AFF500DCFC94 /* Build configuration list for PBXNativeTarget "CocoaPods" */;
 			buildPhases = (
-				C9B3A9B452C836DC0E134F4F /* Check Pods Manifest.lock */,
+				C9B3A9B452C836DC0E134F4F /* 📦 Check Pods Manifest.lock */,
 				60FA32A31C4846D300AF5263 /* Validate App Bundle  */,
 				51165E1B1A17AFF500DCFC94 /* Sources */,
 				51165E1C1A17AFF500DCFC94 /* Frameworks */,
 				51165E1D1A17AFF500DCFC94 /* Resources */,
 				1FFFBB091BA25469004A8D1E /* Copy Helper Executables */,
 				5102542E1C0A60680045FCD8 /* Embed XPC Services */,
-				B553C8F443325D68D3F0ECBC /* Embed Pods Frameworks */,
-				DDCA8595EBBF1866824DF78F /* Copy Pods Resources */,
+				B553C8F443325D68D3F0ECBC /* 📦 Embed Pods Frameworks */,
+				DDCA8595EBBF1866824DF78F /* 📦 Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -759,12 +759,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 60F02D221C0A2A6D003600FE /* Build configuration list for PBXNativeTarget "CocoaPodsTests" */;
 			buildPhases = (
-				458C0027E9270EE32B8CCE59 /* Check Pods Manifest.lock */,
+				458C0027E9270EE32B8CCE59 /* 📦 Check Pods Manifest.lock */,
 				60F02D151C0A2A6D003600FE /* Sources */,
 				60F02D161C0A2A6D003600FE /* Frameworks */,
 				60F02D171C0A2A6D003600FE /* Resources */,
-				A58128BAFFF8FDE9690DE404 /* Embed Pods Frameworks */,
-				18FEAF85B2D56C31CD708BE1 /* Copy Pods Resources */,
+				A58128BAFFF8FDE9690DE404 /* 📦 Embed Pods Frameworks */,
+				18FEAF85B2D56C31CD708BE1 /* 📦 Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -866,29 +866,29 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		18FEAF85B2D56C31CD708BE1 /* Copy Pods Resources */ = {
+		18FEAF85B2D56C31CD708BE1 /* 📦 Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Copy Pods Resources";
+			name = "📦 Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CocoaPodsTests/Pods-CocoaPodsTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		458C0027E9270EE32B8CCE59 /* Check Pods Manifest.lock */ = {
+		458C0027E9270EE32B8CCE59 /* 📦 Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Check Pods Manifest.lock";
+			name = "📦 Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -924,59 +924,59 @@
 			shellPath = /bin/sh;
 			shellScript = "VERSION_ID=`head -1 \"${SOURCE_ROOT}\"/../Rakefile`\nVERSION=`echo \"${VERSION_ID}\" | sed -e 's|BUNDLED_ENV_VERSION = ||'`\nLOCAL_VERSION=`head -1 \"${SOURCE_ROOT}/../destroot/bundle/VERSION\"`\n\nif [ \"$VERSION\" != \"$LOCAL_VERSION\" ]; then\ncat << EOM\nerror: The CP environment destroot is not in sync with generated environment from the Rakefile. Please run 'git submodule update; rake bundle:clean:artefacts; rake app:prerequisites' which should bring you back up to speed.\nEOM\nexit 1\nfi\n";
 		};
-		A58128BAFFF8FDE9690DE404 /* Embed Pods Frameworks */ = {
+		A58128BAFFF8FDE9690DE404 /* 📦 Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Embed Pods Frameworks";
+			name = "📦 Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CocoaPodsTests/Pods-CocoaPodsTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B553C8F443325D68D3F0ECBC /* Embed Pods Frameworks */ = {
+		B553C8F443325D68D3F0ECBC /* 📦 Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Embed Pods Frameworks";
+			name = "📦 Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CocoaPods/Pods-CocoaPods-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		C9B3A9B452C836DC0E134F4F /* Check Pods Manifest.lock */ = {
+		C9B3A9B452C836DC0E134F4F /* 📦 Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Check Pods Manifest.lock";
+			name = "📦 Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		DDCA8595EBBF1866824DF78F /* Copy Pods Resources */ = {
+		DDCA8595EBBF1866824DF78F /* 📦 Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Copy Pods Resources";
+			name = "📦 Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;

app/CocoaPods/CPANSIEscapeHelper.h

@@ -1,4 +1,4 @@
-#import <ANSIEscapeHelper/AMR_ANSIEscapeHelper.h>
+@import ANSIEscapeHelper;
 
 /// Provides CocoaPods specific ANSI colors and fonts.
 

app/CocoaPods/CPAppDelegate.m

@@ -5,7 +5,7 @@
 #import "CocoaPods-Swift.h"
 #import "CPCLIToolInstallationController.h"
 #import <Quartz/Quartz.h>
-#import <LetsMove/PFMoveApplication.h>
+@import LetsMove;
 
 @interface CPAppDelegate ()
 @property (nonatomic, strong) CPHomeWindowController *homeWindowController;

app/CocoaPods/CPPodfileEditorViewController.swift

@@ -55,7 +55,7 @@ class CPPodfileEditorViewController: NSViewController, NSTextViewDelegate, SMLAu
     editor.autoCompleteDelay = 0.05
 
     let settings = CPFontAndColourGateKeeper()
-    editor.textFont = settings.defaultFont
+    editor.textFont = settings.defaultFont!
     editor.colourForNumbers = settings.cpGreen
     editor.colourForStrings = settings.cpRed
     editor.colourForComments = settings.cpBrightBrown
@@ -179,13 +179,13 @@ class CPPodfileEditorViewController: NSViewController, NSTextViewDelegate, SMLAu
   @IBAction func increaseFontSize(sender: NSMenuItem) {
     let settings = CPFontAndColourGateKeeper()
     settings.increaseDefaultFontSize()
-    editor.textFont = settings.defaultFont
+    editor.textFont = settings.defaultFont!
   }
 
   @IBAction func decreaseFontSize(sender: NSMenuItem) {
     let settings = CPFontAndColourGateKeeper()
     settings.decreaseDefaultFontSize()
-    editor.textFont = settings.defaultFont
+    editor.textFont = settings.defaultFont!
   }
 
   /// Apply a text transformation to a selection

app/CocoaPods/CPPodfileReflection.m

@@ -3,8 +3,7 @@
 #import "CocoaPods-Swift.h"
 #import "CPReflectionServiceProtocol.h"
 
-#import <Fragaria/Fragaria.h>
-#import <Fragaria/SMLSyntaxError.h>
+@import Fragaria;
 
 #import "CPAppDelegate.h"
 

app/CocoaPods/CPPodfileViewController.swift

@@ -80,7 +80,9 @@ class CPPodfileViewController: NSViewController, NSTabViewDelegate {
       let project = targets.keys.first!
       let url = NSURL(fileURLWithPath: project)
       let name = url.lastPathComponent!.stringByReplacingOccurrencesOfString(".xcproj", withString: "")
-      actionTitleLabel.stringValue = "Podfile for \(name)"
+      dispatch_async(dispatch_get_main_queue()) {
+        self.actionTitleLabel.stringValue = "Podfile for \(name)"
+      }
     }
   }
 

app/CocoaPods/Podfile.storyboard

@@ -391,7 +391,7 @@
                                     </subviews>
                                     <nil key="backgroundColor"/>
                                 </clipView>
-                                <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="PHf-HC-OTM">
+                                <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="PHf-HC-OTM">
                                     <rect key="frame" x="1" y="178" width="411" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
@@ -451,20 +451,20 @@ Gw
                         <rect key="frame" x="0.0" y="0.0" width="400" height="408"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <scrollView autohidesScrollers="YES" horizontalLineScroll="65" horizontalPageScroll="10" verticalLineScroll="65" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j6x-AN-YRf">
+                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="65" horizontalPageScroll="10" verticalLineScroll="65" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j6x-AN-YRf">
                                 <rect key="frame" x="0.0" y="0.0" width="400" height="408"/>
                                 <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="DE9-dP-lGv">
-                                    <rect key="frame" x="1" y="1" width="398" height="406"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="400" height="408"/>
                                     <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="398" height="0.0"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="400" height="408"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn width="395.19921875" minWidth="40" maxWidth="1000" id="4zH-px-LOR">
+                                                <tableColumn width="397.19921875" minWidth="40" maxWidth="1000" id="4zH-px-LOR">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                         <font key="font" metaFont="smallSystem"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -478,16 +478,16 @@ Gw
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView identifier="title" id="UmD-Ug-xsu">
-                                                            <rect key="frame" x="1" y="1" width="395" height="61"/>
+                                                            <rect key="frame" x="1" y="1" width="397" height="61"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="QeX-n1-wkV" customClass="BrownView" customModule="CocoaPods" customModuleProvider="target">
+                                                                <customView misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QeX-n1-wkV" customClass="BrownView" customModule="CocoaPods" customModuleProvider="target">
                                                                     <rect key="frame" x="20" y="3" width="355" height="1"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="1" id="ClQ-4X-Nya"/>
                                                                     </constraints>
                                                                 </customView>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dLl-L1-myj">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dLl-L1-myj">
                                                                     <rect key="frame" x="18" y="14" width="359" height="17"/>
                                                                     <textFieldCell key="cell" lineBreakMode="charWrapping" sendsActionOnEndEditing="YES" alignment="center" title="Title" id="a9c-eG-CbQ">
                                                                         <font key="font" metaFont="systemSemibold" size="13"/>
@@ -509,7 +509,7 @@ Gw
                                                             </constraints>
                                                         </tableCellView>
                                                         <tableCellView identifier="repo" id="w9H-6A-7Ju">
-                                                            <rect key="frame" x="1" y="64" width="395" height="63"/>
+                                                            <rect key="frame" x="1" y="64" width="397" height="63"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dad-BK-2lu">
@@ -523,7 +523,7 @@ Gw
                                                                         <binding destination="w9H-6A-7Ju" name="value" keyPath="objectValue.displayName" id="cAM-4D-WHc"/>
                                                                     </connections>
                                                                 </textField>
-                                                                <customView wantsLayer="YES" alphaValue="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="aHn-oc-RUy" customClass="BrownView" customModule="CocoaPods" customModuleProvider="target">
+                                                                <customView wantsLayer="YES" misplaced="YES" alphaValue="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="aHn-oc-RUy" customClass="BrownView" customModule="CocoaPods" customModuleProvider="target">
                                                                     <rect key="frame" x="20" y="1" width="355" height="1"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="1" id="fow-eY-NDY"/>
@@ -597,7 +597,7 @@ Gw
                                     </subviews>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </clipView>
-                                <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="V71-OH-qaz">
+                                <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="V71-OH-qaz">
                                     <rect key="frame" x="1" y="391" width="398" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>

app/CocoaPods/SMLTextView+CocoaPods.m

@@ -1,4 +1,4 @@
-#import <Fragaria/Fragaria.h>
+@import Fragaria;
 #import <objc/runtime.h>
 
 // Hack SMLTextView to also consider the leading colon when completing words, which are all the

app/CocoaPods/Supporting Files/Info.plist

@@ -56,7 +56,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0.beta.8</string>
+	<string>1.0.0.rc.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -73,7 +73,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2016.04.20</string>
+	<string>1.0.0.rc.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

app/Fragaria.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "Fragaria",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "summary": "Cocoa syntax highlighting text view.",
   "homepage": "http://www.mugginsoft.com/code/fragaria",
   "authors": {