From 985a63b9c6f31c16aa195f4f76ed8ff1b29d68c4 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Tue, 20 Feb 2024 09:35:16 +0100
Subject: [PATCH] refs #6411 feat:update libraries
---
app/build.gradle | 32 +++++++++++++++-----------------
build.gradle | 13 +++++--------
2 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index b98831ee..bb7c54bb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,17 +6,15 @@ apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'com.google.devtools.ksp'
-
android {
- compileSdk 34 //si 34 problemas con AAPT2
-// buildToolsVersion "29.0.3"
+ compileSdk 34
defaultConfig {
applicationId "es.verdnatura"
- minSdkVersion 24 //21
- //targetSdkVersion 33
- versionCode 254
- versionName = "24.4Beta" //23.48Beta son la misma
+ minSdkVersion 24
+ targetSdkVersion 33 // se deja con target si no Play Protect la bloquea
+ versionCode 258
+ versionName = "24.8Beta" //23.48Beta son la misma
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -39,7 +37,7 @@ android {
create("general") {
//versionNameSuffix = "General"
}
- create("alpha"){
+ create("alpha") {
applicationIdSuffix = ".alpha"
}
}
@@ -63,8 +61,8 @@ dependencies {
implementation 'com.google.firebase:firebase-crashlytics-ktx:18.6.1'
implementation 'com.google.firebase:firebase-analytics-ktx:21.5.0'
implementation 'com.google.android.gms:play-services-location:21.1.0'
- kapt "androidx.room:room-compiler:2.5.1" // Problema de string dinámico
- implementation 'androidx.room:room-ktx:2.5.1'//Problema de string dinámico
+ kapt "androidx.room:room-compiler:2.6.1"
+ implementation 'androidx.room:room-ktx:2.6.1'
debugImplementation fileTree(dir: 'libs/debug', include: ['*.jar'])
releaseImplementation fileTree(dir: 'libs/release', include: ['*.jar'])
@@ -74,14 +72,15 @@ dependencies {
// Kotlin and Android
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.6.1'
- implementation 'androidx.core:core-ktx:1.11.+'
- implementation 'androidx.constraintlayout:constraintlayout:2.0'//si >2.0 revisar pantalla Ajustes
+ implementation 'androidx.core:core-ktx:1.12.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0'//si >2.0 revisar pantalla (ej:Ajustes)
+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
- implementation 'com.google.android.material:material:1.6.0'//hasta la 1.6
+ implementation 'com.google.android.material:material:1.11.0'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.0.2'
implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
@@ -89,11 +88,10 @@ dependencies {
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
//Fragments
- implementation("androidx.fragment:fragment-ktx:1.5.2") // Problema de inferir event
+ implementation("androidx.fragment:fragment-ktx:1.6.2")
// Architecture components
- implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle"
- implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"//versión más nueva compileSdk 34 y no infiere el event
+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
implementation "androidx.legacy:legacy-support-v4:1.0.0"
@@ -126,6 +124,6 @@ dependencies {
implementation 'androidx.datastore:datastore-core:1.0.0'
//linphone
- // implementation 'org.linphone:linphone-sdk-android:5.1.0+'
+ // implementation 'org.linphone:linphone-sdk-android:5.1.0+'
//implementation 'androidx.media:media:1.6.0'
}
diff --git a/build.gradle b/build.gradle
index 993f50ce..5c65ec4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.8.22'//1.4.20//1.5.31
+ ext.kotlin_version = '1.9.0'
ext {
// UI components
lottieVersion = '3.4.0'
- lifecycle = '2.2.0'
- koin = '2.1.6'//2.0.1//
+ lifecycle = '2.7.0'
+ koin = '2.1.6'
// Images
glide = '4.11.0'
- // piccasso = '2.71828'
coil = '1.4.0'//0.9.5
}
repositories {
@@ -21,15 +20,13 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.google.gms:google-services:4.4.0'
+ classpath 'com.google.gms:google-services:4.4.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
}
}
plugins {
- id 'com.google.devtools.ksp' version '1.8.22-1.0.11' apply false
+ id 'com.google.devtools.ksp' version '1.9.0-1.0.11' apply false
}
allprojects {
repositories {