Skip to content
This repository has been archived by the owner on Jan 6, 2025. It is now read-only.

Commit

Permalink
Merge pull request #54 from arthenica/development-react-native
Browse files Browse the repository at this point in the history
merge react-native v6.0.1 applications to main
  • Loading branch information
tanersener authored Sep 3, 2023
2 parents af4b2b2 + 3d05f5c commit ee312cc
Show file tree
Hide file tree
Showing 12 changed files with 157 additions and 158 deletions.
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 600
versionName "6.0.0"
versionCode 601
versionName "6.0.1"
}
signingConfigs {
debug {
Expand Down
12 changes: 6 additions & 6 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.0):
- ffmpeg-kit-react-native/video (6.0.1):
- ffmpeg-kit-ios-video (= 6.0)
- React-Core
- Flipper (0.182.0):
Expand Down Expand Up @@ -379,7 +379,7 @@ PODS:
- React-jsinspector (0.72.4)
- React-logger (0.72.4):
- glog
- react-native-pager-view (6.2.0):
- react-native-pager-view (6.2.1):
- React-Core
- react-native-video (5.2.1):
- React-Core
Expand Down Expand Up @@ -502,7 +502,7 @@ PODS:
- React-Core
- RNGestureHandler (2.12.1):
- React-Core
- RNScreens (3.24.0):
- RNScreens (3.25.0):
- React-Core
- React-RCTImage
- SocketRocket (0.6.1)
Expand Down Expand Up @@ -702,7 +702,7 @@ SPEC CHECKSUMS:
FBLazyVector: 5d4a3b7f411219a45a6d952f77d2c0a6c9989da5
FBReactNativeSpec: 3fc2d478e1c4b08276f9dd9128f80ec6d5d85c1f
ffmpeg-kit-ios-video: d3a8a535570063b717f88da68f9089e213aa21ba
ffmpeg-kit-react-native: a8aa8b5bed0a53ae573617e790984075bee2c716
ffmpeg-kit-react-native: fb8c0d138e852615e13c43f1d94d85aa1050796e
Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
Expand Down Expand Up @@ -731,7 +731,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: c7f826e40fa9cab5d37cab6130b1af237332b594
React-jsinspector: aaed4cf551c4a1c98092436518c2d267b13a673f
React-logger: da1ebe05ae06eb6db4b162202faeafac4b435e77
react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
react-native-pager-view: d211379f61895b6349bd7e571b44a26d005c2975
react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
React-NativeModulesApple: edb5ace14f73f4969df6e7b1f3e41bef0012740f
React-perflogger: 496a1a3dc6737f964107cb3ddae7f9e265ddda58
Expand All @@ -753,7 +753,7 @@ SPEC CHECKSUMS:
RNCPicker: 32ca102146bc7d34a8b93a998d9938d9f9ec7898
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7
RNScreens: 85d3880b52d34db7b8eeebe2f1a0e807c05e69fa
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
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.0",
"version": "6.0.1",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand Down
253 changes: 126 additions & 127 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 600
versionName "6.0.0"
versionCode 601
versionName "6.0.1"
}
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.0):
- ffmpeg-kit-react-native/https (= 6.0.0)
- ffmpeg-kit-react-native (6.0.1):
- ffmpeg-kit-react-native/https (= 6.0.1)
- React-Core
- ffmpeg-kit-react-native/https (6.0.0):
- ffmpeg-kit-react-native/https (6.0.1):
- 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: a8aa8b5bed0a53ae573617e790984075bee2c716
ffmpeg-kit-react-native: fb8c0d138e852615e13c43f1d94d85aa1050796e
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.0",
"version": "6.0.1",
"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.0"
"ffmpeg-kit-react-native": "6.0.1"
},
"devDependencies": {
"@babel/core": "^7.22.11",
Expand Down
8 changes: 4 additions & 4 deletions react-native/test-app-npm-single-view/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2840,10 +2840,10 @@ fb-watchman@^2.0.0:
dependencies:
bser "2.1.1"

[email protected].0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/ffmpeg-kit-react-native/-/ffmpeg-kit-react-native-6.0.0.tgz#0dafb861092f3535caf0e94aaf4b6a691818986c"
integrity sha512-nLpl5fYoHP/o5Jja0Av2Ln6eTITpqy4HLP4eheXnP23ER0Hg05DKIeZ86xcd8pUlxlhPEhjmrXT4wNGL2xkftg==
[email protected].1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/ffmpeg-kit-react-native/-/ffmpeg-kit-react-native-6.0.1.tgz#071bd7ba671624e627b55355ee700c3b4aac650a"
integrity sha512-nt5URruAiYydNjisyGfw2hFzDfTayXV2dOfTz3VFtv7h3Umtg7NCRELA0sWKdaoD/nxG+1cnJQ9JUFrvtmsebg==

file-entry-cache@^6.0.1:
version "6.0.1"
Expand Down
4 changes: 2 additions & 2 deletions react-native/test-app-npm/android/app/build.gradle
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 600
versionName "6.0.0"
versionCode 601
versionName "6.0.1"
}
signingConfigs {
debug {
Expand Down
4 changes: 2 additions & 2 deletions react-native/test-app-npm/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.0):
- ffmpeg-kit-react-native/video (6.0.1):
- ffmpeg-kit-ios-video (= 6.0)
- React-Core
- Flipper (0.182.0):
Expand Down Expand Up @@ -702,7 +702,7 @@ SPEC CHECKSUMS:
FBLazyVector: 5d4a3b7f411219a45a6d952f77d2c0a6c9989da5
FBReactNativeSpec: 3fc2d478e1c4b08276f9dd9128f80ec6d5d85c1f
ffmpeg-kit-ios-video: d3a8a535570063b717f88da68f9089e213aa21ba
ffmpeg-kit-react-native: a8aa8b5bed0a53ae573617e790984075bee2c716
ffmpeg-kit-react-native: fb8c0d138e852615e13c43f1d94d85aa1050796e
Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
Expand Down
4 changes: 2 additions & 2 deletions react-native/test-app-npm/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.0",
"version": "6.0.1",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand All @@ -13,7 +13,7 @@
"@react-native-picker/picker": "^2.5.0",
"@react-navigation/material-top-tabs": "^6.6.3",
"@react-navigation/native": "^6.1.7",
"ffmpeg-kit-react-native": "6.0.0",
"ffmpeg-kit-react-native": "6.0.1",
"node-fetch": "^3.3.2",
"prop-types": "^15.8.1",
"react": "18.2.0",
Expand Down
8 changes: 4 additions & 4 deletions react-native/test-app-npm/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3562,10 +3562,10 @@ fetch-blob@^3.1.2, fetch-blob@^3.1.4:
node-domexception "^1.0.0"
web-streams-polyfill "^3.0.3"

[email protected].0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/ffmpeg-kit-react-native/-/ffmpeg-kit-react-native-6.0.0.tgz#0dafb861092f3535caf0e94aaf4b6a691818986c"
integrity sha512-nLpl5fYoHP/o5Jja0Av2Ln6eTITpqy4HLP4eheXnP23ER0Hg05DKIeZ86xcd8pUlxlhPEhjmrXT4wNGL2xkftg==
[email protected].1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/ffmpeg-kit-react-native/-/ffmpeg-kit-react-native-6.0.1.tgz#071bd7ba671624e627b55355ee700c3b4aac650a"
integrity sha512-nt5URruAiYydNjisyGfw2hFzDfTayXV2dOfTz3VFtv7h3Umtg7NCRELA0sWKdaoD/nxG+1cnJQ9JUFrvtmsebg==

file-entry-cache@^6.0.1:
version "6.0.1"
Expand Down

0 comments on commit ee312cc

Please sign in to comment.