Skip to content
This repository has been archived by the owner on Feb 17, 2021. It is now read-only.

migrate to Xcode 8 (fixes #50) #49

Merged
merged 2 commits into from Sep 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode7.3
osx_image: xcode8
script: sh build.sh /tmp/LayoutKit
after_success:
- bash <(curl -s https://codecov.io/bash) -D /tmp/LayoutKit
2,547 changes: 1,521 additions & 1,026 deletions LayoutKit.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47EF21CC57348003820E8"
BlueprintIdentifier = "0BCB755E1D8720110065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-iOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -33,17 +33,17 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47EFB1CC57348003820E8"
BuildableName = "LayoutKitTests-iOS.xctest"
BlueprintName = "LayoutKitTests-iOS"
BlueprintIdentifier = "0BCB75671D8720110065E02A"
BuildableName = "LayoutKit-iOSTests.xctest"
BlueprintName = "LayoutKit-iOSTests"
ReferencedContainer = "container:LayoutKit.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47EF21CC57348003820E8"
BlueprintIdentifier = "0BCB755E1D8720110065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-iOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -65,7 +65,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47EF21CC57348003820E8"
BlueprintIdentifier = "0BCB755E1D8720110065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-iOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -83,7 +83,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47EF21CC57348003820E8"
BlueprintIdentifier = "0BCB755E1D8720110065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-iOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5191421D2922C800769358"
BlueprintIdentifier = "0BCB75971D8722370065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-macOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -32,17 +32,17 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5191651D29241200769358"
BuildableName = "LayoutKitTests-macOS.xctest"
BlueprintName = "LayoutKitTests-macOS"
BlueprintIdentifier = "0BCB759F1D8722370065E02A"
BuildableName = "LayoutKit-macOSTests.xctest"
BlueprintName = "LayoutKit-macOSTests"
ReferencedContainer = "container:LayoutKit.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5191421D2922C800769358"
BlueprintIdentifier = "0BCB75971D8722370065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-macOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -64,7 +64,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5191421D2922C800769358"
BlueprintIdentifier = "0BCB75971D8722370065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-macOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -82,7 +82,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5191421D2922C800769358"
BlueprintIdentifier = "0BCB75971D8722370065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-macOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B2E753C1D40837100CD7336"
BlueprintIdentifier = "0BCB757B1D8721370065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-tvOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -32,17 +32,17 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B2E75631D4084C400CD7336"
BuildableName = "LayoutKitTests-tvOS.xctest"
BlueprintName = "LayoutKitTests-tvOS"
BlueprintIdentifier = "0BCB75831D8721370065E02A"
BuildableName = "LayoutKit-tvOSTests.xctest"
BlueprintName = "LayoutKit-tvOSTests"
ReferencedContainer = "container:LayoutKit.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B2E753C1D40837100CD7336"
BlueprintIdentifier = "0BCB757B1D8721370065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-tvOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -64,7 +64,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B2E753C1D40837100CD7336"
BlueprintIdentifier = "0BCB757B1D8721370065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-tvOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -82,7 +82,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B2E753C1D40837100CD7336"
BlueprintIdentifier = "0BCB757B1D8721370065E02A"
BuildableName = "LayoutKit.framework"
BlueprintName = "LayoutKit-tvOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BD9EB301CEBD90800F09173"
BlueprintIdentifier = "0BCB75B51D8723B30065E02A"
BuildableName = "LayoutKitExampleLayouts.framework"
BlueprintName = "LayoutKitExampleLayouts"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -28,26 +28,7 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47EFB1CC57348003820E8"
BuildableName = "LayoutKitTests-iOS.xctest"
BlueprintName = "LayoutKitTests-iOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BD9EB301CEBD90800F09173"
BuildableName = "LayoutKitExampleLayouts.framework"
BlueprintName = "LayoutKitExampleLayouts"
ReferencedContainer = "container:LayoutKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
Expand All @@ -64,7 +45,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BD9EB301CEBD90800F09173"
BlueprintIdentifier = "0BCB75B51D8723B30065E02A"
BuildableName = "LayoutKitExampleLayouts.framework"
BlueprintName = "LayoutKitExampleLayouts"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand All @@ -82,7 +63,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BD9EB301CEBD90800F09173"
BlueprintIdentifier = "0BCB75B51D8723B30065E02A"
BuildableName = "LayoutKitExampleLayouts.framework"
BlueprintName = "LayoutKitExampleLayouts"
ReferencedContainer = "container:LayoutKit.xcodeproj">
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47F2B1CC57492003820E8"
BuildableName = "LayoutKitSampleApp-iOS.app"
BlueprintName = "LayoutKitSampleApp-iOS"
BlueprintIdentifier = "0B2D09AF1D8735E1007E487C"
BuildableName = "LayoutKitSampleApp.app"
BlueprintName = "LayoutKitSampleApp"
ReferencedContainer = "container:LayoutKit.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -28,23 +28,13 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47EFB1CC57348003820E8"
BuildableName = "LayoutKitTests-iOS.xctest"
BlueprintName = "LayoutKitTests-iOS"
ReferencedContainer = "container:LayoutKit.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47F2B1CC57492003820E8"
BuildableName = "LayoutKitSampleApp-iOS.app"
BlueprintName = "LayoutKitSampleApp-iOS"
BlueprintIdentifier = "0B2D09AF1D8735E1007E487C"
BuildableName = "LayoutKitSampleApp.app"
BlueprintName = "LayoutKitSampleApp"
ReferencedContainer = "container:LayoutKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -65,9 +55,9 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47F2B1CC57492003820E8"
BuildableName = "LayoutKitSampleApp-iOS.app"
BlueprintName = "LayoutKitSampleApp-iOS"
BlueprintIdentifier = "0B2D09AF1D8735E1007E487C"
BuildableName = "LayoutKitSampleApp.app"
BlueprintName = "LayoutKitSampleApp"
ReferencedContainer = "container:LayoutKit.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
Expand All @@ -84,9 +74,9 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0BE47F2B1CC57492003820E8"
BuildableName = "LayoutKitSampleApp-iOS.app"
BlueprintName = "LayoutKitSampleApp-iOS"
BlueprintIdentifier = "0B2D09AF1D8735E1007E487C"
BuildableName = "LayoutKitSampleApp.app"
BlueprintName = "LayoutKitSampleApp"
ReferencedContainer = "container:LayoutKit.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
Expand Down
2 changes: 1 addition & 1 deletion LayoutKit/AppKitSupport.swift
Expand Up @@ -17,7 +17,7 @@ public typealias UserInterfaceLayoutDirection = NSUserInterfaceLayoutDirection
extension NSView {

func convertToAbsoluteCoordinates(rect: CGRect) -> CGRect {
return convertRect(rect, fromView: nil)
return convertRect(rect, toView: nil)
}

func convertFromAbsoluteCoordinates(rect: CGRect) -> CGRect {
Expand Down
19 changes: 19 additions & 0 deletions LayoutKit/LayoutKit.h
@@ -0,0 +1,19 @@
//
// LayoutKit.h
// LayoutKit
//
// Created by Nick Snyder on 9/12/16.
//
//

#import <Foundation/Foundation.h>

//! Project version number for LayoutKit.
FOUNDATION_EXPORT double LayoutKitVersionNumber;

//! Project version string for LayoutKit.
FOUNDATION_EXPORT const unsigned char LayoutKitVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <LayoutKit/PublicHeader.h>


19 changes: 19 additions & 0 deletions LayoutKitExampleLayouts/LayoutKitExampleLayouts.h
@@ -0,0 +1,19 @@
//
// LayoutKitExampleLayouts.h
// LayoutKitExampleLayouts
//
// Created by Nick Snyder on 9/12/16.
//
//

#import <Foundation/Foundation.h>

//! Project version number for LayoutKitExampleLayouts.
FOUNDATION_EXPORT double LayoutKitExampleLayoutsVersionNumber;

//! Project version string for LayoutKitExampleLayouts.
FOUNDATION_EXPORT const unsigned char LayoutKitExampleLayoutsVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <LayoutKitExampleLayouts/PublicHeader.h>


2 changes: 0 additions & 2 deletions LayoutKitSampleApp/Info.plist
Expand Up @@ -16,8 +16,6 @@
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
Expand Down