Skip to content

Commit

Permalink
Fix carthage integration
Browse files Browse the repository at this point in the history
  • Loading branch information
@LamineNdy
LamineNdy committed Jul 17, 2019
1 parent c2a6989 commit dbe042f
Show file tree
Hide file tree
Showing 7 changed files with 260 additions and 85 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.DS_Store
.idea
*.xcuserdatad
Carthage
Pods

Expand Down
2 changes: 1 addition & 1 deletion AVPlayerDNAPlugin.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ Pod::Spec.new do |s|
s.source_files = 'PlayerDNAPlugin/Classes/*.swift'
s.ios.deployment_target = '10.2'
s.tvos.deployment_target = '10.2'
s.dependency 'StreamrootSDK', '~> 3.1.0'
s.dependency 'StreamrootSDK', '~> 3.12.0'
end
5 changes: 4 additions & 1 deletion Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" ~> 3.12.0
binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" ~> 3.12.0
github "apple/swift-protobuf" "1.5.0"
github "daltoniam/Starscream" "3.1.0"
github "getsentry/sentry-cocoa" "4.3.4"
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" "3.11"
binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" "3.13"
github "apple/swift-protobuf" "1.5.0"
github "daltoniam/Starscream" "3.1.0"
github "getsentry/sentry-cocoa" "4.3.4"
137 changes: 56 additions & 81 deletions PlayerDNAPlugin.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

99 changes: 99 additions & 0 deletions PlayerDNAPlugin.xcodeproj/xcshareddata/xcschemes/AVPlayerDNAPlugin-iOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D6DB31522146ACB300403310"
BuildableName = "AVPlayerDNAPlugin.framework"
BlueprintName = "AVPlayerDNAPlugin-iOS"
ReferencedContainer = "container:PlayerDNAPlugin.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 = "D6DB315B2146ACB400403310"
BuildableName = "AVPlayerDNAPluginTests-IOS.xctest"
BlueprintName = "AVPlayerDNAPluginTests-IOS"
ReferencedContainer = "container:PlayerDNAPlugin.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D6DB31522146ACB300403310"
BuildableName = "AVPlayerDNAPlugin.framework"
BlueprintName = "AVPlayerDNAPlugin-iOS"
ReferencedContainer = "container:PlayerDNAPlugin.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 = "D6DB31522146ACB300403310"
BuildableName = "AVPlayerDNAPlugin.framework"
BlueprintName = "AVPlayerDNAPlugin-iOS"
ReferencedContainer = "container:PlayerDNAPlugin.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D6DB31522146ACB300403310"
BuildableName = "AVPlayerDNAPlugin.framework"
BlueprintName = "AVPlayerDNAPlugin-iOS"
ReferencedContainer = "container:PlayerDNAPlugin.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
99 changes: 99 additions & 0 deletions PlayerDNAPlugin.xcodeproj/xcshareddata/xcschemes/AVPlayerDNAPlugin-tvOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D6DB319D2146D9AD00403310"
BuildableName = "AVPlayerDNAPlugin.framework"
BlueprintName = "AVPlayerDNAPlugin-tvOS"
ReferencedContainer = "container:PlayerDNAPlugin.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 = "D6DB31A52146D9AD00403310"
BuildableName = "AVPlayerDNAPlugin-tvOSTests.xctest"
BlueprintName = "AVPlayerDNAPlugin-tvOSTests"
ReferencedContainer = "container:PlayerDNAPlugin.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D6DB319D2146D9AD00403310"
BuildableName = "AVPlayerDNAPlugin.framework"
BlueprintName = "AVPlayerDNAPlugin-tvOS"
ReferencedContainer = "container:PlayerDNAPlugin.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 = "D6DB319D2146D9AD00403310"
BuildableName = "AVPlayerDNAPlugin.framework"
BlueprintName = "AVPlayerDNAPlugin-tvOS"
ReferencedContainer = "container:PlayerDNAPlugin.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D6DB319D2146D9AD00403310"
BuildableName = "AVPlayerDNAPlugin.framework"
BlueprintName = "AVPlayerDNAPlugin-tvOS"
ReferencedContainer = "container:PlayerDNAPlugin.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

0 comments on commit dbe042f

Please sign in to comment.