Skip to content

Commit 5489a31

Browse files
committed
Merge pull request #56 from ReactKit/universal-framework
Create universal framework to support watchOS & tvOS by using xcconfigs.
2 parents 68ae3e6 + 392e788 commit 5489a31

File tree

14 files changed

+147
-283
lines changed

14 files changed

+147
-283
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ DerivedData
1717
*.xcuserstate
1818

1919
Carthage/Build
20+
.build
21+
Packages/

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "Carthage/Checkouts/Async"]
55
path = Carthage/Checkouts/Async
66
url = https://github.com/duemunk/Async.git
7+
[submodule "Carthage/Checkouts/xcconfigs"]
8+
path = Carthage/Checkouts/xcconfigs
9+
url = https://github.com/mrackwitz/xcconfigs.git

Cartfile.private

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
github "Alamofire/Alamofire" ~> 3.1.3
2-
github "duemunk/Async" ~> 1.6.4
2+
github "duemunk/Async" ~> 1.6.4
3+
github "mrackwitz/xcconfigs"

Cartfile.resolved

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
github "Alamofire/Alamofire" "3.1.3"
1+
github "Alamofire/Alamofire" "3.1.5"
22
github "duemunk/Async" "1.6.4"
3+
github "mrackwitz/xcconfigs" "3.0"

Carthage/Checkouts/Alamofire

Submodule Alamofire updated 59 files

Carthage/Checkouts/xcconfigs

Submodule xcconfigs added at 6b2682f

Configurations/Base.xcconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//
2+
// Base.xcconfig
3+
// SwiftTask
4+
//
5+
// Created by Yasuhiro Inami on 2016-01-30.
6+
// Copyright © 2015 Yasuhiro Inami. All rights reserved.
7+
//
8+
9+
CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer;
10+
MACOSX_DEPLOYMENT_TARGET = 10.9;
11+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12+
WATCHOS_DEPLOYMENT_TARGET = 2.0;
13+
TVOS_DEPLOYMENT_TARGET = 9.0;

Configurations/Debug.xcconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//
2+
// Debug.xcconfig
3+
// SwiftTask
4+
//
5+
// Created by Yasuhiro Inami on 2016-01-30.
6+
// Copyright © 2015 Yasuhiro Inami. All rights reserved.
7+
//
8+
9+
#include "Base.xcconfig"
10+
11+
SWIFT_OPTIMIZATION_LEVEL = -Onone;

Configurations/Release.xcconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//
2+
// Release.xcconfig
3+
// SwiftTask
4+
//
5+
// Created by Yasuhiro Inami on 2016-01-30.
6+
// Copyright © 2015 Yasuhiro Inami. All rights reserved.
7+
//
8+
9+
#include "Base.xcconfig"
10+
11+
SWIFT_OPTIMIZATION_LEVEL = -Owholemodule;

SwiftTask.podspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ Pod::Spec.new do |s|
1111

1212
s.osx.deployment_target = '10.9'
1313
s.ios.deployment_target = '8.0'
14+
s.watchos.deployment_target = '2.0'
1415
s.tvos.deployment_target = '9.0'
1516
end

SwiftTask.xcodeproj/project.pbxproj

Lines changed: 86 additions & 168 deletions
Large diffs are not rendered by default.

SwiftTask.xcodeproj/xcshareddata/xcschemes/SwiftTask-iOS.xcscheme

Lines changed: 0 additions & 99 deletions
This file was deleted.

SwiftTask.xcodeproj/xcshareddata/xcschemes/SwiftTask-OSX.xcscheme renamed to SwiftTask.xcodeproj/xcshareddata/xcschemes/SwiftTask.xcscheme

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "1F46DED3199EDF1000F97868"
1818
BuildableName = "SwiftTask.framework"
19-
BlueprintName = "SwiftTask-OSX"
19+
BlueprintName = "SwiftTask"
2020
ReferencedContainer = "container:SwiftTask.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
3232
skipped = "NO">
@@ -44,19 +44,19 @@
4444
BuildableIdentifier = "primary"
4545
BlueprintIdentifier = "1F46DED3199EDF1000F97868"
4646
BuildableName = "SwiftTask.framework"
47-
BlueprintName = "SwiftTask-OSX"
47+
BlueprintName = "SwiftTask"
4848
ReferencedContainer = "container:SwiftTask.xcodeproj">
4949
</BuildableReference>
5050
</MacroExpansion>
5151
<AdditionalOptions>
5252
</AdditionalOptions>
5353
</TestAction>
5454
<LaunchAction
55+
buildConfiguration = "Debug"
5556
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5657
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5758
launchStyle = "0"
5859
useCustomWorkingDirectory = "NO"
59-
buildConfiguration = "Debug"
6060
ignoresPersistentStateOnLaunch = "NO"
6161
debugDocumentVersioning = "YES"
6262
debugServiceExtension = "internal"
@@ -66,25 +66,25 @@
6666
BuildableIdentifier = "primary"
6767
BlueprintIdentifier = "1F46DED3199EDF1000F97868"
6868
BuildableName = "SwiftTask.framework"
69-
BlueprintName = "SwiftTask-OSX"
69+
BlueprintName = "SwiftTask"
7070
ReferencedContainer = "container:SwiftTask.xcodeproj">
7171
</BuildableReference>
7272
</MacroExpansion>
7373
<AdditionalOptions>
7474
</AdditionalOptions>
7575
</LaunchAction>
7676
<ProfileAction
77+
buildConfiguration = "Release"
7778
shouldUseLaunchSchemeArgsEnv = "YES"
7879
savedToolIdentifier = ""
7980
useCustomWorkingDirectory = "NO"
80-
buildConfiguration = "Release"
8181
debugDocumentVersioning = "YES">
8282
<MacroExpansion>
8383
<BuildableReference
8484
BuildableIdentifier = "primary"
8585
BlueprintIdentifier = "1F46DED3199EDF1000F97868"
8686
BuildableName = "SwiftTask.framework"
87-
BlueprintName = "SwiftTask-OSX"
87+
BlueprintName = "SwiftTask"
8888
ReferencedContainer = "container:SwiftTask.xcodeproj">
8989
</BuildableReference>
9090
</MacroExpansion>

circle.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
machine:
22
xcode:
3-
version: "7.1"
3+
version: "7.2"
44

55
checkout:
66
post:
7+
- git submodule sync
78
- git submodule update --init --recursive
89

910
test:
1011
override:
1112
- set -o pipefail &&
1213
xcodebuild
13-
-workspace "SwiftTask.xcworkspace"
14-
-scheme "SwiftTask-OSX"
14+
-scheme "SwiftTask"
1515
clean build |
1616
tee $CIRCLE_ARTIFACTS/xcode_raw-OSX.log |
1717
xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-OSX.xml
@@ -21,8 +21,9 @@ test:
2121
CODE_SIGNING_REQUIRED=NO
2222
CODE_SIGN_IDENTITY=
2323
PROVISIONING_PROFILE=
24-
-workspace "SwiftTask.xcworkspace"
25-
-scheme "SwiftTask-iOS"
24+
-sdk iphonesimulator
25+
-destination 'platform=iOS Simulator,OS=9.0,name=iPhone 6'
26+
-scheme "SwiftTask"
2627
clean build |
2728
tee $CIRCLE_ARTIFACTS/xcode_raw-iOS.log |
2829
xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-iOS.xml

0 commit comments

Comments
 (0)