Merge pull request #38 from ReactKit/universal-framework

inamiy · inamiy · commit c6b59e465b75 · 2015-12-09T02:20:52.000+09:00
Create universal framework to support watchOS &amp; tvOS by using xcconfigs.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Carthage/Checkouts/xcconfigs"]
+	path = Carthage/Checkouts/xcconfigs
+	url = https://github.com/mrackwitz/xcconfigs.git
diff --git a/Cartfile.private b/Cartfile.private
@@ -0,0 +1 @@
+github "mrackwitz/xcconfigs"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+github "mrackwitz/xcconfigs" "3.0"
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
+//  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;
diff --git a/Configurations/Debug.xcconfig b/Configurations/Debug.xcconfig
@@ -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;
diff --git a/Configurations/Release.xcconfig b/Configurations/Release.xcconfig
@@ -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;
diff --git a/Sources/_Random.swift b/Sources/_Random.swift
@@ -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
diff --git a/SwiftState.xcodeproj/project.pbxproj b/SwiftState.xcodeproj/project.pbxproj
diff --git a/SwiftState.xcodeproj/xcshareddata/xcschemes/SwiftState-iOS.xcscheme b/SwiftState.xcodeproj/xcshareddata/xcschemes/SwiftState-iOS.xcscheme
diff --git a/SwiftState.xcodeproj/xcshareddata/xcschemes/SwiftState.xcscheme b/SwiftState.xcodeproj/xcshareddata/xcschemes/SwiftState.xcscheme
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "1FA61FFF1996601000460108"
                BuildableName = "SwiftState.framework"
-               BlueprintName = "SwiftState-OSX"
+               BlueprintName = "SwiftState"
                ReferencedContainer = "container:SwiftState.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -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>
@@ -45,7 +45,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1FA61FFF1996601000460108"
             BuildableName = "SwiftState.framework"
-            BlueprintName = "SwiftState-OSX"
+            BlueprintName = "SwiftState"
             ReferencedContainer = "container:SwiftState.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -67,7 +67,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1FA61FFF1996601000460108"
             BuildableName = "SwiftState.framework"
-            BlueprintName = "SwiftState-OSX"
+            BlueprintName = "SwiftState"
             ReferencedContainer = "container:SwiftState.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -85,7 +85,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1FA61FFF1996601000460108"
             BuildableName = "SwiftState.framework"
-            BlueprintName = "SwiftState-OSX"
+            BlueprintName = "SwiftState"
             ReferencedContainer = "container:SwiftState.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
diff --git a/circle.yml b/circle.yml
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "Carthage/Checkouts/xcconfigs"]`
	`2`	`+ path = Carthage/Checkouts/xcconfigs`
	`3`	`+ url = https://github.com/mrackwitz/xcconfigs.git`