Merge branch 'main' into development-flutter

arthenica · Sep 3, 2023 · 6c975a9 · 6c975a9
2 parents 70faa1f + 1edf59b
commit 6c975a9
Show file tree

Hide file tree

Showing 81 changed files with 12,496 additions and 12,752 deletions.
diff --git a/README.md b/README.md
@@ -22,10 +22,12 @@ Test applications are tagged with `ffmpeg-kit` release they depend on.
 
 |  Platform | FFmpegKit Version |                                        Tag                                        |
 | :----: |:-----------------:|:---------------------------------------------------------------------------------:|
+| 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) |
 | Flutter |       6.0.1       |     [6.0.1](https://github.com/arthenica/ffmpeg-kit-test/tree/flutter.v6.0.1)     |
 | Flutter |     6.0.1-LTS     | [6.0.1-LTS](https://github.com/arthenica/ffmpeg-kit-test/tree/flutter.v6.0.1.lts) |
+| React Native |       6.0.0       |  [6.0.0](https://github.com/arthenica/ffmpeg-kit-test/tree/react.native.v6.0.0)   |
 | Flutter |       6.0.0       |     [6.0.0](https://github.com/arthenica/ffmpeg-kit-test/tree/flutter.v6.0.0)     |
 | Flutter |     6.0.0-LTS     | [6.0.0-LTS](https://github.com/arthenica/ffmpeg-kit-test/tree/flutter.v6.0.0.lts) |
 | Android |        6.0        |       [6.0](https://github.com/arthenica/ffmpeg-kit-test/tree/android.v6.0)       |

diff --git a/android/test-app-maven-central/build.gradle b/android/test-app-maven-central/build.gradle
@@ -54,7 +54,7 @@ android.applicationVariants.all { variant ->
 }
 
 dependencies {
-    implementation 'com.arthenica:ffmpeg-kit-full:6.0'
+    implementation 'com.arthenica:ffmpeg-kit-full:6.0-1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }
diff --git a/react-native/test-app-local-dependency/.gitignore b/react-native/test-app-local-dependency/.gitignore
@@ -40,6 +40,9 @@ android.iml
 #
 example/ios/Pods
 
+*.keystore
+!debug.keystore
+
 # node.js
 #
 node_modules/
@@ -61,3 +64,8 @@ lib/
 
 # ios
 ios/Pods
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
+# testing
+/coverage
diff --git a/react-native/test-app-local-dependency/Gemfile b/react-native/test-app-local-dependency/Gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby ">= 2.6.10"
+
+gem 'cocoapods', '~> 1.12'