diff --git a/CHANGELOG.md b/CHANGELOG.md index abf72c7..6396120 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [2.7.0] + +### Added + +* [imgly_sdk] Added `StickerAction.duration` as well as `TextAction.duration` which allow selecting a unique duration for texts and stickers in the video editor. + +### Fixed + +* [video_editor_sdk] Fixed `Theme` would not be applied if the editor has been initialized with a single video on Android. + ## [2.6.0] ### Changed diff --git a/README.md b/README.md index 20ed05f..36259f9 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Add the plugin package to the `pubspec.yaml` file in your project: ```yaml dependencies: - video_editor_sdk: ^2.6.0 + video_editor_sdk: ^2.7.0 ``` Install the new dependency: @@ -44,6 +44,7 @@ flutter pub get With version `2.4.0`, we recommend using `compileSdkVersion` not lower than `31` for Android. However, this might interfere with your application's Android Gradle Plugin version if this is set to `4.x`. If you don't use a newer Android Gradle Plugin version you'll most likely encounter a build error similar to: + ``` FAILURE: Build failed with an exception. @@ -60,31 +61,35 @@ Run with --stacktrace option to get the stack trace. Run with --info or --debug * Get more help at https://help.gradle.org ``` + **As a workaround you can either:** 1. Upgrade your Android Gradle Plugin version: - Inside `android/build.gradle` update the version to at least `7.0.0`: - ```diff - buildscript { - ... - dependencies { - - classpath 'com.android.tools.build:gradle:4.1.1' - + classpath 'com.android.tools.build:gradle:7.0.0' - ... - } - } - ``` - - After this, you need to update the Gradle version as well in `android/gradle/gradle-wrapper.properties`: - ```diff - - distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip - + distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip - ``` + Inside `android/build.gradle` update the version to at least `7.0.0`: + + ```diff + buildscript { + ... + dependencies { + - classpath 'com.android.tools.build:gradle:4.1.1' + + classpath 'com.android.tools.build:gradle:7.0.0' + ... + } + } + ``` + + After this, you need to update the Gradle version as well in `android/gradle/gradle-wrapper.properties`: + + ```diff + - distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip + + distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip + ``` 2. **Or** create the following symlinks: - - Inside `/Users/YOUR-USERNAME/Library/Android/sdk/build-tools/31.0.0/`: Create a `dx` symlink for the `d8` file with `ln -s d8 dx`. - - From there, go to `./lib/` and create a `dx.jar` symlink for the `d8.jar` file with `ln -s d8.jar dx.jar`. + +- Inside `/Users/YOUR-USERNAME/Library/Android/sdk/build-tools/31.0.0/`: Create a `dx` symlink for the `d8` file with `ln -s d8 dx`. +- From there, go to `./lib/` and create a `dx.jar` symlink for the `d8.jar` file with `ln -s d8.jar dx.jar`. ### Android @@ -102,12 +107,13 @@ Run with --stacktrace option to get the stack trace. Run with --info or --debug } dependencies { ... - + classpath 'ly.img.android.sdk:plugin:10.1.1' + + classpath 'ly.img.android.sdk:plugin:10.3.1' ... } } ``` - In order to update VideoEditor SDK for Android replace the version string `10.1.1` with a [newer release](https://github.com/imgly/pesdk-android-demo/releases). + + In order to update VideoEditor SDK for Android replace the version string `10.3.1` with a [newer release](https://github.com/imgly/pesdk-android-demo/releases). 2. Still in the `android/build.gradle` file (**not** `android/app/build.gradle`), add these lines at the bottom: @@ -119,7 +125,7 @@ Run with --stacktrace option to get the stack trace. Run with --info or --debug } ``` -3. In the `android/app/build.gradle` file (**not** `android/build.gradle`) you will need to modify the `minSdkVersion` to at least `21`. We also recommend to update the `buildToolsVersion` to `31.0.0` or higher as well as the `compileSdkVersion` to `31` or higher: +3. In the `android/app/build.gradle` file (**not** `android/build.gradle`) you will need to modify the `minSdkVersion` to at least `21`. We also recommend to update the `buildToolsVersion` to `31.0.0` or higher as well as the `compileSdkVersion` to `31` or higher: ```diff android { @@ -137,23 +143,23 @@ Run with --stacktrace option to get the stack trace. Run with --info or --debug } ``` - Depending on your **stable** Flutter SDK version (<= `2.5.0`), your `android/app/build.gradle` file might look a bit different. In this case, please modify it in the following way: - - ```diff - android { - - compileSdkVersion 30 - + compileSdkVersion 31 - + buildToolsVersion "31.0.0" - ... - defaultConfig { - ... - - minSdkVersion 16 - + minSdkVersion 21 - ... - } - ... - } - ``` + Depending on your **stable** Flutter SDK version (<= `2.5.0`), your `android/app/build.gradle` file might look a bit different. In this case, please modify it in the following way: + + ```diff + android { + - compileSdkVersion 30 + + compileSdkVersion 31 + + buildToolsVersion "31.0.0" + ... + defaultConfig { + ... + - minSdkVersion 16 + + minSdkVersion 21 + ... + } + ... + } + ``` 4. In the same file, configure VideoEditor SDK for Android by adding the following lines under `apply plugin: "com.android.application"`: @@ -211,6 +217,7 @@ import 'package:imgly_sdk/imgly_sdk.dart'; Each platform requires a separate license file. [Unlock VideoEditor SDK](./lib/video_editor_sdk.dart#L13-L22) with a single line of code for both platforms via platform-specific file extensions. Rename your license files: + - Android license: `vesdk_license.android` - iOS license: `vesdk_license.ios` diff --git a/android/build.gradle b/android/build.gradle index 9f5fc01..df4d7f9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -39,7 +39,7 @@ imglyConfig { } } -def MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION = "10.1.1" +def MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION = "10.3.1" task checkVersion { if (imglyConfig.convertToVersionNumber(imglyConfig.getVersion()) < imglyConfig.convertToVersionNumber(MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION)) { diff --git a/android/src/main/kotlin/ly/img/flutter/video_editor_sdk/FlutterVESDK.kt b/android/src/main/kotlin/ly/img/flutter/video_editor_sdk/FlutterVESDK.kt index 0875f01..891c9b3 100644 --- a/android/src/main/kotlin/ly/img/flutter/video_editor_sdk/FlutterVESDK.kt +++ b/android/src/main/kotlin/ly/img/flutter/video_editor_sdk/FlutterVESDK.kt @@ -108,6 +108,8 @@ class FlutterVESDK: FlutterIMGLY() { } } + applyTheme(settingsList, configuration.theme) + readSerialisation(settingsList, serialization, false) startEditor(settingsList, EDITOR_RESULT_ID) } diff --git a/example/android/build.gradle b/example/android/build.gradle index 36f1560..c2e7af9 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,6 +1,6 @@ buildscript { ext.kotlin_version = '1.5.32' - ext.vesdk_version = '10.1.1' + ext.vesdk_version = '10.3.1' repositories { google() diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index ec36670..183a834 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,12 +1,12 @@ PODS: - Flutter (1.0.0) - - imgly_sdk (2.6.0): + - imgly_sdk (2.7.0): - Flutter - - imglyKit (~> 11.1) - - imglyKit (11.2.0) - - video_editor_sdk (2.6.0): + - imglyKit (~> 11.3) + - imglyKit (11.3.1) + - video_editor_sdk (2.7.0): - Flutter - - imgly_sdk (= 2.6.0) + - imgly_sdk (= 2.7.0) DEPENDENCIES: - Flutter (from `Flutter`) @@ -27,9 +27,9 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - imgly_sdk: bb252939cfbf53a0199a40d565ab675db859a041 - imglyKit: 505785f0467867523cdee38ebb7d60c5189faedf - video_editor_sdk: 2e8337c6604c6b5a8fc2f2b3f261a00da702b1b0 + imgly_sdk: d5bd730c962ab5d08c065211e3d0d499dbf402c1 + imglyKit: 34eb8e0e1a399b815b2a5baf2f5afa3a4fc47105 + video_editor_sdk: c51fecac47f7936142adb74f13f211b82244065a PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c diff --git a/pubspec.yaml b/pubspec.yaml index 7d322dc..a0f8087 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: video_editor_sdk description: The official Flutter plugin for VideoEditor SDK. Integrate the video editor into your own iOS or Android app - in minutes! -version: 2.6.0 +version: 2.7.0 homepage: https://www.videoeditorsdk.com repository: https://github.com/imgly/vesdk-flutter @@ -11,7 +11,7 @@ environment: dependencies: flutter: sdk: flutter - imgly_sdk: 2.6.0 + imgly_sdk: 2.7.0 dev_dependencies: flutter_test: