diff --git a/app/build.gradle b/app/build.gradle
index 452bdb5ca..848982abe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -143,8 +143,8 @@ android {
             initWith release
 
             resValue "bool", "crashlytics_enabled", crashlyticsEnabled.toString()
-            if (crashlyticsEnabled) {
 
+            if (crashlyticsEnabled) {
                 firebaseCrashlytics {
                     nativeSymbolUploadEnabled true
                     unstrippedNativeLibsDir file(LinphoneSdkBuildDir + '/libs-debug/').toString()
@@ -161,14 +161,13 @@ android {
             resValue "string", "sync_account_type", getPackageName() + ".sync"
             resValue "string", "file_provider", getPackageName() + ".debug.fileprovider"
             resValue "string", "linphone_address_mime_type", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"
+            resValue "bool", "crashlytics_enabled", crashlyticsEnabled.toString()
 
             if (!firebaseEnabled) {
                 resValue "string", "gcm_defaultSenderId", "none"
             }
 
-            resValue "bool", "crashlytics_enabled", crashlyticsEnabled.toString()
             if (crashlyticsEnabled) {
-
                 firebaseCrashlytics {
                     nativeSymbolUploadEnabled true
                     unstrippedNativeLibsDir file(LinphoneSdkBuildDir + '/libs-debug/').toString()
@@ -211,8 +210,6 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.media:media:1.4.3'
     implementation 'androidx.fragment:fragment-ktx:1.4.0-rc01'
diff --git a/build.gradle b/build.gradle
index a8907faaa..2e256b988 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.30'
-
     repositories {
         google()
         maven {
@@ -15,9 +13,9 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.3'
         classpath 'com.google.gms:google-services:4.3.10'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0"
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0'
     }
 }