Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use CocoaPods trunk for iOS SDK #551

Merged
merged 3 commits into from
Oct 31, 2024
Merged

Use CocoaPods trunk for iOS SDK #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15af63e
Remove custom CocoaPods spec
123mpozzi Oct 31, 2024
2b2be65
Remove unnecessary steps using deprecated custom CocoaPods spec
123mpozzi Oct 31, 2024
57f09b0
Move core to trunk as well
123mpozzi Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/ci-ios-tvos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ jobs:
restore-keys: pods-

- name: Install pods
run: |
pod repo add bitmovin https://github.com/bitmovin/cocoapod-specs.git || pod repo update bitmovin
yarn pods
run: yarn pods
env:
CP_HOME_DIR: ${{ github.workspace }}/.cocoapods-cache

Expand Down Expand Up @@ -131,9 +129,7 @@ jobs:
restore-keys: pods-

- name: Install pods
run: |
pod repo add bitmovin https://github.com/bitmovin/cocoapod-specs.git || pod repo update bitmovin
yarn example pods
run: yarn example pods
env:
CP_HOME_DIR: ${{ github.workspace }}/.cocoapods-cache

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/create-sdk-update-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ jobs:
if: ${{ inputs.sdk_name == 'ios' }}
run: |
sed -i '' 's/s.dependency "BitmovinPlayer", ".*/s.dependency "BitmovinPlayer", "${{ inputs.version_number }}"/g' RNBitmovinPlayer.podspec
pod repo add bitmovin https://github.com/bitmovin/cocoapod-specs.git
yarn bootstrap

- name: Save Pods cache
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/start-release-train.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,6 @@ jobs:
run: |
yarn version --new-version ${{ inputs.version_number }} --no-git-tag-version

- name: Set up CocoaPods
run: |
pod repo add bitmovin https://github.com/bitmovin/cocoapod-specs.git || pod repo update bitmovin
working-directory: example/ios
env:
CP_HOME_DIR: ${{ github.workspace }}/.cocoapods-cache

- name: Install pods to update Podfile.lock
run: |
yarn bootstrap
Expand Down
1 change: 0 additions & 1 deletion example/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

source 'https://cdn.cocoapods.org'
source 'https://github.com/bitmovin/cocoapod-specs.git'
source 'https://github.com/react-native-tvos/react-native-tvos-podspecs.git'

prepare_react_native_project!
Expand Down
9 changes: 4 additions & 5 deletions example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,13 +1122,12 @@ DEPENDENCIES:
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
https://github.com/bitmovin/cocoapod-specs.git:
- BitmovinPlayerCore
https://github.com/react-native-tvos/react-native-tvos-podspecs.git:
- libevent
trunk:
- BitmovinAnalyticsCollector
- BitmovinPlayer
- BitmovinPlayerCore
- google-cast-sdk
- GoogleAds-IMA-iOS-SDK
- GoogleAds-IMA-tvOS-SDK
Expand Down Expand Up @@ -1247,7 +1246,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
BitmovinAnalyticsCollector: d08e0b13bcc32973370e0d71f2faa739561bac0a
BitmovinPlayer: 65866e13f7a8246ccbc7378607d6ca789f0f459e
BitmovinPlayerCore: 7151c7836f0e0c906a17c897576d3bd892b51b4a
BitmovinPlayerCore: 158b4a5b81b12b819f0f51b7b89711ca47e11583
boost: 88202336c3ba1e7a264a83c0c888784b0f360c28
DoubleConversion: 74cb0ce4de271b23e772567504735c87134edf0a
FBLazyVector: 33a271a7e8de0bd321e47356d8bc3b2d5fb9ddba
Expand Down Expand Up @@ -1306,8 +1305,8 @@ SPEC CHECKSUMS:
RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca
RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000
Yoga: e7f2a2256464d4ef7b3825d216bd22aac3b449c1

PODFILE CHECKSUM: e89ebfe6215567e7e15880586d123e5ea122588c
PODFILE CHECKSUM: 11ac6cb62c1978622f6d687b574d9de3441a2680

COCOAPODS: 1.15.2
1 change: 0 additions & 1 deletion integration_test/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

source 'https://cdn.cocoapods.org'
source 'https://github.com/bitmovin/cocoapod-specs.git'
source 'https://github.com/react-native-tvos/react-native-tvos-podspecs.git'

prepare_react_native_project!
Expand Down
9 changes: 4 additions & 5 deletions integration_test/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,13 +1103,12 @@ DEPENDENCIES:
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
https://github.com/bitmovin/cocoapod-specs.git:
- BitmovinPlayerCore
https://github.com/react-native-tvos/react-native-tvos-podspecs.git:
- libevent
trunk:
- BitmovinAnalyticsCollector
- BitmovinPlayer
- BitmovinPlayerCore
- GoogleAds-IMA-iOS-SDK
- SocketRocket

Expand Down Expand Up @@ -1217,7 +1216,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
BitmovinAnalyticsCollector: d08e0b13bcc32973370e0d71f2faa739561bac0a
BitmovinPlayer: 65866e13f7a8246ccbc7378607d6ca789f0f459e
BitmovinPlayerCore: 7151c7836f0e0c906a17c897576d3bd892b51b4a
BitmovinPlayerCore: 158b4a5b81b12b819f0f51b7b89711ca47e11583
boost: 88202336c3ba1e7a264a83c0c888784b0f360c28
DoubleConversion: 74cb0ce4de271b23e772567504735c87134edf0a
FBLazyVector: 33a271a7e8de0bd321e47356d8bc3b2d5fb9ddba
Expand Down Expand Up @@ -1269,8 +1268,8 @@ SPEC CHECKSUMS:
ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2
RNBitmovinPlayer: 5df76edfd71a5887aa20210108bdf9ac7227048b
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000
Yoga: e7f2a2256464d4ef7b3825d216bd22aac3b449c1

PODFILE CHECKSUM: 0bfe194f5e28f1cf54d3d732eda8c78fadbeeedd
PODFILE CHECKSUM: d1cd0316ec7219d421f4dfb46ced3af29fd4e932

COCOAPODS: 1.15.2
Loading