Merge pull request #56 from ReactKit/universal-framework

inamiy · inamiy · commit 5489a31cc5ff · 2016-01-30T23:03:31.000+09:00
Create universal framework to support watchOS &amp; tvOS by using xcconfigs.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,5 @@ DerivedData
 *.xcuserstate
 
 Carthage/Build
+.build
+Packages/
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "Carthage/Checkouts/Async"]
 	path = Carthage/Checkouts/Async
 	url = https://github.com/duemunk/Async.git
+[submodule "Carthage/Checkouts/xcconfigs"]
+	path = Carthage/Checkouts/xcconfigs
+	url = https://github.com/mrackwitz/xcconfigs.git
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,2 +1,3 @@
 github "Alamofire/Alamofire" ~> 3.1.3
-github "duemunk/Async" ~> 1.6.4
+github "duemunk/Async" ~> 1.6.4
+github "mrackwitz/xcconfigs"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,3 @@
-github "Alamofire/Alamofire" "3.1.3"
+github "Alamofire/Alamofire" "3.1.5"
 github "duemunk/Async" "1.6.4"
+github "mrackwitz/xcconfigs" "3.0"
diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire
@@ -1 +1 @@
-Subproject commit 268a22bff9d660ecd1af260906aa2eb72d261894
+Subproject commit fe3a29941cd1f8d17a81a0843387743238d24d8f
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
@@ -0,0 +1 @@
+Subproject commit 6b2682f73720832f301fdea0ecb6538cf977c53f
diff --git a/Configurations/Base.xcconfig b/Configurations/Base.xcconfig
@@ -0,0 +1,13 @@
+//
+//  Base.xcconfig
+//  SwiftTask
+//
+//  Created by Yasuhiro Inami on 2016-01-30.
+//  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;
diff --git a/Configurations/Debug.xcconfig b/Configurations/Debug.xcconfig
@@ -0,0 +1,11 @@
+//
+//  Debug.xcconfig
+//  SwiftTask
+//
+//  Created by Yasuhiro Inami on 2016-01-30.
+//  Copyright © 2015 Yasuhiro Inami. All rights reserved.
+//
+
+#include "Base.xcconfig"
+
+SWIFT_OPTIMIZATION_LEVEL = -Onone;
diff --git a/Configurations/Release.xcconfig b/Configurations/Release.xcconfig
@@ -0,0 +1,11 @@
+//
+//  Release.xcconfig
+//  SwiftTask
+//
+//  Created by Yasuhiro Inami on 2016-01-30.
+//  Copyright © 2015 Yasuhiro Inami. All rights reserved.
+//
+
+#include "Base.xcconfig"
+
+SWIFT_OPTIMIZATION_LEVEL = -Owholemodule;
diff --git a/SwiftTask.podspec b/SwiftTask.podspec
@@ -11,5 +11,6 @@ Pod::Spec.new do |s|
 
   s.osx.deployment_target = '10.9'
   s.ios.deployment_target = '8.0'
+  s.watchos.deployment_target = '2.0'
   s.tvos.deployment_target = '9.0'
 end
diff --git a/SwiftTask.xcodeproj/project.pbxproj b/SwiftTask.xcodeproj/project.pbxproj
diff --git a/SwiftTask.xcodeproj/xcshareddata/xcschemes/SwiftTask-iOS.xcscheme b/SwiftTask.xcodeproj/xcshareddata/xcschemes/SwiftTask-iOS.xcscheme
diff --git a/SwiftTask.xcodeproj/xcshareddata/xcschemes/SwiftTask.xcscheme b/SwiftTask.xcodeproj/xcshareddata/xcschemes/SwiftTask.xcscheme
@@ -16,17 +16,17 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "1F46DED3199EDF1000F97868"
                BuildableName = "SwiftTask.framework"
-               BlueprintName = "SwiftTask-OSX"
+               BlueprintName = "SwiftTask"
                ReferencedContainer = "container:SwiftTask.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -44,19 +44,19 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1F46DED3199EDF1000F97868"
             BuildableName = "SwiftTask.framework"
-            BlueprintName = "SwiftTask-OSX"
+            BlueprintName = "SwiftTask"
             ReferencedContainer = "container:SwiftTask.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
@@ -66,25 +66,25 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1F46DED3199EDF1000F97868"
             BuildableName = "SwiftTask.framework"
-            BlueprintName = "SwiftTask-OSX"
+            BlueprintName = "SwiftTask"
             ReferencedContainer = "container:SwiftTask.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1F46DED3199EDF1000F97868"
             BuildableName = "SwiftTask.framework"
-            BlueprintName = "SwiftTask-OSX"
+            BlueprintName = "SwiftTask"
             ReferencedContainer = "container:SwiftTask.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
diff --git a/circle.yml b/circle.yml
@@ -1,17 +1,17 @@
 machine:
   xcode:
-    version: "7.1"
+    version: "7.2"
 
 checkout:
   post:
+    - git submodule sync
     - git submodule update --init --recursive
 
 test:
   override:
     - set -o pipefail &&
       xcodebuild
-        -workspace "SwiftTask.xcworkspace"
-        -scheme "SwiftTask-OSX"
+        -scheme "SwiftTask"
         clean build |
       tee $CIRCLE_ARTIFACTS/xcode_raw-OSX.log |
       xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-OSX.xml
@@ -21,8 +21,9 @@ test:
         CODE_SIGNING_REQUIRED=NO
         CODE_SIGN_IDENTITY=
         PROVISIONING_PROFILE=
-        -workspace "SwiftTask.xcworkspace"
-        -scheme "SwiftTask-iOS"
+        -sdk iphonesimulator
+        -destination 'platform=iOS Simulator,OS=9.0,name=iPhone 6'
+        -scheme "SwiftTask"
         clean build |
       tee $CIRCLE_ARTIFACTS/xcode_raw-iOS.log |
       xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-iOS.xml
