From 90063c96edfbb5d25937aec64f1ddc17dbf491c4 Mon Sep 17 00:00:00 2001 From: "Sue N. Cooper" Date: Sun, 27 Aug 2023 18:28:14 +0300 Subject: [PATCH] release react-native v6.0.0 --- README.md | 2 ++ docs/index.md | 3 ++ react-native/README.md | 2 +- react-native/android/build.gradle | 14 +++++--- react-native/android/gradle.properties | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- react-native/ffmpeg-kit-react-native.podspec | 32 +++++++++---------- react-native/ios/FFmpegKitReactNativeModule.m | 2 +- react-native/package.json | 24 +++++++------- react-native/src/index.js | 2 +- 10 files changed, 48 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index dae7c374..dcffc03b 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,8 @@ the exact version number of `FFmpeg` is obtained using the `git describe --tags` | Platforms | FFmpegKit Version | FFmpeg Version | Release Date | |:----------------:|:-----------------------------------------------------------------------------------:|:--------------:|:------------:| +| React Native | [6.0.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v6.0.0) | 6.0.0 | Aug 27, 2023 | +| Flutter | [6.0.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v6.0.0) | 6.0.0 | Aug 27, 2023 | | Android
Apple | [6.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/v6.0) | 6.0 | Aug 21, 2023 | | React Native | [5.1.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v5.1.0) | 5.1.2 | Oct 02, 2022 | | Flutter | [5.1.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v5.1.0) | 5.1.2 | Oct 02, 2022 | diff --git a/docs/index.md b/docs/index.md index b7b2af65..26f674f2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -114,6 +114,8 @@ the exact version number of `FFmpeg` is obtained using the `git describe --tags` | Platforms | FFmpegKit Version | FFmpeg Version | Release Date | |:----------------:|:-----------------------------------------------------------------------------------:|:--------------:|:------------:| +| React Native | [6.0.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v6.0.0) | 6.0.0 | Aug 27, 2023 | +| Flutter | [6.0.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v6.0.0) | 6.0.0 | Aug 27, 2023 | | Android
Apple | [6.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/v6.0) | 6.0 | Aug 21, 2023 | | React Native | [5.1.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v5.1.0) | 5.1.2 | Oct 02, 2022 | | Flutter | [5.1.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v5.1.0) | 5.1.2 | Oct 02, 2022 | @@ -126,6 +128,7 @@ the exact version number of `FFmpeg` is obtained using the `git describe --tags` | Flutter | [4.5.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v4.5.0) | 4.5-dev-2008 | Oct 05, 2021 | | React Native | [4.5.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v4.5.0) | 4.5-dev-2008 | Oct 01, 2021 | | Android
Apple | [4.5](https://github.com/arthenica/ffmpeg-kit/releases/tag/v4.5) | 4.5-dev-2008 | Sep 18, 2021 | +| Android
Apple | [4.4](https://github.com/arthenica/ffmpeg-kit/releases/tag/v4.4) | 4.4-dev-3015 | Mar 03, 2021 | ### 11. LTS Releases diff --git a/react-native/README.md b/react-native/README.md index fd1a2f1f..049a6fa7 100644 --- a/react-native/README.md +++ b/react-native/README.md @@ -4,7 +4,7 @@ - Includes both `FFmpeg` and `FFprobe` - Supports - Both `Android` and `iOS` - - FFmpeg `v5.1.2` + - FFmpeg `v6.0` - `arm-v7a`, `arm-v7a-neon`, `arm64-v8a`, `x86` and `x86_64` architectures on Android - `Android API Level 24` or later - `API Level 16` on LTS releases diff --git a/react-native/android/build.gradle b/react-native/android/build.gradle index dcb21f20..97f6a366 100644 --- a/react-native/android/build.gradle +++ b/react-native/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:8.1.0' } } @@ -26,13 +26,17 @@ def safeExtGet(String prop, String fallback) { } android { - compileSdkVersion 31 + if (project.android.hasProperty("namespace")) { + namespace 'com.arthenica.ffmpegkit.reactnative' + } + + compileSdkVersion 33 defaultConfig { minSdkVersion safeExtGet('ffmpegKitPackage', 'https').contains("-lts") ? 16 : 24 - targetSdkVersion 31 - versionCode 510 - versionName "5.1.0" + targetSdkVersion 33 + versionCode 600 + versionName "6.0.0" } buildTypes { diff --git a/react-native/android/gradle.properties b/react-native/android/gradle.properties index e1fff5b5..06db3699 100644 --- a/react-native/android/gradle.properties +++ b/react-native/android/gradle.properties @@ -1,3 +1,3 @@ android.useAndroidX=true -ffmpegKit.android.main.version=5.1 -ffmpegKit.android.lts.version=5.1 +ffmpegKit.android.main.version=6.0 +ffmpegKit.android.lts.version=6.0 diff --git a/react-native/android/gradle/wrapper/gradle-wrapper.properties b/react-native/android/gradle/wrapper/gradle-wrapper.properties index ae04661e..84a0b92f 100644 --- a/react-native/android/gradle/wrapper/gradle-wrapper.properties +++ b/react-native/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/react-native/ffmpeg-kit-react-native.podspec b/react-native/ffmpeg-kit-react-native.podspec index 653bcf0b..889d3e8f 100644 --- a/react-native/ffmpeg-kit-react-native.podspec +++ b/react-native/ffmpeg-kit-react-native.podspec @@ -23,112 +23,112 @@ Pod::Spec.new do |s| s.subspec 'min' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-min', "5.1" + ss.dependency 'ffmpeg-kit-ios-min', "6.0" ss.ios.deployment_target = '12.1' end s.subspec 'min-lts' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-min', "5.1.LTS" + ss.dependency 'ffmpeg-kit-ios-min', "6.0.LTS" ss.ios.deployment_target = '10' end s.subspec 'min-gpl' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-min-gpl', "5.1" + ss.dependency 'ffmpeg-kit-ios-min-gpl', "6.0" ss.ios.deployment_target = '12.1' end s.subspec 'min-gpl-lts' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-min-gpl', "5.1.LTS" + ss.dependency 'ffmpeg-kit-ios-min-gpl', "6.0.LTS" ss.ios.deployment_target = '10' end s.subspec 'https' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-https', "5.1" + ss.dependency 'ffmpeg-kit-ios-https', "6.0" ss.ios.deployment_target = '12.1' end s.subspec 'https-lts' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-https', "5.1.LTS" + ss.dependency 'ffmpeg-kit-ios-https', "6.0.LTS" ss.ios.deployment_target = '10' end s.subspec 'https-gpl' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-https-gpl', "5.1" + ss.dependency 'ffmpeg-kit-ios-https-gpl', "6.0" ss.ios.deployment_target = '12.1' end s.subspec 'https-gpl-lts' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-https-gpl', "5.1.LTS" + ss.dependency 'ffmpeg-kit-ios-https-gpl', "6.0.LTS" ss.ios.deployment_target = '10' end s.subspec 'audio' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-audio', "5.1" + ss.dependency 'ffmpeg-kit-ios-audio', "6.0" ss.ios.deployment_target = '12.1' end s.subspec 'audio-lts' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-audio', "5.1.LTS" + ss.dependency 'ffmpeg-kit-ios-audio', "6.0.LTS" ss.ios.deployment_target = '10' end s.subspec 'video' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-video', "5.1" + ss.dependency 'ffmpeg-kit-ios-video', "6.0" ss.ios.deployment_target = '12.1' end s.subspec 'video-lts' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-video', "5.1.LTS" + ss.dependency 'ffmpeg-kit-ios-video', "6.0.LTS" ss.ios.deployment_target = '10' end s.subspec 'full' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-full', "5.1" + ss.dependency 'ffmpeg-kit-ios-full', "6.0" ss.ios.deployment_target = '12.1' end s.subspec 'full-lts' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-full', "5.1.LTS" + ss.dependency 'ffmpeg-kit-ios-full', "6.0.LTS" ss.ios.deployment_target = '10' end s.subspec 'full-gpl' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-full-gpl', "5.1" + ss.dependency 'ffmpeg-kit-ios-full-gpl', "6.0" ss.ios.deployment_target = '12.1' end s.subspec 'full-gpl-lts' do |ss| ss.source_files = '**/FFmpegKitReactNativeModule.m', '**/FFmpegKitReactNativeModule.h' - ss.dependency 'ffmpeg-kit-ios-full-gpl', "5.1.LTS" + ss.dependency 'ffmpeg-kit-ios-full-gpl', "6.0.LTS" ss.ios.deployment_target = '10' end diff --git a/react-native/ios/FFmpegKitReactNativeModule.m b/react-native/ios/FFmpegKitReactNativeModule.m index 04a03b61..6b3895b1 100644 --- a/react-native/ios/FFmpegKitReactNativeModule.m +++ b/react-native/ios/FFmpegKitReactNativeModule.m @@ -765,7 +765,7 @@ + (NSDictionary*)toStatisticsDictionary:(Statistics*)statistics { dictionary[KEY_STATISTICS_VIDEO_FPS] = [NSNumber numberWithFloat: [statistics getVideoFps]]; dictionary[KEY_STATISTICS_VIDEO_QUALITY] = [NSNumber numberWithFloat: [statistics getVideoQuality]]; dictionary[KEY_STATISTICS_SIZE] = [NSNumber numberWithLong: [statistics getSize]]; - dictionary[KEY_STATISTICS_TIME] = [NSNumber numberWithInt: [statistics getTime]]; + dictionary[KEY_STATISTICS_TIME] = [NSNumber numberWithDouble: [statistics getTime]]; dictionary[KEY_STATISTICS_BITRATE] = [NSNumber numberWithDouble: [statistics getBitrate]]; dictionary[KEY_STATISTICS_SPEED] = [NSNumber numberWithDouble: [statistics getSpeed]]; diff --git a/react-native/package.json b/react-native/package.json index 42194bd9..b39a4f99 100644 --- a/react-native/package.json +++ b/react-native/package.json @@ -1,6 +1,6 @@ { "name": "ffmpeg-kit-react-native", - "version": "5.1.0", + "version": "6.0.0", "description": "FFmpeg Kit for React Native", "main": "src/index", "types": "src/index.d.ts", @@ -29,22 +29,22 @@ "registry": "https://registry.npmjs.org/" }, "devDependencies": { - "@commitlint/config-conventional": "^11.0.0", + "@commitlint/config-conventional": "^17.7.0", "@react-native-community/eslint-config": "^2.0.0", - "@release-it/conventional-changelog": "^2.0.0", - "@types/jest": "^26.0.0", + "@release-it/conventional-changelog": "^7.0.0", + "@types/jest": "^29.5.4", "@types/react": "^16.9.19", "@types/react-native": "^0.62.13", - "commitlint": "^11.0.0", - "eslint": "^7.2.0", - "eslint-config-prettier": "^7.0.0", - "eslint-plugin-prettier": "^3.1.3", - "jest": "^26.0.1", - "pod-install": "^0.1.0", - "prettier": "^2.0.5", + "commitlint": "^17.7.1", + "eslint": "^8.48.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-prettier": "^5.0.0", + "jest": "^29.6.4", + "pod-install": "^0.1.39", + "prettier": "^3.0.2", "react": "^16.13.1", "react-native": "^0.63.4", - "release-it": "^14.2.2" + "release-it": "^16.1.5" }, "peerDependencies": { "react": "*", diff --git a/react-native/src/index.js b/react-native/src/index.js index 8e167d16..3144750b 100644 --- a/react-native/src/index.js +++ b/react-native/src/index.js @@ -1611,7 +1611,7 @@ class FFmpegKitFactory { } static getVersion() { - return "5.1.0"; + return "6.0.0"; } static getLogRedirectionStrategy(sessionId) {