Skip to content

Commit

Permalink
Merge pull request #57 from arthenica/development-react-native
Browse files Browse the repository at this point in the history
merge react-native v6.0.2 applications to main
  • Loading branch information
tanersener authored Sep 19, 2023
2 parents 551d6a2 + 08ef3db commit 41fb6e8
Show file tree
Hide file tree
Showing 13 changed files with 2,255 additions and 2,155 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ Test applications are tagged with `ffmpeg-kit` release they depend on.

| Platform | FFmpegKit Version | Tag |
| :----: |:-----------------:|:---------------------------------------------------------------------------------:|
| React Native | 6.0.2 | [6.0.2](https://github.com/arthenica/ffmpeg-kit-test/tree/react.native.v6.0.2) |
| Flutter | 6.0.3 | [6.0.3](https://github.com/arthenica/ffmpeg-kit-test/tree/flutter.v6.0.3) |
| Flutter | 6.0.3-LTS | [6.0.3-LTS](https://github.com/arthenica/ffmpeg-kit-test/tree/flutter.v6.0.3.lts) |
| React Native | 6.0.1 | [6.0.1](https://github.com/arthenica/ffmpeg-kit-test/tree/react.native.v6.0.1) |
| Flutter | 6.0.2 | [6.0.2](https://github.com/arthenica/ffmpeg-kit-test/tree/flutter.v6.0.2) |
| Flutter | 6.0.2-LTS | [6.0.2-LTS](https://github.com/arthenica/ffmpeg-kit-test/tree/flutter.v6.0.2.lts) |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ android {
applicationId "com.arthenica.ffmpegkit.reactnative.test"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 601
versionName "6.0.1"
versionCode 602
versionName "6.0.2"
}
signingConfigs {
debug {
Expand Down
8 changes: 4 additions & 4 deletions react-native/test-app-local-dependency/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PODS:
- React-jsi (= 0.72.4)
- ReactCommon/turbomodule/core (= 0.72.4)
- ffmpeg-kit-ios-video (6.0)
- ffmpeg-kit-react-native/video (6.0.1):
- ffmpeg-kit-react-native/video (6.0.2):
- ffmpeg-kit-ios-video (= 6.0)
- React-Core
- Flipper (0.182.0):
Expand Down Expand Up @@ -500,7 +500,7 @@ PODS:
- React-Core
- RNFS (2.20.0):
- React-Core
- RNGestureHandler (2.12.1):
- RNGestureHandler (2.13.0):
- React-Core
- RNScreens (3.25.0):
- React-Core
Expand Down Expand Up @@ -702,7 +702,7 @@ SPEC CHECKSUMS:
FBLazyVector: 5d4a3b7f411219a45a6d952f77d2c0a6c9989da5
FBReactNativeSpec: 3fc2d478e1c4b08276f9dd9128f80ec6d5d85c1f
ffmpeg-kit-ios-video: d3a8a535570063b717f88da68f9089e213aa21ba
ffmpeg-kit-react-native: fb8c0d138e852615e13c43f1d94d85aa1050796e
ffmpeg-kit-react-native: 3cea88c9c5cfad62e1465279ea7d800dfbba3b00
Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
Expand Down Expand Up @@ -752,7 +752,7 @@ SPEC CHECKSUMS:
ReactCommon: 4b2bdcb50a3543e1c2b2849ad44533686610826d
RNCPicker: 32ca102146bc7d34a8b93a998d9938d9f9ec7898
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
RNGestureHandler: 6e4dc6b7ab3a385386d4e36228bd065e5a611394
RNScreens: 85d3880b52d34db7b8eeebe2f1a0e807c05e69fa
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981
Expand Down
2 changes: 1 addition & 1 deletion react-native/test-app-local-dependency/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffmpeg-kit-react-native-test",
"version": "6.0.1",
"version": "6.0.2",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand Down
1,405 changes: 719 additions & 686 deletions react-native/test-app-local-dependency/yarn.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ android {
applicationId "com.ffmpegkit"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 601
versionName "6.0.1"
versionCode 602
versionName "6.0.2"
}
signingConfigs {
debug {
Expand Down
8 changes: 4 additions & 4 deletions react-native/test-app-npm-single-view/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ PODS:
- React-jsi (= 0.72.4)
- ReactCommon/turbomodule/core (= 0.72.4)
- ffmpeg-kit-ios-https (6.0)
- ffmpeg-kit-react-native (6.0.1):
- ffmpeg-kit-react-native/https (= 6.0.1)
- ffmpeg-kit-react-native (6.0.2):
- ffmpeg-kit-react-native/https (= 6.0.2)
- React-Core
- ffmpeg-kit-react-native/https (6.0.1):
- ffmpeg-kit-react-native/https (6.0.2):
- ffmpeg-kit-ios-https (= 6.0)
- React-Core
- Flipper (0.182.0):
Expand Down Expand Up @@ -671,7 +671,7 @@ SPEC CHECKSUMS:
FBLazyVector: 5d4a3b7f411219a45a6d952f77d2c0a6c9989da5
FBReactNativeSpec: 3fc2d478e1c4b08276f9dd9128f80ec6d5d85c1f
ffmpeg-kit-ios-https: f9c838aa5400a6c5ba12324c6b798f52197ba354
ffmpeg-kit-react-native: fb8c0d138e852615e13c43f1d94d85aa1050796e
ffmpeg-kit-react-native: 3cea88c9c5cfad62e1465279ea7d800dfbba3b00
Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
Expand Down
4 changes: 2 additions & 2 deletions react-native/test-app-npm-single-view/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffmpeg-kit-react-native-test",
"version": "6.0.1",
"version": "6.0.2",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand All @@ -12,7 +12,7 @@
"dependencies": {
"react": "18.2.0",
"react-native": "0.72.4",
"ffmpeg-kit-react-native": "6.0.1"
"ffmpeg-kit-react-native": "6.0.2"
},
"devDependencies": {
"@babel/core": "^7.22.11",
Expand Down
Loading

0 comments on commit 41fb6e8

Please sign in to comment.