Skip to content
This repository has been archived by the owner on Nov 3, 2020. It is now read-only.

Commit

Permalink
Merge pull request #274 from CocoaPods/xcode7.3
Browse files Browse the repository at this point in the history
Updates for Xcode 7.3
  • Loading branch information
orta committed Apr 5, 2016
2 parents 13d306f + cf7a24b commit 7dd2fc9
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
osx_image: xcode7.2
osx_image: xcode7.3
language: objective-c

env:
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
* Show a warning while editing a Podfile for a Podfile.lock generated with a newer version of CocoaPods
[Nate West](https://github.com/nwest)
[#257](https://github.com/CocoaPods/CocoaPods-app/pull/257)


* Migrate project to Xcode 7.3
[Nate West](https://github.com/nwest)
[#274](https://github.com/CocoaPods/CocoaPods-app/pull/274)

## [1.0.0.beta.5 2016.03.03](https://github.com/CocoaPods/CocoaPods-app/releases/tag/1.0.0.beta.5)
[CocoaPods](https://github.com/CocoaPods/CocoaPods/blob/master/CHANGELOG.md#100beta5-2016-03-08)

Expand Down
2 changes: 2 additions & 0 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ through the ‘Install the Command-Line Tool…’ menu item under the applicati

If you want to hack on `CocoaPods.app`:

You will need Xcode 7.3 or newer.

``` sh
git clone https://github.com/CocoaPods/CocoaPods-app.git --recursive
cd CocoaPods-app
Expand Down
1 change: 1 addition & 0 deletions app/CocoaPods.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = CP;
LastSwiftMigration = 0730;
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = CocoaPods;
Expand Down
8 changes: 4 additions & 4 deletions app/CocoaPods/Base.lproj/CPHomeWindowController.xib
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="CPHomeWindowController">
Expand Down Expand Up @@ -50,8 +50,8 @@
<action selector="recentButtonTapped:" target="Whb-bK-is0" id="hnb-Y9-Dxe"/>
</connections>
</button>
<button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UXQ-ah-FzE" customClass="CPHomeSidebarButton" customModule="CocoaPods" customModuleProvider="target">
<rect key="frame" x="121" y="0.0" width="64" height="36"/>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UXQ-ah-FzE" customClass="CPHomeSidebarButton" customModule="CocoaPods" customModuleProvider="target">
<rect key="frame" x="119" y="0.0" width="64" height="36"/>
<constraints>
<constraint firstAttribute="height" constant="36" id="0xs-Iz-sHf"/>
<constraint firstAttribute="width" constant="64" id="N7l-o4-iu8"/>
Expand Down
2 changes: 1 addition & 1 deletion app/CocoaPods/CPMenuVisiblityDirector.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class CPMenuVisiblityDirector: NSObject {
override func awakeFromNib() {
let notificationCenter = NSNotificationCenter.defaultCenter()

notificationCenter.addObserver(self, selector: "windowsChanged:", name: NSWindowDidBecomeKeyNotification, object: nil)
notificationCenter.addObserver(self, selector: #selector(windowsChanged(_:)), name: NSWindowDidBecomeKeyNotification, object: nil)
}

/// Set hidden on the menus when we don't need to show the submenus
Expand Down
2 changes: 1 addition & 1 deletion app/CocoaPods/CPMetadataTableViewDataSource.swift
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class CPMetadataTableViewDataSource: NSObject, NSTableViewDataSource, NSTableVie
return tableView.makeViewWithIdentifier("spacer", owner: nil)
}

print("Should not have data unaccounted for in the flattened xcode project");
print("Should not have data unaccounted for in the flattened xcode project", terminator: "");
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion app/CocoaPods/CPModifiedDecorationsWindow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class CPModifiedDecorationsWindow: NSWindow {
super.makeKeyAndOrderFront(sender)

[NSWindowDidResizeNotification, NSWindowDidResizeNotification, NSWindowDidMoveNotification].forEach { notification in
NSNotificationCenter.defaultCenter().addObserver(self, selector: "moveWindowButtons", name: notification, object: self)
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(moveWindowButtons), name: notification, object: self)
}
moveWindowButtons()
}
Expand Down
4 changes: 2 additions & 2 deletions app/CocoaPods/CPRecentDocumentSource.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class CPRecentDocumentSource: CPDocumentSource {
super.init()

let notificationCenter = NSNotificationCenter.defaultCenter()
notificationCenter.addObserver(self, selector: "updateRecentDocuments:", name: CPDocumentController.ClearRecentDocumentsNotification, object: nil)
notificationCenter.addObserver(self, selector: "updateRecentDocuments:", name: CPDocumentController.RecentDocumentUpdateNotification, object: nil)
notificationCenter.addObserver(self, selector: #selector(updateRecentDocuments(_:)), name: CPDocumentController.ClearRecentDocumentsNotification, object: nil)
notificationCenter.addObserver(self, selector: #selector(updateRecentDocuments(_:)), name: CPDocumentController.RecentDocumentUpdateNotification, object: nil)
}

deinit {
Expand Down
6 changes: 3 additions & 3 deletions app/CocoaPods/CPSpotlightDocumentSource.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class CPSpotlightDocumentSource: CPDocumentSource {

func start() {
let notificationCenter = NSNotificationCenter.defaultCenter()
notificationCenter.addObserver(self, selector: "queryUpdated:", name: NSMetadataQueryDidUpdateNotification, object: self.query)
notificationCenter.addObserver(self, selector: "queryGatheringFinished:", name: NSMetadataQueryDidFinishGatheringNotification, object: self.query)
notificationCenter.addObserver(self, selector: #selector(queryUpdated(_:)), name: NSMetadataQueryDidUpdateNotification, object: self.query)
notificationCenter.addObserver(self, selector: #selector(queryGatheringFinished(_:)), name: NSMetadataQueryDidFinishGatheringNotification, object: self.query)

query.predicate = NSPredicate(format: "kMDItemFSName == 'Podfile'", argumentArray: nil)
query.sortDescriptors = [NSSortDescriptor(key: kMDItemContentModificationDate as String, ascending: true)]
Expand All @@ -41,7 +41,7 @@ class CPSpotlightDocumentSource: CPDocumentSource {

query.enableUpdates()

NSObject.cancelPreviousPerformRequestsWithTarget(self, selector: Selector("queryFinished"), object: nil)
NSObject.cancelPreviousPerformRequestsWithTarget(self, selector: #selector(queryFinished), object: nil)
queryFinished()
}

Expand Down
2 changes: 1 addition & 1 deletion app/CocoaPods/CPThickDecorationsWindow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class CPThickDecorationsWindow: NSWindow {
super.makeKeyAndOrderFront(sender)

[NSWindowDidResizeNotification, NSWindowDidResizeNotification, NSWindowDidMoveNotification].forEach { notification in
NSNotificationCenter.defaultCenter().addObserver(self, selector: "moveWindowButtons", name: notification, object: self)
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(moveWindowButtons), name: notification, object: self)
}
moveWindowButtons()
}
Expand Down
6 changes: 3 additions & 3 deletions app/CocoaPods/Podfile.storyboard
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
</dependencies>
<scenes>
<!--Window Controller-->
Expand Down Expand Up @@ -444,7 +444,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="150" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" id="Lnh-3i-Tcu">
<rect key="frame" x="0.0" y="0.0" width="510" height="598"/>
<rect key="frame" x="0.0" y="0.0" width="507" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
Expand Down
4 changes: 2 additions & 2 deletions app/CocoaPods/URL Handling/URLHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class URLHandler: NSObject {
let manager = NSAppleEventManager.sharedAppleEventManager()
manager.setEventHandler(
self,
andSelector: "handleEvent:withReply:",
andSelector: #selector(handleEvent(_:withReply:)),
forEventClass: eventClass,
andEventID: eventId
)
Expand All @@ -21,7 +21,7 @@ class URLHandler: NSObject {
func handleEvent(event: NSAppleEventDescriptor, withReply reply: NSAppleEventDescriptor) {
let key = AEKeyword(keyDirectObject)
let url = event.paramDescriptorForKeyword(key)?.stringValue
print("Handled URL: \(url)")
print("Handled URL: \(url)", terminator: "")
}

}
Expand Down

0 comments on commit 7dd2fc9

Please sign in to comment.