Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update project for Xcode 9.3 and CircleCI 2.0 #57

Merged
merged 7 commits into from
Apr 18, 2018
Merged

Update project for Xcode 9.3 and CircleCI 2.0 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb05e42
Run 32-bit Mac check in Xcode 9.3.
Apr 3, 2018
3c2c77d
Update project for Xcode 9.3.
Apr 3, 2018
ce820ca
Xcode project and scheme shenanigans.
Apr 3, 2018
5494f46
Whitespace.
Apr 3, 2018
d6cdb68
Build on CircleCI 2.0 and Xcode 9.3.
Apr 5, 2018
9c33e11
Stop building watchOS.
Apr 5, 2018
a7b2b86
Install CocoaPods specs from CircleCI mirror.
Apr 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 76 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
version: 2

jobs:
test-swift-3:
macos:
xcode: "9.3.0"
steps:
- checkout
- run: ./scripts/macOS_Swift_3.sh
- run: ./scripts/iOS_Swift_3_32_bit.sh
- run: ./scripts/iOS_Swift_3_64_bit.sh
- run: ./scripts/iOS_demo_Swift_3.sh
- run: ./scripts/tvOS_Swift_3.sh

test-swift-4:
macos:
xcode: "9.3.0"
steps:
- checkout
- run: ./scripts/macOS_Swift_4.sh
- run: ./scripts/iOS_Swift_4_32_bit.sh
- run: ./scripts/iOS_Swift_4_64_bit.sh
- run: ./scripts/iOS_demo_Swift_4.sh
- run: ./scripts/tvOS_Swift_4.sh

carthage-build:
macos:
xcode: "9.3.0"
steps:
- checkout
- run:
name: Update homebrew dependencies
command: brew update 1> /dev/null 2> /dev/null
- run:
name: Update Carthage
command: brew outdated carthage || (brew uninstall carthage --force; HOMEBREW_NO_AUTO_UPDATE=1 brew install carthage --force-bottle)
- run: carthage build --no-skip-current && for platform in Mac iOS tvOS; do test -d Carthage/Build/${platform}/Anchorage.framework || exit 1; done

deploy-to-cocoapods:
macos:
xcode: "9.3.0"
steps:
- checkout
- run:
name: Install CocoaPods Specs Repo
command: |
curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
- run: bundle install
- run: bundle exec pod trunk push

workflows:
version: 2
build-test-deploy:
jobs:
- test-swift-3:
filters:
tags:
only: /.*/
- test-swift-4:
filters:
tags:
only: /.*/
- carthage-build:
filters:
tags:
only: /.*/
- deploy-to-cocoapods:
requires:
- test-swift-3
- test-swift-4
- carthage-build
filters:
tags:
only: /\d+(\.\d+)*(-.*)*/
branches:
ignore: /.*/
6 changes: 5 additions & 1 deletion Anchorage.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0900;
LastUpgradeCheck = 0930;
ORGANIZATIONNAME = Raizlabs;
TargetAttributes = {
2DD242671D95C2CE001D6725 = {
Expand Down Expand Up @@ -756,13 +756,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -814,13 +816,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down
8 changes: 8 additions & 0 deletions Anchorage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
6 changes: 3 additions & 3 deletions Anchorage.xcodeproj/xcshareddata/xcschemes/Anchorage-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "0930"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,8 +26,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand Down
6 changes: 3 additions & 3 deletions Anchorage.xcodeproj/xcshareddata/xcschemes/Anchorage-macOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "0930"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,8 +26,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand Down
6 changes: 3 additions & 3 deletions Anchorage.xcodeproj/xcshareddata/xcschemes/Anchorage-tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "0930"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,8 +26,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand Down
4 changes: 1 addition & 3 deletions Anchorage.xcodeproj/xcshareddata/xcschemes/AnchorageDemo.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "0930"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -56,7 +55,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
4 changes: 3 additions & 1 deletion Anchorage.xcodeproj/xcshareddata/xcschemes/RunAllTests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "0930"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -36,6 +37,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
1 change: 1 addition & 0 deletions Source/Internal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ internal extension EdgeInsets {
right: constant
)
}

}

internal prefix func - (rhs: EdgeInsets) -> EdgeInsets {
Expand Down
36 changes: 0 additions & 36 deletions circle.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/iOS_Swift_3_64_bit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o pipefail && \
-project Anchorage.xcodeproj \
-scheme Anchorage-iOS \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=iPhone 6s,OS=11.0.1" \
-destination "platform=iOS Simulator,name=iPhone 6s,OS=11.3" \
SWIFT_VERSION=3.0 \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGN_IDENTITY= \
Expand Down
2 changes: 1 addition & 1 deletion scripts/iOS_Swift_4_64_bit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o pipefail && \
-project Anchorage.xcodeproj \
-scheme Anchorage-iOS \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=iPhone 6s,OS=11.0.1" \
-destination "platform=iOS Simulator,name=iPhone 6s,OS=11.3" \
SWIFT_VERSION=4.0 \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGN_IDENTITY= \
Expand Down
2 changes: 1 addition & 1 deletion scripts/iOS_demo_Swift_3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o pipefail && \
-project Anchorage.xcodeproj \
-scheme AnchorageDemo \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=iPhone 6s,OS=11.0.1" \
-destination "platform=iOS Simulator,name=iPhone 6s,OS=11.3" \
SWIFT_VERSION=3.0 \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGN_IDENTITY= \
Expand Down
2 changes: 1 addition & 1 deletion scripts/iOS_demo_Swift_4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o pipefail && \
-project Anchorage.xcodeproj \
-scheme AnchorageDemo \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=iPhone 6s,OS=11.0.1" \
-destination "platform=iOS Simulator,name=iPhone 6s,OS=11.3" \
SWIFT_VERSION=4.0 \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGN_IDENTITY= \
Expand Down
2 changes: 1 addition & 1 deletion scripts/tvOS_Swift_3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o pipefail && \
-project Anchorage.xcodeproj \
-scheme Anchorage-tvOS \
-sdk appletvsimulator \
-destination "platform=tvOS Simulator,name=Apple TV,OS=11.0" \
-destination "platform=tvOS Simulator,name=Apple TV,OS=11.3" \
SWIFT_VERSION=3.0 \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGN_IDENTITY= \
Expand Down
2 changes: 1 addition & 1 deletion scripts/tvOS_Swift_4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o pipefail && \
-project Anchorage.xcodeproj \
-scheme Anchorage-tvOS \
-sdk appletvsimulator \
-destination "platform=tvOS Simulator,name=Apple TV,OS=11.0" \
-destination "platform=tvOS Simulator,name=Apple TV,OS=11.3" \
SWIFT_VERSION=4.0 \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGN_IDENTITY= \
Expand Down