Skip to content

GitLab

Commit 55dfd582 authored by Felix Paul Kühne's avatar Felix Paul Kühne
1 Browse files
Options

Update Podfile for current cocoapods releases

parent f8095a9d
Pipeline #55 passed with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 39 additions and 47 deletions
    Podfile
    View file @ 55dfd582
    ...@@ -25,14 +25,6 @@ pod 'MediaLibraryKit-unstable' ...@@ -25,14 +25,6 @@ pod 'MediaLibraryKit-unstable'
    pod 'MobileVLCKit-unstable', '3.0.0a10' pod 'MobileVLCKit-unstable', '3.0.0a10'
    end end
    post_install do |installer_representation|
    installer_representation.pods_project.build_configurations.each do |config|
    config.build_settings['SKIP_INSTALL'] = 'YES'
    config.build_settings['VALID_ARCHS'] = 'armv7 armv7s arm64'
    config.build_settings['ARCHS'] = 'armv7 armv7s arm64'
    config.build_settings['CLANG_CXX_LIBRARY'] = 'libc++'
    end
    end
    target 'VLC-iOS-no-watch' do target 'VLC-iOS-no-watch' do
    platform :ios, '7.0' platform :ios, '7.0'
    ...@@ -55,14 +47,6 @@ pod 'MediaLibraryKit-unstable' ...@@ -55,14 +47,6 @@ pod 'MediaLibraryKit-unstable'
    pod 'MobileVLCKit-unstable', '3.0.0a10' pod 'MobileVLCKit-unstable', '3.0.0a10'
    end end
    post_install do |installer_representation|
    installer_representation.pods_project.build_configurations.each do |config|
    config.build_settings['SKIP_INSTALL'] = 'YES'
    config.build_settings['VALID_ARCHS'] = 'armv7 armv7s arm64'
    config.build_settings['ARCHS'] = 'armv7 armv7s arm64'
    config.build_settings['CLANG_CXX_LIBRARY'] = 'libc++'
    end
    end
    target 'VLC-iOS-no-watch-Debug' do target 'VLC-iOS-no-watch-Debug' do
    platform :ios, '7.0' platform :ios, '7.0'
    ...@@ -83,14 +67,6 @@ pod 'VLC-LiveSDK', '5.7.0x' ...@@ -83,14 +67,6 @@ pod 'VLC-LiveSDK', '5.7.0x'
    pod 'VLC-Dropbox-v1-SDK', '1.3.14w' pod 'VLC-Dropbox-v1-SDK', '1.3.14w'
    end end
    post_install do |installer_representation|
    installer_representation.pods_project.build_configurations.each do |config|
    config.build_settings['SKIP_INSTALL'] = 'YES'
    config.build_settings['VALID_ARCHS'] = 'armv7 armv7s arm64'
    config.build_settings['ARCHS'] = 'armv7 armv7s arm64'
    config.build_settings['CLANG_CXX_LIBRARY'] = 'libc++'
    end
    end
    target 'VLC-tvOS' do target 'VLC-tvOS' do
    platform :tvos, '9.0' platform :tvos, '9.0'
    ...@@ -131,9 +107,25 @@ platform :watchos, '2.0' ...@@ -131,9 +107,25 @@ platform :watchos, '2.0'
    pod 'MediaLibraryKit-unstable' pod 'MediaLibraryKit-unstable'
    end end
    post_install do |installer_representation| post_install do |installer_representation|
    installer_representation.pods_project.targets.each do |target|
    if target.name == 'VLC-watchOS-Extension'
    installer_representation.pods_project.build_configurations.each do |config|
    config.build_settings['SKIP_INSTALL'] = 'YES'
    config.build_settings['CLANG_CXX_LIBRARY'] = 'libc++'
    end
    else
    installer_representation.pods_project.build_configurations.each do |config| installer_representation.pods_project.build_configurations.each do |config|
    config.build_settings['SKIP_INSTALL'] = 'YES' config.build_settings['SKIP_INSTALL'] = 'YES'
    config.build_settings['VALID_ARCHS'] = 'armv7 armv7s arm64'
    config.build_settings['ARCHS'] = 'armv7 armv7s arm64'
    config.build_settings['CLANG_CXX_LIBRARY'] = 'libc++' config.build_settings['CLANG_CXX_LIBRARY'] = 'libc++'
    end end
    end
    end
    end end
    Podfile.lock
    View file @ 55dfd582
    ...@@ -24,13 +24,13 @@ PODS: ...@@ -24,13 +24,13 @@ PODS:
    - GoogleAPIClient/Core - GoogleAPIClient/Core
    - GTMSessionFetcher (~> 1.1) - GTMSessionFetcher (~> 1.1)
    - GRKArrayDiff (2.1) - GRKArrayDiff (2.1)
    - GTMOAuth2 (1.1.2): - GTMOAuth2 (1.1.4):
    - GTMSessionFetcher (~> 1.1) - GTMSessionFetcher (~> 1.1)
    - GTMSessionFetcher (1.1.5): - GTMSessionFetcher (1.1.8):
    - GTMSessionFetcher/Full (= 1.1.5) - GTMSessionFetcher/Full (= 1.1.8)
    - GTMSessionFetcher/Core (1.1.5) - GTMSessionFetcher/Core (1.1.8)
    - GTMSessionFetcher/Full (1.1.5): - GTMSessionFetcher/Full (1.1.8):
    - GTMSessionFetcher/Core (= 1.1.5) - GTMSessionFetcher/Core (= 1.1.8)
    - HockeySDK (3.6.4) - HockeySDK (3.6.4)
    - HockeySDK-tvOS (4.1.0-beta.1) - HockeySDK-tvOS (4.1.0-beta.1)
    - InAppSettingsKit (2.2.2) - InAppSettingsKit (2.2.2)
    ...@@ -111,8 +111,8 @@ SPEC CHECKSUMS: ...@@ -111,8 +111,8 @@ SPEC CHECKSUMS:
    CocoaHTTPServer: 07df8b05a8bde406fe367d22c90a24a2fd4ca49f CocoaHTTPServer: 07df8b05a8bde406fe367d22c90a24a2fd4ca49f
    GoogleAPIClient: 4a6b0b807de8b1115a2835180b25dd93dc60f1ea GoogleAPIClient: 4a6b0b807de8b1115a2835180b25dd93dc60f1ea
    GRKArrayDiff: cf743e6b30f6b72a3763e1f16cc5d9da39af86a5 GRKArrayDiff: cf743e6b30f6b72a3763e1f16cc5d9da39af86a5
    GTMOAuth2: 1707e2f7fe3a6d7240223c23c473ba5a2d104474 GTMOAuth2: 7fc9c10f5c745f4d9850419ea88889fe3baa6b7d
    GTMSessionFetcher: f984cf6f77d36a3590b7923cf74e2c08fd4dd774 GTMSessionFetcher: 6f8d8b28b7e345549ac471071608170b31cb4977
    HockeySDK: c07cdd580296737edcd0963e292c19885a53f563 HockeySDK: c07cdd580296737edcd0963e292c19885a53f563
    HockeySDK-tvOS: fe5373e9a6e70aeca464f8491eb32b60b04fb322 HockeySDK-tvOS: fe5373e9a6e70aeca464f8491eb32b60b04fb322
    InAppSettingsKit: 76d5cfbaa3e3f8aa53fe3628516da7eb1aa6a5cb InAppSettingsKit: 76d5cfbaa3e3f8aa53fe3628516da7eb1aa6a5cb
    ...@@ -132,6 +132,6 @@ SPEC CHECKSUMS: ...@@ -132,6 +132,6 @@ SPEC CHECKSUMS:
    XKKeychain: 852ef663c56a7194c73d3c68e8d9d4f07b121d4f XKKeychain: 852ef663c56a7194c73d3c68e8d9d4f07b121d4f
    xmlrpc: 109bb21d15ed6d108b2c1ac5973a6a223a50f5f4 xmlrpc: 109bb21d15ed6d108b2c1ac5973a6a223a50f5f4
    PODFILE CHECKSUM: 00b1575423ced2f8a1b8da67eccd8c9c70058ca7 PODFILE CHECKSUM: 0a1627919830b727ebfc648e8125651911a60afe
    COCOAPODS: 1.0.1 COCOAPODS: 1.2.0
    VLC.xcodeproj/project.pbxproj
    View file @ 55dfd582
    ...@@ -231,11 +231,11 @@ ...@@ -231,11 +231,11 @@
    7D63BBEA1D414212003C60D3 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF28AE01BA31C580030C944 /* libc++.tbd */; }; 7D63BBEA1D414212003C60D3 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF28AE01BA31C580030C944 /* libc++.tbd */; };
    7D63BBEB1D414212003C60D3 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF28ADE1BA31C4D0030C944 /* libiconv.tbd */; }; 7D63BBEB1D414212003C60D3 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF28ADE1BA31C4D0030C944 /* libiconv.tbd */; };
    7D63BBEC1D414212003C60D3 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF28ADC1BA31C390030C944 /* OpenGLES.framework */; }; 7D63BBEC1D414212003C60D3 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF28ADC1BA31C390030C944 /* OpenGLES.framework */; };
    7D63BBED1D414212003C60D3 /* DropboxTVSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D5278D11BD7DE3D00D0CA0E /* DropboxTVSDK.framework */; }; 7D63BBED1D414212003C60D3 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D5278D11BD7DE3D00D0CA0E /* DropboxTVSDK.framework */; };
    7D63BBEE1D414212003C60D3 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF28ADA1BA31C2B0030C944 /* CoreText.framework */; }; 7D63BBEE1D414212003C60D3 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF28ADA1BA31C2B0030C944 /* CoreText.framework */; };
    7D63BBEF1D414212003C60D3 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF28AD61BA31C150030C944 /* AudioToolbox.framework */; }; 7D63BBEF1D414212003C60D3 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF28AD61BA31C150030C944 /* AudioToolbox.framework */; };
    7D63BBF01D414212003C60D3 /* libTVVLCKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D1FEBD31BA3184A00D1058E /* libTVVLCKit.a */; }; 7D63BBF01D414212003C60D3 /* libTVVLCKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D1FEBD31BA3184A00D1058E /* libTVVLCKit.a */; };
    7D63BBF11D414212003C60D3 /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D29C7A71C08C84000AEC5C4 /* HockeySDK.framework */; }; 7D63BBF11D414212003C60D3 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D29C7A71C08C84000AEC5C4 /* HockeySDK.framework */; };
    7D63BBF41D414212003C60D3 /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = 7D00161A17704DAC00649F27 /* main.js */; }; 7D63BBF41D414212003C60D3 /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = 7D00161A17704DAC00649F27 /* main.js */; };
    7D63BBF51D414212003C60D3 /* VLCPlaybackInfoTVViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DD8095E41BE3F4240065D8E1 /* VLCPlaybackInfoTVViewController.xib */; }; 7D63BBF51D414212003C60D3 /* VLCPlaybackInfoTVViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DD8095E41BE3F4240065D8E1 /* VLCPlaybackInfoTVViewController.xib */; };
    7D63BBF61D414212003C60D3 /* jquery.ui.widget.js in Resources */ = {isa = PBXBuildFile; fileRef = 7AC862A11765E90C0011611A /* jquery.ui.widget.js */; }; 7D63BBF61D414212003C60D3 /* jquery.ui.widget.js in Resources */ = {isa = PBXBuildFile; fileRef = 7AC862A11765E90C0011611A /* jquery.ui.widget.js */; };
    ...@@ -1754,11 +1754,11 @@ ...@@ -1754,11 +1754,11 @@
    7D63BBEA1D414212003C60D3 /* libc++.tbd in Frameworks */, 7D63BBEA1D414212003C60D3 /* libc++.tbd in Frameworks */,
    7D63BBEB1D414212003C60D3 /* libiconv.tbd in Frameworks */, 7D63BBEB1D414212003C60D3 /* libiconv.tbd in Frameworks */,
    7D63BBEC1D414212003C60D3 /* OpenGLES.framework in Frameworks */, 7D63BBEC1D414212003C60D3 /* OpenGLES.framework in Frameworks */,
    7D63BBED1D414212003C60D3 /* DropboxTVSDK.framework in Frameworks */, 7D63BBED1D414212003C60D3 /* ReferenceProxy in Frameworks */,
    7D63BBEE1D414212003C60D3 /* CoreText.framework in Frameworks */, 7D63BBEE1D414212003C60D3 /* CoreText.framework in Frameworks */,
    7D63BBEF1D414212003C60D3 /* AudioToolbox.framework in Frameworks */, 7D63BBEF1D414212003C60D3 /* AudioToolbox.framework in Frameworks */,
    7D63BBF01D414212003C60D3 /* libTVVLCKit.a in Frameworks */, 7D63BBF01D414212003C60D3 /* libTVVLCKit.a in Frameworks */,
    7D63BBF11D414212003C60D3 /* HockeySDK.framework in Frameworks */, 7D63BBF11D414212003C60D3 /* ReferenceProxy in Frameworks */,
    DD729EB7E7F949CBECE29930 /* libPods-VLC-tvOS-Debug.a in Frameworks */, DD729EB7E7F949CBECE29930 /* libPods-VLC-tvOS-Debug.a in Frameworks */,
    ); );
    runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
    ...@@ -3845,7 +3845,7 @@ ...@@ -3845,7 +3845,7 @@
    ); );
    runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh; shellPath = /bin/sh;
    shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0; showEnvVarsInLog = 0;
    }; };
    50F88350D33999B9CF48A5E2 /* [CP] Embed Pods Frameworks */ = { 50F88350D33999B9CF48A5E2 /* [CP] Embed Pods Frameworks */ = {
    ...@@ -3875,7 +3875,7 @@ ...@@ -3875,7 +3875,7 @@
    ); );
    runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh; shellPath = /bin/sh;
    shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0; showEnvVarsInLog = 0;
    }; };
    706871891E2E53274143218F /* [CP] Copy Pods Resources */ = { 706871891E2E53274143218F /* [CP] Copy Pods Resources */ = {
    ...@@ -3920,7 +3920,7 @@ ...@@ -3920,7 +3920,7 @@
    ); );
    runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh; shellPath = /bin/sh;
    shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0; showEnvVarsInLog = 0;
    }; };
    7D63BC141D414212003C60D3 /* [CP] Embed Pods Frameworks */ = { 7D63BC141D414212003C60D3 /* [CP] Embed Pods Frameworks */ = {
    ...@@ -3965,7 +3965,7 @@ ...@@ -3965,7 +3965,7 @@
    ); );
    runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh; shellPath = /bin/sh;
    shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0; showEnvVarsInLog = 0;
    }; };
    9706D52A0CDF446E336826A6 /* [CP] Copy Pods Resources */ = { 9706D52A0CDF446E336826A6 /* [CP] Copy Pods Resources */ = {
    ...@@ -3995,7 +3995,7 @@ ...@@ -3995,7 +3995,7 @@
    ); );
    runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh; shellPath = /bin/sh;
    shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0; showEnvVarsInLog = 0;
    }; };
    A2A77B2E8117AEB87124DCCA /* [CP] Embed Pods Frameworks */ = { A2A77B2E8117AEB87124DCCA /* [CP] Embed Pods Frameworks */ = {
    ...@@ -4055,7 +4055,7 @@ ...@@ -4055,7 +4055,7 @@
    ); );
    runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh; shellPath = /bin/sh;
    shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0; showEnvVarsInLog = 0;
    }; };
    D5E71C917AC0F153A13E1C49 /* [CP] Copy Pods Resources */ = { D5E71C917AC0F153A13E1C49 /* [CP] Copy Pods Resources */ = {
    ......
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment