Skip to content

Commit 36620e3

Browse files
onmyway133onmyway133
authored
Merge pull request #82 from hyperoslo/fix/tvos
Fix/tvos
2 parents 7b48e6b + 095fb3f commit 36620e3

File tree

13 files changed

+511
-38
lines changed

13 files changed

+511
-38
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ script:
66
- xcodebuild test -project Sugar.xcodeproj -scheme Sugar-iOS -sdk iphonesimulator
77
- xcodebuild clean build -project Sugar.xcodeproj -scheme Sugar-Mac -sdk macosx
88
- xcodebuild test -project Sugar.xcodeproj -scheme Sugar-Mac -sdk macosx
9+
- xcodebuild clean build -project Sugar.xcodeproj -scheme Sugar-tvOS -sdk macosx
10+
- xcodebuild test -project Sugar.xcodeproj -scheme Sugar-tvOS -sdk macosx

‎Source/iOS/Keyboard/BasicKeyboardHandler.swift renamed to ‎Source/iOS-Exclusive/Keyboard/BasicKeyboardHandler.swift

File renamed without changes.

‎Source/iOS/Keyboard/ConstraintKeyboardHandler.swift renamed to ‎Source/iOS-Exclusive/Keyboard/ConstraintKeyboardHandler.swift

File renamed without changes.

‎Source/iOS/Keyboard/CustomKeyboardHandler.swift renamed to ‎Source/iOS-Exclusive/Keyboard/CustomKeyboardHandler.swift

File renamed without changes.

‎Source/iOS/Keyboard/InsetKeyboardHandler.swift renamed to ‎Source/iOS-Exclusive/Keyboard/InsetKeyboardHandler.swift

File renamed without changes.

‎Source/iOS/Keyboard/KeyboardHandler.swift renamed to ‎Source/iOS-Exclusive/Keyboard/KeyboardHandler.swift

File renamed without changes.

‎Source/iOS/Keyboard/KeyboardInfo.swift renamed to ‎Source/iOS-Exclusive/Keyboard/KeyboardInfo.swift

File renamed without changes.

‎Source/iOS/Keyboard/KeyboardObserver.swift renamed to ‎Source/iOS-Exclusive/Keyboard/KeyboardObserver.swift

File renamed without changes.

‎Sugar.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
1313
s.tvos.deployment_target = '9.2'
1414

1515
s.requires_arc = true
16-
s.ios.source_files = 'Source/{iOS,Shared}/**/*'
16+
s.ios.source_files = 'Source/{iOS,iOS-Exclusive,Shared}/**/*'
1717
s.osx.source_files = 'Source/{Mac,Shared}/**/*'
1818
s.tvos.source_files = 'Source/{iOS,Shared}/**/*'
1919

‎Sugar.xcodeproj/project.pbxproj

Lines changed: 345 additions & 37 deletions
Large diffs are not rendered by default.

‎Sugar.xcodeproj/xcshareddata/xcschemes/Sugar-tvOS.xcscheme

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0730"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "BD7B93921D2BD93800BECFB1"
18+
BuildableName = "Sugar.framework"
19+
BlueprintName = "Sugar-tvOS"
20+
ReferencedContainer = "container:Sugar.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "YES"
26+
buildForProfiling = "YES"
27+
buildForArchiving = "YES"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "BD9FDD4E1D2BDB1C0085F584"
32+
BuildableName = "Tests-tvOS.xctest"
33+
BlueprintName = "Tests-tvOS"
34+
ReferencedContainer = "container:Sugar.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
</BuildActionEntries>
38+
</BuildAction>
39+
<TestAction
40+
buildConfiguration = "Debug"
41+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
42+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<Testables>
45+
<TestableReference
46+
skipped = "NO">
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "BD9FDD4E1D2BDB1C0085F584"
50+
BuildableName = "Tests-tvOS.xctest"
51+
BlueprintName = "Tests-tvOS"
52+
ReferencedContainer = "container:Sugar.xcodeproj">
53+
</BuildableReference>
54+
</TestableReference>
55+
</Testables>
56+
<MacroExpansion>
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "BD7B93921D2BD93800BECFB1"
60+
BuildableName = "Sugar.framework"
61+
BlueprintName = "Sugar-tvOS"
62+
ReferencedContainer = "container:Sugar.xcodeproj">
63+
</BuildableReference>
64+
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
67+
</TestAction>
68+
<LaunchAction
69+
buildConfiguration = "Debug"
70+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
71+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
72+
launchStyle = "0"
73+
useCustomWorkingDirectory = "NO"
74+
ignoresPersistentStateOnLaunch = "NO"
75+
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
77+
allowLocationSimulation = "YES">
78+
<MacroExpansion>
79+
<BuildableReference
80+
BuildableIdentifier = "primary"
81+
BlueprintIdentifier = "BD7B93921D2BD93800BECFB1"
82+
BuildableName = "Sugar.framework"
83+
BlueprintName = "Sugar-tvOS"
84+
ReferencedContainer = "container:Sugar.xcodeproj">
85+
</BuildableReference>
86+
</MacroExpansion>
87+
<AdditionalOptions>
88+
</AdditionalOptions>
89+
</LaunchAction>
90+
<ProfileAction
91+
buildConfiguration = "Release"
92+
shouldUseLaunchSchemeArgsEnv = "YES"
93+
savedToolIdentifier = ""
94+
useCustomWorkingDirectory = "NO"
95+
debugDocumentVersioning = "YES">
96+
<MacroExpansion>
97+
<BuildableReference
98+
BuildableIdentifier = "primary"
99+
BlueprintIdentifier = "BD7B93921D2BD93800BECFB1"
100+
BuildableName = "Sugar.framework"
101+
BlueprintName = "Sugar-tvOS"
102+
ReferencedContainer = "container:Sugar.xcodeproj">
103+
</BuildableReference>
104+
</MacroExpansion>
105+
</ProfileAction>
106+
<AnalyzeAction
107+
buildConfiguration = "Debug">
108+
</AnalyzeAction>
109+
<ArchiveAction
110+
buildConfiguration = "Release"
111+
revealArchiveInOrganizer = "YES">
112+
</ArchiveAction>
113+
</Scheme>

‎SupportFiles/tvOS/Info.plist

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

‎Tests/tvOS/Info.plist

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>1</string>
23+
</dict>
24+
</plist>

0 commit comments

Comments
 (0)