From 9b55aab92ae83597079132624ad4556b05fad8da Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Wed, 19 Mar 2025 16:14:43 -0400
Subject: [PATCH] update version to 20250319-01 (452)
Change-Id: I7b051336b211102cbf6a5a41f3f0343355b36cfa
---
jami-android/app/build.gradle.kts | 20 +++++++++----------
.../app/src/main/res/values/strings.xml | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/jami-android/app/build.gradle.kts b/jami-android/app/build.gradle.kts
index 28f274c69..ef2b4e907 100644
--- a/jami-android/app/build.gradle.kts
+++ b/jami-android/app/build.gradle.kts
@@ -21,8 +21,8 @@ android {
defaultConfig {
minSdk = 24
targetSdk = 35
- versionCode = 451
- versionName = "20250314-01"
+ versionCode = 452
+ versionName = "20250319-01"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
@@ -100,12 +100,12 @@ dependencies {
implementation ("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
implementation ("androidx.core:core-ktx:1.15.0")
implementation ("androidx.appcompat:appcompat:1.7.0")
- implementation ("androidx.constraintlayout:constraintlayout:2.2.0")
+ implementation ("androidx.constraintlayout:constraintlayout:2.2.1")
implementation ("androidx.cardview:cardview:1.0.0")
implementation ("androidx.preference:preference-ktx:1.2.1")
- implementation ("androidx.recyclerview:recyclerview:1.3.2")
- implementation ("androidx.leanback:leanback:1.2.0-alpha04")
- implementation ("androidx.leanback:leanback-preference:1.2.0-alpha04")
+ implementation ("androidx.recyclerview:recyclerview:1.4.0")
+ implementation ("androidx.leanback:leanback:1.2.0-beta01")
+ implementation ("androidx.leanback:leanback-preference:1.2.0-beta01")
implementation ("androidx.car.app:app:1.4.0")
implementation ("androidx.tvprovider:tvprovider:1.1.0-alpha01")
implementation ("androidx.media:media:1.7.0")
@@ -118,7 +118,7 @@ dependencies {
implementation ("com.google.android.material:material:1.12.0")
implementation ("androidx.biometric:biometric:1.1.0")
implementation ("com.google.android.flexbox:flexbox:3.0.0")
- implementation ("com.google.protobuf:protobuf-javalite:4.28.3")
+ implementation ("com.google.protobuf:protobuf-javalite:4.30.1")
implementation("androidx.annotation:annotation-jvm:1.9.1")
// ORM
@@ -175,11 +175,11 @@ dependencies {
protobuf {
protoc {
- artifact = "com.google.protobuf:protoc:4.26.0"
+ artifact = "com.google.protobuf:protoc:4.30.1"
}
generateProtoTasks {
- all().forEach { task ->
- task.builtins {
+ all().configureEach {
+ builtins {
create("java") {
option("lite")
}
diff --git a/jami-android/app/src/main/res/values/strings.xml b/jami-android/app/src/main/res/values/strings.xml
index 622b2540f..e25ebe6a9 100644
--- a/jami-android/app/src/main/res/values/strings.xml
+++ b/jami-android/app/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
<!-- About -->
<string name="app_name" translatable="false">Jami</string>
<string name="app_author" translatable="false">Savoir-faire Linux Inc.</string>
- <string name="app_release" translatable="false">Astarte - %1$s</string>
+ <string name="app_release" translatable="false">Εἰρήνη - %1$s</string>
<string name="app_website" translatable="false">https://jami.net</string>
<string name="app_website_contribute" translatable="false"><u>https://jami.net/contribute</u></string>
<string name="gnu_license_website" translatable="false">https://www.gnu.org/licenses/gpl.html</string>
--
GitLab