Migrate to version 1.33.0

Author: GlebPBanuba

app/build.gradle

@@ -1,17 +1,20 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'kotlin-android-extensions'
+    id 'kotlin-parcelize' // ! USE instead of removed 'kotlin-android-extensions'
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "30.0.3"
+
+    namespace "com.banuba.example.integrationapp"
 
     defaultConfig {
         applicationId "com.banuba.example.integrationapp"
+        compileSdk 33
         minSdkVersion 23
         targetSdkVersion 33
+        buildToolsVersion "33.0.1"
+
         versionCode 1
         versionName "1.0"
 
@@ -24,21 +27,30 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     packagingOptions {
         pickFirst '**/libbanuba-ve-yuv.so'
+
+        jniLibs {
+            // ! USE INSTEAD OF REMOVED android.bundle.enableUncompressedNativeLibs=false
+            useLegacyPackaging = true
+        }
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
@@ -48,7 +60,7 @@ dependencies {
 
     // Banuba Video Editor SDK dependencies
 
-    def banubaSdkVersion = '1.32.2'
+    def banubaSdkVersion = '1.33.0'
     implementation "com.banuba.sdk:ffmpeg:5.1.3"
     implementation "com.banuba.sdk:camera-sdk:${banubaSdkVersion}"
     implementation "com.banuba.sdk:camera-ui-sdk:${banubaSdkVersion}"

app/proguard-rules.pro

@@ -14,8 +14,29 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
+-renamesourcefileattribute SourceFile
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class com.banuba.sdk.core.effects.** { *; }
+-keep class com.banuba.sdk.effects.ve.speed.** { *; }
+
+-keep class kotlinx.android.extensions.** { *; }
+
+# The following rules are taken from generated "missing_rules.txt" file provided by R8
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn kotlinx.android.extensions.LayoutContainer
+-dontwarn kotlinx.parcelize.Parcelize
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE

app/src/main/java/com/banuba/example/integrationapp/MainActivity.kt

@@ -4,16 +4,18 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import android.view.LayoutInflater
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
+import com.banuba.example.integrationapp.databinding.ActivityMainBinding
 import com.banuba.sdk.cameraui.data.PipConfig
 import com.banuba.sdk.core.ui.ext.visible
 import com.banuba.sdk.export.data.ExportResult
 import com.banuba.sdk.export.utils.EXTRA_EXPORTED_SUCCESS
 import com.banuba.sdk.ve.flow.VideoCreationActivity
-import kotlinx.android.synthetic.main.activity_main.*
+
 
 class MainActivity : AppCompatActivity() {
 
@@ -71,15 +73,22 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private var _binding: ActivityMainBinding? = null
+
+    private val binding: ActivityMainBinding
+        get() = requireNotNull(_binding)
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        _binding = ActivityMainBinding.inflate(LayoutInflater.from(this))
+
+        setContentView(binding.root)
 
         // Handle Video Editor license flow
         val videoEditor = (application as SampleApp).videoEditor
         if (videoEditor == null) {
-            licenseStateView.visible()
-            licenseStateView.text = SampleApp.ERR_SDK_NOT_INITIALIZED
+            binding.licenseStateView.visible()
+            binding.licenseStateView.text = SampleApp.ERR_SDK_NOT_INITIALIZED
             return
         }
 
@@ -90,32 +99,37 @@ class MainActivity : AppCompatActivity() {
                 // ✅ License is active, all good
                 // You can show button that opens Video Editor or
                 // Start Video Editor right away
-                btnVideoEditor.setOnClickListener {
+                binding.btnVideoEditor.setOnClickListener {
                     openVideoEditor()
                 }
-                btnPiPVideoEditor.setOnClickListener {
+                binding.btnPiPVideoEditor.setOnClickListener {
                     requestVideoOpenPIP.launch("video/*")
                 }
-                btnDraftsVideoEditor.setOnClickListener {
+                binding.btnDraftsVideoEditor.setOnClickListener {
                     openVideoEditorDrafts()
                 }
-                btnSlideShowVideoEditorTrimmer.setOnClickListener {
+                binding.btnSlideShowVideoEditorTrimmer.setOnClickListener {
                     requestImageOpenTrimmer.launch("image/*")
                 }
             } else {
                 // ❌ Use of Video Editor is restricted. License is revoked or expired.
-                licenseStateView.text = SampleApp.ERR_LICENSE_REVOKED
+                binding.licenseStateView.text = SampleApp.ERR_LICENSE_REVOKED
                 Log.w(SampleApp.TAG, SampleApp.ERR_LICENSE_REVOKED)
 
-                licenseStateView.visible()
-                btnVideoEditor.isEnabled = false
-                btnPiPVideoEditor.isEnabled = false
-                btnDraftsVideoEditor.isEnabled = false
-                btnSlideShowVideoEditorTrimmer.isEnabled = false
+                binding.licenseStateView.visible()
+                binding.btnVideoEditor.isEnabled = false
+                binding.btnPiPVideoEditor.isEnabled = false
+                binding.btnDraftsVideoEditor.isEnabled = false
+                binding.btnSlideShowVideoEditorTrimmer.isEnabled = false
             }
         }
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        _binding = null
+    }
+
     private fun openVideoEditor(pipVideo: Uri = Uri.EMPTY) {
         val videoCreationIntent = VideoCreationActivity.startFromCamera(
             context = this,

app/src/main/java/com/banuba/example/integrationapp/VideoEditorModule.kt

@@ -75,19 +75,6 @@ class VideoEditorModule {
 private class SampleIntegrationKoinModule {
 
     val module = module {
-        single<ExportFlowManager> {
-            ForegroundExportFlowManager(
-                exportDataProvider = get(),
-                exportSessionHelper = get(),
-                exportDir = get(named("exportDir")),
-                shouldClearSessionOnFinish = true,
-                publishManager = get(),
-                errorParser = get(),
-                exportBundleProvider = get(),
-                eventConverter = get()
-            )
-        }
-
         /**
          * Provides params for export
          * */
@@ -114,14 +101,6 @@ private class SampleIntegrationKoinModule {
             AudioBrowserMusicProvider()
         }
 
-        single<CoverProvider> {
-            CoverProvider.EXTENDED
-        }
-
-        single<CameraTimerActionProvider> {
-            HandsFreeTimerActionProvider()
-        }
-
         single<AspectRatioProvider> {
             object : AspectRatioProvider {
                 override fun provide(): AspectRatio = AspectRatio(9.0 / 16)

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.7.10"
+    ext.kotlin_version = "1.8.22"
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.2.0"
+        classpath "com.android.tools.build:gradle:8.1.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -18,5 +18,4 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
-android.bundle.enableUncompressedNativeLibs=false
+kotlin.code.style=official

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip