From c4dafe8fb7bd052ff40b4ba62279f2a5473d21d4 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 27 Feb 2023 09:35:38 +0100
Subject: [PATCH] allow merging videos in the Pro editor

---
 app/build.gradle | 5 +++--
 build.gradle     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 70793e94d..b76495d24 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,7 +78,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:50eeb2e717'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:1f50049630'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'
@@ -90,7 +90,7 @@ dependencies {
     implementation 'info.androidhive:imagefilters:1.0.7'
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.github.tibbi:gestureviews:a8e8fa8d27'
-    implementation 'com.github.tibbi:subsampling-scale-image-view:d0681c32e2'
+    implementation 'com.github.tibbi:subsampling-scale-image-view:80efdaa570'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.github.penfeizhou.android.animation:awebp:2.17.0'
     implementation 'com.github.penfeizhou.android.animation:apng:2.17.0'
@@ -135,6 +135,7 @@ if (is_proprietary) {
             include 'ui:overlay'
             include 'ui:transform'
             include 'ui:adjustment'
+            include 'ui:video-composition'
 
             include 'backend:serializer'
             include 'backend:sticker-smart'
diff --git a/build.gradle b/build.gradle
index 16bd6caaa..f13204000 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         if (is_proprietary) {
-            classpath 'ly.img.android.pesdk:plugin:10.5.0'
+            classpath 'ly.img.android.pesdk:plugin:10.6.0'
         }
 
         // NOTE: Do not place your application dependencies here; they belong