Skip to content
This repository has been archived by the owner on Apr 30, 2019. It is now read-only.

Commit

Permalink
Merge pull request #3 from ustwo/xcode8
Browse files Browse the repository at this point in the history 
Xcode 8 and Swift 2.3 Support
  • Loading branch information
Aaron McTavish authored Oct 12, 2016
2 parents e7f9964 + ed0f721 commit ac55d02
Show file tree
Hide file tree
Showing 22 changed files with 140 additions and 99 deletions.
56 changes: 35 additions & 21 deletions Brunel.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,13 +499,13 @@
isa = PBXNativeTarget;
buildConfigurationList = 008280FF1C4CFE6600186513 /* Build configuration list for PBXNativeTarget "Brunel tvOS" */;
buildPhases = (
901D4B45F1EA19BDEAEF945C /* Check Pods Manifest.lock */,
901D4B45F1EA19BDEAEF945C /* [CP] Check Pods Manifest.lock */,
008280EF1C4CFE6500186513 /* Sources */,
008280F01C4CFE6500186513 /* Frameworks */,
008280F11C4CFE6500186513 /* Resources */,
001F5DA21C5757F100E3C520 /* ShellScript */,
B9EBD1D4B7934481D4323394 /* Embed Pods Frameworks */,
272A4F4D00929962C50B37AE /* Copy Pods Resources */,
B9EBD1D4B7934481D4323394 /* [CP] Embed Pods Frameworks */,
272A4F4D00929962C50B37AE /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -520,13 +520,13 @@
isa = PBXNativeTarget;
buildConfigurationList = 00FED0A41C4CF10C00756A37 /* Build configuration list for PBXNativeTarget "Brunel iOS" */;
buildPhases = (
59BD87CA2992D3C4F07105D3 /* Check Pods Manifest.lock */,
59BD87CA2992D3C4F07105D3 /* [CP] Check Pods Manifest.lock */,
00FED08C1C4CF10C00756A37 /* Sources */,
00FED08D1C4CF10C00756A37 /* Frameworks */,
00FED08E1C4CF10C00756A37 /* Resources */,
00ACDB751C52656800C210F1 /* ShellScript */,
13F9CA5BB0A752C60015E15E /* Embed Pods Frameworks */,
0A1DAF4C2AC8C032275FB2C7 /* Copy Pods Resources */,
13F9CA5BB0A752C60015E15E /* [CP] Embed Pods Frameworks */,
0A1DAF4C2AC8C032275FB2C7 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -544,14 +544,15 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0720;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = ustwo;
TargetAttributes = {
008280F21C4CFE6500186513 = {
CreatedOnToolsVersion = 7.2;
};
00FED08F1C4CF10C00756A37 = {
CreatedOnToolsVersion = 7.2;
LastSwiftMigration = 0800;
};
};
};
Expand Down Expand Up @@ -623,89 +624,89 @@
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
};
0A1DAF4C2AC8C032275FB2C7 /* Copy Pods Resources */ = {
0A1DAF4C2AC8C032275FB2C7 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Brunel iOS/Pods-Brunel iOS-resources.sh\"\n";
showEnvVarsInLog = 0;
};
13F9CA5BB0A752C60015E15E /* Embed Pods Frameworks */ = {
13F9CA5BB0A752C60015E15E /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Brunel iOS/Pods-Brunel iOS-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
272A4F4D00929962C50B37AE /* Copy Pods Resources */ = {
272A4F4D00929962C50B37AE /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Brunel tvOS/Pods-Brunel tvOS-resources.sh\"\n";
showEnvVarsInLog = 0;
};
59BD87CA2992D3C4F07105D3 /* Check Pods Manifest.lock */ = {
59BD87CA2992D3C4F07105D3 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] 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";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
901D4B45F1EA19BDEAEF945C /* Check Pods Manifest.lock */ = {
901D4B45F1EA19BDEAEF945C /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] 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";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
B9EBD1D4B7934481D4323394 /* Embed Pods Frameworks */ = {
B9EBD1D4B7934481D4323394 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -840,13 +841,15 @@
isa = XCBuildConfiguration;
baseConfigurationReference = B483C3ADF7C7B3D290CCBB5C /* Pods-Brunel tvOS.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
INFOPLIST_FILE = "$(SRCROOT)/Sources-tvOS/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ustwo.Brunel;
PRODUCT_NAME = Brunel;
SDKROOT = appletvos;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.1;
};
Expand All @@ -856,13 +859,15 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 7BE80DD8A3EE047F6CD52AE7 /* Pods-Brunel tvOS.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
INFOPLIST_FILE = "$(SRCROOT)/Sources-tvOS/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ustwo.Brunel;
PRODUCT_NAME = Brunel;
SDKROOT = appletvos;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.1;
};
Expand All @@ -881,8 +886,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand Down Expand Up @@ -927,8 +934,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -948,6 +957,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand All @@ -957,6 +967,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = FE0F06C94605BEFBDA1444D8 /* Pods-Brunel iOS.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
Expand All @@ -968,13 +979,15 @@
PRODUCT_BUNDLE_IDENTIFIER = com.ustwo.Brunel;
PRODUCT_NAME = Brunel;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
00FED0A61C4CF10C00756A37 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 48B4321B3A8401F018B6E793 /* Pods-Brunel iOS.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
Expand All @@ -985,6 +998,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ustwo.Brunel;
PRODUCT_NAME = Brunel;
SWIFT_VERSION = 2.3;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Brunel.xcodeproj/xcshareddata/xcschemes/Brunel iOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Brunel.xcodeproj/xcshareddata/xcschemes/Brunel tvOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,20 @@ All notable changes to this project will be documented in this file.
`Brunel` adheres to [Semantic Versioning](http://semver.org/).

#### 1.x Releases
- `1.1.x` Releases - [1.1.0](#110)
- `1.0.x` Releases - [1.0.0](#100)

---

## [1.1.0](https://github.com/ustwo/brunel/releases/tag/1.1.0)

#### Updated
- Migrated to Xcode 8 and Swift 2.3.
- Updated CocoaPods dependency to v1.1.0 RC3.
- Updated pods to versions that support Swift 2.3.


## [1.0.0](https://github.com/ustwo/brunel/releases/tag/1.0.0)
Released on some future date.

#### Added
- Initial release of `Brunel`.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source 'https://rubygems.org'

gem 'cocoapods', '1.0.0.beta.2'
gem 'cocoapods', '1.1.0.rc.3'
66 changes: 34 additions & 32 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,67 +1,69 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.5.1)
activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.0.beta.1)
cocoapods (1.0.0.beta.2)
activesupport (>= 4.0.2)
claide (>= 1.0.0.beta.1, < 2.0)
cocoapods-core (= 1.0.0.beta.2)
cocoapods-deintegrate (>= 1.0.0.beta.1, < 2.0)
cocoapods-downloader (>= 1.0.0.beta.1, < 2.0)
cocoapods-plugins (>= 1.0.0.beta.1, < 2.0)
cocoapods-search (>= 1.0.0.beta.1, < 2.0)
cocoapods-stats (>= 1.0.0.beta.2, < 2.0)
cocoapods-trunk (>= 1.0.0.beta.1, < 2.0)
cocoapods-try (>= 1.0.0.beta.2, < 2.0)
claide (1.0.1)
cocoapods (1.1.0.rc.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.1, < 2.0)
cocoapods-core (= 1.1.0.rc.3)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.1, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (= 1.1.0.beta.1)
cocoapods-try (>= 1.1.0, < 2.0)
colored (~> 1.2)
escape (~> 0.0.4)
fourflusher (~> 0.3.0)
molinillo (~> 0.4.1)
fourflusher (~> 2.0)
gh_inspector (~> 1.0)
molinillo (~> 0.5.1)
nap (~> 1.0)
xcodeproj (>= 1.0.0.beta.1, < 2.0)
cocoapods-core (1.0.0.beta.2)
activesupport (>= 4.0.2)
xcodeproj (>= 1.3.2, < 2.0)
cocoapods-core (1.1.0.rc.3)
activesupport (>= 4.0.2, < 5)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.0.beta.1)
cocoapods-downloader (1.0.0.beta.1)
cocoapods-plugins (1.0.0.beta.1)
cocoapods-deintegrate (1.0.1)
cocoapods-downloader (1.1.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0.beta.1)
cocoapods-stats (1.0.0.beta.3)
cocoapods-trunk (1.0.0.beta.1)
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.1.0.beta.1)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (1.0.0.beta.2)
cocoapods-try (1.1.0)
colored (1.2)
escape (0.0.4)
fourflusher (0.3.0)
fourflusher (2.0.0)
fuzzy_match (2.0.4)
gh_inspector (1.0.2)
i18n (0.7.0)
json (1.8.3)
minitest (5.8.4)
molinillo (0.4.2)
minitest (5.9.1)
molinillo (0.5.1)
nap (1.1.0)
netrc (0.7.8)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (1.0.0.beta.2)
xcodeproj (1.3.2)
activesupport (>= 3)
claide (>= 1.0.0.beta.1, < 2.0)
claide (>= 1.0.1, < 2.0)
colored (~> 1.2)

PLATFORMS
ruby

DEPENDENCIES
cocoapods (= 1.0.0.beta.2)
cocoapods (= 1.1.0.rc.3)

BUNDLED WITH
1.11.2
1.13.3
Loading

0 comments on commit ac55d02

Please sign in to comment.