Skip to content

Create universal framework to support watchOS & tvOS by using xcconfigs. #38

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.

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

Merged
merged 1 commit into from
Dec 8, 2015
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Carthage/Checkouts/xcconfigs"]
path = Carthage/Checkouts/xcconfigs
url = https://github.com/mrackwitz/xcconfigs.git
1 change: 1 addition & 0 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "mrackwitz/xcconfigs"
1 change: 1 addition & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "mrackwitz/xcconfigs" "3.0"
1 change: 1 addition & 0 deletions Carthage/Checkouts/xcconfigs
Submodule xcconfigs added at 6b2682
13 changes: 13 additions & 0 deletions Configurations/Base.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// Base.xcconfig
// SwiftState
//
// Created by Yasuhiro Inami on 2015-12-09.
// Copyright © 2015 Yasuhiro Inami. All rights reserved.
//

CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer;
MACOSX_DEPLOYMENT_TARGET = 10.9;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
11 changes: 11 additions & 0 deletions Configurations/Debug.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Debug.xcconfig
// SwiftState
//
// Created by Yasuhiro Inami on 2015-12-09.
// Copyright © 2015 Yasuhiro Inami. All rights reserved.
//

#include "Base.xcconfig"

SWIFT_OPTIMIZATION_LEVEL = -Onone;
11 changes: 11 additions & 0 deletions Configurations/Release.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Release.xcconfig
// SwiftState
//
// Created by Yasuhiro Inami on 2015-12-09.
// Copyright © 2015 Yasuhiro Inami. All rights reserved.
//

#include "Base.xcconfig"

SWIFT_OPTIMIZATION_LEVEL = -Owholemodule;
2 changes: 1 addition & 1 deletion Sources/_Random.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2015 Yasuhiro Inami. All rights reserved.
//

#if os(OSX) || os(iOS)
#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
import Darwin
#else
import Glibc
Expand Down
334 changes: 58 additions & 276 deletions SwiftState.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

100 changes: 0 additions & 100 deletions SwiftState.xcodeproj/xcshareddata/xcschemes/SwiftState-iOS.xcscheme

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "1FA61FFF1996601000460108"
BuildableName = "SwiftState.framework"
BlueprintName = "SwiftState-OSX"
BlueprintName = "SwiftState"
ReferencedContainer = "container:SwiftState.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -34,8 +34,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1FA6200A1996601000460108"
BuildableName = "SwiftState-OSXTests.xctest"
BlueprintName = "SwiftState-OSXTests"
BuildableName = "SwiftStateTests.xctest"
BlueprintName = "SwiftStateTests"
ReferencedContainer = "container:SwiftState.xcodeproj">
</BuildableReference>
</TestableReference>
Expand All @@ -45,7 +45,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "1FA61FFF1996601000460108"
BuildableName = "SwiftState.framework"
BlueprintName = "SwiftState-OSX"
BlueprintName = "SwiftState"
ReferencedContainer = "container:SwiftState.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -67,7 +67,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "1FA61FFF1996601000460108"
BuildableName = "SwiftState.framework"
BlueprintName = "SwiftState-OSX"
BlueprintName = "SwiftState"
ReferencedContainer = "container:SwiftState.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -85,7 +85,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "1FA61FFF1996601000460108"
BuildableName = "SwiftState.framework"
BlueprintName = "SwiftState-OSX"
BlueprintName = "SwiftState"
ReferencedContainer = "container:SwiftState.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
11 changes: 8 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
machine:
xcode:
version: "7.0"


checkout:
post:
- git submodule sync
- git submodule update --init

test:
override:
- set -o pipefail &&
xcodebuild
-scheme "SwiftState-OSX"
-scheme "SwiftState"
clean build test |
tee $CIRCLE_ARTIFACTS/xcode_raw-OSX.log |
xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-OSX.xml
Expand All @@ -18,7 +23,7 @@ test:
PROVISIONING_PROFILE=
-sdk iphonesimulator
-destination 'platform=iOS Simulator,OS=9.0,name=iPhone 6'
-scheme "SwiftState-iOS"
-scheme "SwiftState"
clean build test |
tee $CIRCLE_ARTIFACTS/xcode_raw-iOS.log |
xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-iOS.xml