Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Move Application to Shared #81

Merged
merged 2 commits into from
Jul 4, 2016
Merged

Move Application to Shared #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a0e27b
Move Application to Shared
Jul 4, 2016
d0ac8a7
Merge branch 'master' into refactor/application
Jul 4, 2016
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
6 changes: 5 additions & 1 deletion Source/iOS/Application.swift → Source/Shared/Application.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import UIKit
#if os(iOS)
import UIKit
#else
import Cocoa
#endif

public struct Application {

Expand Down
20 changes: 11 additions & 9 deletions Sugar.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
BD81A14B1C73A596009955E3 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD81A14A1C73A596009955E3 /* Result.swift */; };
BD81A14C1C73A596009955E3 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD81A14A1C73A596009955E3 /* Result.swift */; };
BDA447931C2946BC003FDEAD /* Sugar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDA447891C2946BB003FDEAD /* Sugar.framework */; };
BDA447B21C29471C003FDEAD /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA447A21C29470D003FDEAD /* Application.swift */; };
BDA447B31C29471C003FDEAD /* UIView+Optimize.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA447A41C29470D003FDEAD /* UIView+Optimize.swift */; };
BDA447B41C29471C003FDEAD /* Screen.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA447A51C29470D003FDEAD /* Screen.swift */; };
BDA447B51C29471C003FDEAD /* Simulator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA447A61C29470D003FDEAD /* Simulator.swift */; };
Expand Down Expand Up @@ -52,6 +51,8 @@
BDAF15621C3917110008A5D6 /* Then.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDAF15611C3917110008A5D6 /* Then.swift */; };
BDAF15631C3917110008A5D6 /* Then.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDAF15611C3917110008A5D6 /* Then.swift */; };
BDAF15651C3917A90008A5D6 /* TestThen.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDAF15641C3917A90008A5D6 /* TestThen.swift */; };
BDD126AA1D21D0F900C9175F /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDD126A91D21D0F900C9175F /* Application.swift */; };
BDD126AB1D21D0F900C9175F /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDD126A91D21D0F900C9175F /* Application.swift */; };
BDF36EA11CAD272600ED5749 /* UIView+AddSubviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF36EA01CAD272600ED5749 /* UIView+AddSubviews.swift */; };
BDF36EA21CAD272600ED5749 /* UIView+AddSubviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF36EA01CAD272600ED5749 /* UIView+AddSubviews.swift */; };
D20F42E11D26F8E90000A807 /* SequenceType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20F42E01D26F8E90000A807 /* SequenceType+Extensions.swift */; };
Expand Down Expand Up @@ -114,7 +115,6 @@
BD81A14A1C73A596009955E3 /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = "<group>"; };
BDA447891C2946BB003FDEAD /* Sugar.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Sugar.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BDA447921C2946BC003FDEAD /* Tests-Mac.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests-Mac.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
BDA447A21C29470D003FDEAD /* Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; };
BDA447A41C29470D003FDEAD /* UIView+Optimize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Optimize.swift"; sourceTree = "<group>"; };
BDA447A51C29470D003FDEAD /* Screen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Screen.swift; sourceTree = "<group>"; };
BDA447A61C29470D003FDEAD /* Simulator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Simulator.swift; sourceTree = "<group>"; };
Expand All @@ -135,6 +135,7 @@
BDA4481B1C295A01003FDEAD /* TestStringExtensionCoreFoundation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestStringExtensionCoreFoundation.swift; sourceTree = "<group>"; };
BDAF15611C3917110008A5D6 /* Then.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Then.swift; sourceTree = "<group>"; };
BDAF15641C3917A90008A5D6 /* TestThen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestThen.swift; sourceTree = "<group>"; };
BDD126A91D21D0F900C9175F /* Application.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; };
BDF36EA01CAD272600ED5749 /* UIView+AddSubviews.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+AddSubviews.swift"; sourceTree = "<group>"; };
D20F42E01D26F8E90000A807 /* SequenceType+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SequenceType+Extensions.swift"; sourceTree = "<group>"; };
D20F42E31D26F92C0000A807 /* TestSequenceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestSequenceType.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -214,7 +215,6 @@
isa = PBXGroup;
children = (
D23C16491CEDCFC8007597B2 /* Keyboard */,
BDA447A21C29470D003FDEAD /* Application.swift */,
BDA447A31C29470D003FDEAD /* Extensions */,
BDA447A51C29470D003FDEAD /* Screen.swift */,
BDA447A61C29470D003FDEAD /* Simulator.swift */,
Expand All @@ -238,16 +238,17 @@
BDA447A81C29470D003FDEAD /* Shared */ = {
isa = PBXGroup;
children = (
BDD126A91D21D0F900C9175F /* Application.swift */,
BDA447A91C29470D003FDEAD /* Extensions */,
BD0E01C71C3BCFD50092C477 /* GrandCentralDispatch.swift */,
BD0E01CA1C3BCFEF0092C477 /* Localization.swift */,
BDA447AE1C29470D003FDEAD /* Operator.swift */,
BD81A14A1C73A596009955E3 /* Result.swift */,
D52D72421C3BDEA5009A4426 /* Swizzler.swift */,
BDAF15611C3917110008A5D6 /* Then.swift */,
BDA447AF1C29470D003FDEAD /* TypeAlias.swift */,
BDA447B01C29470D003FDEAD /* UITesting.swift */,
BDA447B11C29470D003FDEAD /* UnitTesting.swift */,
BDAF15611C3917110008A5D6 /* Then.swift */,
BD0E01C71C3BCFD50092C477 /* GrandCentralDispatch.swift */,
BD0E01CA1C3BCFEF0092C477 /* Localization.swift */,
D52D72421C3BDEA5009A4426 /* Swizzler.swift */,
BD81A14A1C73A596009955E3 /* Result.swift */,
);
path = Shared;
sourceTree = "<group>";
Expand Down Expand Up @@ -548,6 +549,7 @@
files = (
D52D72441C3BDEA5009A4426 /* Swizzler.swift in Sources */,
BD37B4F11C2C08430069CD4A /* String+CoreFoundation.swift in Sources */,
BDD126AB1D21D0F900C9175F /* Application.swift in Sources */,
BD0E01CC1C3BCFEF0092C477 /* Localization.swift in Sources */,
BD0D88FB1CB18BF100CDA2C6 /* NSDate+Extensions.swift in Sources */,
BDAF15631C3917110008A5D6 /* Then.swift in Sources */,
Expand Down Expand Up @@ -586,6 +588,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BDD126AA1D21D0F900C9175F /* Application.swift in Sources */,
39D4BC221C9C2A6E005D6EC0 /* NSDate+Extensions.swift in Sources */,
BD81A14B1C73A596009955E3 /* Result.swift in Sources */,
BDA447B61C294723003FDEAD /* Array+Queueable.swift in Sources */,
Expand All @@ -606,7 +609,6 @@
BDA447BD1C294723003FDEAD /* UnitTesting.swift in Sources */,
BDAF15621C3917110008A5D6 /* Then.swift in Sources */,
D52D72431C3BDEA5009A4426 /* Swizzler.swift in Sources */,
BDA447B21C29471C003FDEAD /* Application.swift in Sources */,
BDA447B31C29471C003FDEAD /* UIView+Optimize.swift in Sources */,
D2FD145F1CE5F27A00EC080B /* Double+DateTime.swift in Sources */,
39D4BC261C9C2DCC005D6EC0 /* String+Regex.swift in Sources */,
Expand Down