From 676291a5ae10fce7efd5e7de7b78230f41054122 Mon Sep 17 00:00:00 2001 From: Taha F22 Labs Date: Mon, 22 Jul 2024 16:32:39 +0530 Subject: [PATCH 1/2] feat: upgrade dist url to 8.1.1 to fix merge dex issue --- android/build.gradle | 13 ++++++++++--- android/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 9dba746..db6241d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -32,7 +32,7 @@ group 'com.truecallersdk' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.8.22' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() @@ -58,13 +58,20 @@ def sdkVariant = "flutter" def sdkVariantVersion = "1.0.0" android { - compileSdkVersion 28 + compileSdkVersion 33 + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } sourceSets { main.java.srcDirs += 'src/main/kotlin' } defaultConfig { - minSdkVersion 22 + minSdkVersion 24 + targetSdk 33 + multiDexEnabled true resValue("string", "sdk_variant", "${sdkVariant}") resValue("string", "sdk_variant_version", "${sdkVariantVersion}") } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 0acc003..47ccd3e 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -32,4 +32,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip From 5fb15db0aaa9cbf8eb097c856877511c3093ce7f Mon Sep 17 00:00:00 2001 From: Taha F22 Labs Date: Tue, 23 Jul 2024 03:00:35 +0530 Subject: [PATCH 2/2] fix: Updated Example App --- example/android/app/build.gradle | 4 ++-- example/android/app/src/main/AndroidManifest.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 76846a0..384cdbc 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -65,8 +65,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.truecaller_sdk_example" - minSdkVersion 22 - targetSdkVersion 30 + minSdkVersion 24 + targetSdkVersion 32 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 7b5d82b..5c8ef33 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -43,6 +43,7 @@ android:label="truecaller_sdk_example">