Skip to content

Commit

Permalink
Merge branch 'release/6.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
defagos committed Oct 23, 2020
2 parents e22601f + 6a44f40 commit 7a89c2d
Show file tree
Hide file tree
Showing 213 changed files with 1,631 additions and 2,594 deletions.
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.DS_Store

/.build
/Packages
/*.xcodeproj
xcuserdata/

*.xcscmblueprint
xcuserdata

/archive
/build

/Carthage

/fastlane/*.xcresult
/fastlane/*.xml

/vendor
/.bundle
/.bundle

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
LastUpgradeVersion = "1210"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,10 +14,38 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E69A1DA81D61B9380064E6C1"
BuildableName = "SRGMediaPlayer.framework"
BlueprintIdentifier = "SRGMediaPlayer_SRGMediaPlayer"
BuildableName = "SRGMediaPlayer_SRGMediaPlayer"
BlueprintName = "SRGMediaPlayer_SRGMediaPlayer"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "SRGMediaPlayer"
BuildableName = "SRGMediaPlayer"
BlueprintName = "SRGMediaPlayer"
ReferencedContainer = "container:SRGMediaPlayer.xcodeproj">
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "SRGMediaPlayerTests"
BuildableName = "SRGMediaPlayerTests"
BlueprintName = "SRGMediaPlayerTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -26,28 +54,18 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E69A1DA81D61B9380064E6C1"
BuildableName = "SRGMediaPlayer.framework"
BlueprintName = "SRGMediaPlayer"
ReferencedContainer = "container:SRGMediaPlayer.xcodeproj">
</BuildableReference>
</MacroExpansion>
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES"
testExecutionOrdering = "random">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E69A1FD01D61C6830064E6C1"
BuildableName = "SRGMediaPlayer-tests.xctest"
BlueprintName = "SRGMediaPlayer-tests"
ReferencedContainer = "container:SRGMediaPlayer.xcodeproj">
BlueprintIdentifier = "SRGMediaPlayerTests"
BuildableName = "SRGMediaPlayerTests"
BlueprintName = "SRGMediaPlayerTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
Expand All @@ -62,15 +80,6 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E69A1DA81D61B9380064E6C1"
BuildableName = "SRGMediaPlayer.framework"
BlueprintName = "SRGMediaPlayer"
ReferencedContainer = "container:SRGMediaPlayer.xcodeproj">
</BuildableReference>
</MacroExpansion>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand All @@ -81,10 +90,10 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E69A1DA81D61B9380064E6C1"
BuildableName = "SRGMediaPlayer.framework"
BlueprintName = "SRGMediaPlayer"
ReferencedContainer = "container:SRGMediaPlayer.xcodeproj">
BlueprintIdentifier = "SRGMediaPlayer_SRGMediaPlayer"
BuildableName = "SRGMediaPlayer_SRGMediaPlayer"
BlueprintName = "SRGMediaPlayer_SRGMediaPlayer"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
3 changes: 0 additions & 3 deletions Cartfile

This file was deleted.

3 changes: 0 additions & 3 deletions Cartfile.resolved

This file was deleted.

25 changes: 0 additions & 25 deletions Common.xcconfig

This file was deleted.

24 changes: 23 additions & 1 deletion Demo/Demo.xcconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
#include "../Common.xcconfig"
// Version information
MARKETING_VERSION = 6.0.0

// Deployment targets
IPHONEOS_DEPLOYMENT_TARGET = 9.0
TVOS_DEPLOYMENT_TARGET = 12.0

// Configuration to have a single target built for all platforms
// See https://davedelong.com/blog/2018/11/15/building-a-crossplatform-framework/
SUPPORTED_PLATFORMS = iphoneos iphonesimulator appletvos appletvsimulator
TARGETED_DEVICE_FAMILY = 1,2,3

// Setup to enable plaform suffixes to enable sources or resources for a specific platform only
// See https://davedelong.com/blog/2018/07/25/conditional-compilation-in-swift-part-2/
IOS_FILES = *~ios.*
TVOS_FILES = *~tvos.*

EXCLUDED_SOURCE_FILE_NAMES = $(IOS_FILES) $(TVOS_FILES)

INCLUDED_SOURCE_FILE_NAMES =
INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(IOS_FILES)
INCLUDED_SOURCE_FILE_NAMES[sdk=mac*] = = $(IOS_FILES)
INCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = $(TVOS_FILES)

LAUNCH_SCREEN[sdk=iphone*] = LaunchScreen~ios
LAUNCH_SCREEN[sdk=appletv*] =
Expand Down
10 changes: 10 additions & 0 deletions Demo/SRGMediaPlayer-demo.entitlements
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?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>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
</dict>
</plist>
Loading

0 comments on commit 7a89c2d

Please sign in to comment.