From fcf84a8b4322580cf90e6bea641e11dcf21ecb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 10 Aug 2023 14:09:19 -0400
Subject: [PATCH] build: update to gradle 8.1
Change-Id: Ife34a61151bb72f0dec6d66efd4bfd8ed94b6f4b
---
jami-android/app/build.gradle.kts | 6 +++---
jami-android/build.gradle.kts | 2 +-
jami-android/gradle.properties | 2 ++
jami-android/gradle/wrapper/gradle-wrapper.properties | 2 +-
jami-android/libjamiclient/build.gradle.kts | 4 ++--
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/jami-android/app/build.gradle.kts b/jami-android/app/build.gradle.kts
index ae6075f07..7d27be3b4 100644
--- a/jami-android/app/build.gradle.kts
+++ b/jami-android/app/build.gradle.kts
@@ -77,11 +77,11 @@ android {
}
}
compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
- jvmTarget = "1.8"
+ jvmTarget = "17"
}
externalNativeBuild {
cmake {
diff --git a/jami-android/build.gradle.kts b/jami-android/build.gradle.kts
index fcdf030a6..3e0f69fc6 100644
--- a/jami-android/build.gradle.kts
+++ b/jami-android/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
val hilt_version by extra { "2.47" }
dependencies {
- classpath ("com.android.tools.build:gradle:7.4.2")
+ classpath ("com.android.tools.build:gradle:8.1.0")
classpath ("com.google.gms:google-services:4.3.15")
classpath ("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
classpath ("com.google.dagger:hilt-android-gradle-plugin:$hilt_version")
diff --git a/jami-android/gradle.properties b/jami-android/gradle.properties
index b11225a0c..a71c72669 100644
--- a/jami-android/gradle.properties
+++ b/jami-android/gradle.properties
@@ -3,3 +3,5 @@ org.gradle.jvmargs=-Xmx3048M
android.useAndroidX=true
android.enableJetifier=false
android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
diff --git a/jami-android/gradle/wrapper/gradle-wrapper.properties b/jami-android/gradle/wrapper/gradle-wrapper.properties
index 7ae51c622..41797c3c4 100644
--- a/jami-android/gradle/wrapper/gradle-wrapper.properties
+++ b/jami-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri Jul 29 13:20:33 EDT 2022
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/jami-android/libjamiclient/build.gradle.kts b/jami-android/libjamiclient/build.gradle.kts
index 2337772f6..2f52a2a10 100644
--- a/jami-android/libjamiclient/build.gradle.kts
+++ b/jami-android/libjamiclient/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
}
java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
--
GitLab