Permalink
Browse files

Update to Swift 2.3 and latest macOS SDK

  • Loading branch information...
1 parent 54ef2ef commit af9b5ce8d5cf1f7065b8e70e4ddff8bce6963633 @andreyvit andreyvit committed Jul 3, 2016
@@ -527,6 +527,7 @@
TargetAttributes = {
430019AE1BBDEE1600ECF2AF = {
CreatedOnToolsVersion = 7.0;
+ LastSwiftMigration = 0800;
};
430019B81BBDEE1600ECF2AF = {
CreatedOnToolsVersion = 7.0;
@@ -750,6 +751,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.livereload.LRActionKit;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
+ SWIFT_VERSION = 2.3;
};
name = Debug;
};
@@ -768,6 +770,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.livereload.LRActionKit;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
+ SWIFT_VERSION = 2.3;
};
name = Release;
};
@@ -280,6 +280,7 @@
TargetAttributes = {
43994D2E1BD35119003D034E = {
CreatedOnToolsVersion = 7.0.1;
+ LastSwiftMigration = 0800;
};
43994D3D1BD35176003D034E = {
CreatedOnToolsVersion = 7.0.1;
@@ -468,6 +469,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.livereload.LRProjectKit;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
+ SWIFT_VERSION = 2.3;
};
name = Debug;
};
@@ -486,6 +488,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.livereload.LRProjectKit;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
+ SWIFT_VERSION = 2.3;
};
name = Release;
};
@@ -1,5 +1,5 @@
import Foundation
import XCTest
-let fixturesDirectoryURL = NSURL(fileURLWithPath: __FILE__, isDirectory: false).URLByDeletingLastPathComponent!.URLByDeletingLastPathComponent!.URLByAppendingPathComponent("TestFixtures", isDirectory: true)
-let testProjectsDirectoryURL = NSURL(fileURLWithPath: __FILE__, isDirectory: false).URLByDeletingLastPathComponent!.URLByDeletingLastPathComponent!.URLByDeletingLastPathComponent!.URLByAppendingPathComponent("mac/LiveReloadTestProjects", isDirectory: true)
+let fixturesDirectoryURL = NSURL(fileURLWithPath: #file, isDirectory: false).URLByDeletingLastPathComponent!.URLByDeletingLastPathComponent!.URLByAppendingPathComponent("TestFixtures", isDirectory: true)
+let testProjectsDirectoryURL = NSURL(fileURLWithPath: #file, isDirectory: false).URLByDeletingLastPathComponent!.URLByDeletingLastPathComponent!.URLByDeletingLastPathComponent!.URLByAppendingPathComponent("mac/LiveReloadTestProjects", isDirectory: true)
@@ -369,12 +369,13 @@
430F0CDB1BB0AB3D00F8B30A /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0710;
+ LastUpgradeCheck = 0800;
ORGANIZATIONNAME = LiveReload;
TargetAttributes = {
430F0CE21BB0AB3D00F8B30A = {
CreatedOnToolsVersion = 7.0;
DevelopmentTeam = D963M2VVCH;
+ LastSwiftMigration = 0800;
SystemCapabilities = {
com.apple.Sandbox = {
enabled = 1;
@@ -383,6 +384,7 @@
};
430F0CF11BB0AB3D00F8B30A = {
CreatedOnToolsVersion = 7.0;
+ LastSwiftMigration = 0800;
TestTargetID = 430F0CE21BB0AB3D00F8B30A;
};
430F0CFC1BB0AB3E00F8B30A = {
@@ -584,13 +586,14 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = LiveReload.entitlements;
- CODE_SIGN_IDENTITY = "Developer ID Application";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = Metadata/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = com.livereload.LiveReload;
PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 2.3;
};
name = Debug;
};
@@ -599,13 +602,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = LiveReload.entitlements;
- CODE_SIGN_IDENTITY = "Developer ID Application";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = Metadata/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = com.livereload.LiveReload;
PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ SWIFT_VERSION = 2.3;
};
name = Release;
};
@@ -618,6 +623,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.livereload.LiveReloadTests;
PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 2.3;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LiveReload.app/Contents/MacOS/LiveReload";
};
name = Debug;
@@ -631,6 +637,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.livereload.LiveReloadTests;
PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ SWIFT_VERSION = 2.3;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LiveReload.app/Contents/MacOS/LiveReload";
};
name = Release;
@@ -656,6 +664,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.livereload.LiveReloadUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TEST_TARGET_NAME = LiveReload;
USES_XCTRUNNER = YES;
};
@@ -1,7 +1,6 @@
import Cocoa
import ExpressiveFoundation
import LRProjectKit
-import LRAbstractModel
@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate {
@@ -2,7 +2,7 @@ import Cocoa
import LRProjectKit
import Uniflow
-public protocol TreeItem: class, Identifiable, Updateable {
+public protocol TreeItem: class, Identifiable {
var hasChildren: Bool { get }
@@ -353,6 +353,11 @@
attributes = {
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0700;
+ TargetAttributes = {
+ A4CF3FA6B8C5B1981658D73F65A72814 = {
+ LastSwiftMigration = 0800;
+ };
+ };
};
buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
compatibilityVersion = "Xcode 3.2";
@@ -552,6 +557,7 @@
PRODUCT_NAME = PromiseKit;
SDKROOT = macosx;
SKIP_INSTALL = YES;
+ SWIFT_VERSION = 2.3;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
@@ -580,6 +586,7 @@
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_VERSION = 2.3;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};

0 comments on commit af9b5ce

Please sign in to comment.