Skip to content

Commit

Permalink
Merge pull request #82 from hyperoslo/fix/tvos
Browse files Browse the repository at this point in the history
Fix/tvos
  • Loading branch information
onmyway133 committed Jul 5, 2016
2 parents 7b48e6b + 095fb3f commit 36620e3
Show file tree
Hide file tree
Showing 13 changed files with 511 additions and 38 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ script:
- xcodebuild test -project Sugar.xcodeproj -scheme Sugar-iOS -sdk iphonesimulator
- xcodebuild clean build -project Sugar.xcodeproj -scheme Sugar-Mac -sdk macosx
- xcodebuild test -project Sugar.xcodeproj -scheme Sugar-Mac -sdk macosx
- xcodebuild clean build -project Sugar.xcodeproj -scheme Sugar-tvOS -sdk macosx
- xcodebuild test -project Sugar.xcodeproj -scheme Sugar-tvOS -sdk macosx
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Sugar.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '9.2'

s.requires_arc = true
s.ios.source_files = 'Source/{iOS,Shared}/**/*'
s.ios.source_files = 'Source/{iOS,iOS-Exclusive,Shared}/**/*'
s.osx.source_files = 'Source/{Mac,Shared}/**/*'
s.tvos.source_files = 'Source/{iOS,Shared}/**/*'

Expand Down
382 changes: 345 additions & 37 deletions Sugar.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

113 changes: 113 additions & 0 deletions Sugar.xcodeproj/xcshareddata/xcschemes/Sugar-tvOS.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BD7B93921D2BD93800BECFB1"
BuildableName = "Sugar.framework"
BlueprintName = "Sugar-tvOS"
ReferencedContainer = "container:Sugar.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BD9FDD4E1D2BDB1C0085F584"
BuildableName = "Tests-tvOS.xctest"
BlueprintName = "Tests-tvOS"
ReferencedContainer = "container:Sugar.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BD9FDD4E1D2BDB1C0085F584"
BuildableName = "Tests-tvOS.xctest"
BlueprintName = "Tests-tvOS"
ReferencedContainer = "container:Sugar.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BD7B93921D2BD93800BECFB1"
BuildableName = "Sugar.framework"
BlueprintName = "Sugar-tvOS"
ReferencedContainer = "container:Sugar.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BD7B93921D2BD93800BECFB1"
BuildableName = "Sugar.framework"
BlueprintName = "Sugar-tvOS"
ReferencedContainer = "container:Sugar.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BD7B93921D2BD93800BECFB1"
BuildableName = "Sugar.framework"
BlueprintName = "Sugar-tvOS"
ReferencedContainer = "container:Sugar.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
26 changes: 26 additions & 0 deletions SupportFiles/tvOS/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
24 changes: 24 additions & 0 deletions Tests/tvOS/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>

0 comments on commit 36620e3

Please sign in to comment.