Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
cc6bc8f
[Test] Add FrogcjnTest (event + associated value).
inamiy Nov 1, 2015
ef07416
Refactor code for better typing, naming, and routeMapping support.
inamiy Nov 14, 2015
465146a
[Test] Remove unnecessary `case Any`.
inamiy Nov 14, 2015
da9b9b4
Remove unnecessary methods.
inamiy Nov 24, 2015
c9f6db9
Add comment.
inamiy Nov 24, 2015
32630e2
Rename `Mapping` to `RouteMapping`.
inamiy Nov 24, 2015
93f184b
[Test] Organize tests.
inamiy Nov 24, 2015
bfd9ed2
Remove verbose methods in `Transition` & `Route`.
inamiy Nov 24, 2015
439d5a8
Organize code.
inamiy Nov 28, 2015
12cb3b8
[Test] Add testHasRoute_anyEvent()
inamiy Nov 28, 2015
2eeff1f
Add `final` modifiers.
inamiy Nov 28, 2015
1be6782
[Test] Re-add HierarchicalMachineTests which was deleted in ef07416.
inamiy Nov 29, 2015
8e093da
Update README.md & BasicTests.
inamiy Nov 30, 2015
2986012
Resize logo.png
inamiy Nov 30, 2015
f7ce748
Refactor code by separating event-only-driven `Machine` and `StateMac…
inamiy Dec 5, 2015
8ade68e
[Test] Add more RouteMapping tests.
inamiy Dec 5, 2015
e9c1bf3
[Test] Improve 8ade68e & update README.md
inamiy Dec 5, 2015
c1c18ec
Add `addStateRouteMapping()` & rename `EventRouteMapping` to `RouteMa…
inamiy Dec 7, 2015
b42ac6d
Update README.md
inamiy Dec 7, 2015
4c15f86
Conform State<S> & Event<E> to RawRepresentable.
inamiy Dec 8, 2015
edc0f3e
Set codeCoverageEnabled=YES.
inamiy Dec 8, 2015
2c9844f
[Test] Add StateTests & EventTests.
inamiy Dec 8, 2015
ce2ef2a
Fix RouteMapping + handler.
inamiy Dec 8, 2015
56b8c76
Simplify `machine.addRoutes()`.
inamiy Dec 8, 2015
e49b1c6
[Test] Improve code coverage.
inamiy Dec 8, 2015
c1751bf
Create universal framework to support watchOS & tvOS by using xcconfigs.
inamiy Dec 8, 2015
c6b59e4
Merge pull request #38 from ReactKit/universal-framework
inamiy Dec 8, 2015
83af536
Remove unnecessary xcodeproj settings.
inamiy Dec 9, 2015
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
Prev Previous commit
Next Next commit
Create universal framework to support watchOS & tvOS by using xcconfigs.
  • Loading branch information
inamiy committed Dec 8, 2015
commit c1751bf462caf9f5fe1696d2e7f37ab8aed38a12
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