diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56e..b86273d9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 418e80de..8b495d66 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 34529ec1..567d8fc9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -411,6 +411,16 @@
@style/AppTheme
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
@style/AppTheme
@@ -483,13 +493,24 @@
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -504,7 +525,7 @@
-
+
@@ -655,63 +676,60 @@
- {
+ "keyToString": {
+ "Android App.app.executor": "Run",
+ "ApkExportedModule": "Gestor_Almacén.app",
+ "DEBUGGABLE_DEVICE": "zebra_technologies-tc21-21114523025303",
+ "DEBUGGABLE_PROCESS": "es.verdnatura.sfusion",
+ "DEBUGGER_ID": "Auto",
+ "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
+ "Gradle.vn-warehouseManager [clean].executor": "Run",
+ "Gradle.vn-warehouseManager.executor": "Run",
+ "KotlinFunctionFindUsagesOptions.isSearchForTextOccurrences": "true",
+ "PROJECT_TRUSTED_KEY": "true",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "RunOnceActivity.readMode.enableVisualFormatting": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "SHOW_ALL_PROCESSES": "false",
+ "ScreenRecorder.SavePath": "C:\\Users\\sergiodt",
+ "android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView",
+ "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED": "TextView",
+ "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED": "View",
+ "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/view/View.java_SELECTED": "View",
+ "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/CompoundButton.java_SELECTED": "CompoundButton",
+ "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/TextView.java_SELECTED": "TextView",
+ "cf.first.check.clang-format": "false",
+ "cidr.known.project.marker": "true",
+ "com.developerphil.adbidea.selecteddevices": "G65TY9DQN7X4BIE6",
+ "com.google.services.firebase.aqiPopupShown": "true",
+ "git-widget-placeholder": "dev",
+ "ignore.virus.scanning.warn.message": "true",
+ "kotlin-language-version-configured": "true",
+ "last_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
+ "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout",
+ "project.structure.last.edited": "Modules",
+ "project.structure.proportion": "0.17",
+ "project.structure.side.proportion": "0.2",
+ "rearrange.code.on.save": "true",
+ "run.code.analysis.last.selected.profile": "pProject Default",
+ "settings.editor.selected.configurable": "preferences.pluginManager"
},
- "keyToStringList": {
- "ExportApk.BuildVariants": [
- "generalRelease"
+ "keyToStringList": {
+ "ExportApk.BuildVariants": [
+ "generalRelease"
],
- "com.android.tools.idea.sqlite.queryhistory": [
- "select * from expedition where routeFk=182933;",
- "select * from expedition;",
- "select * from expeditionPending;",
- "select * from expedition where id = 7753995;\n\n",
- "\nselect * from expedition where id = 7753995;"
- ],
- "kotlin-gradle-user-dirs": [
- "C:\\Users\\sergiodt\\.gradle"
+ "com.android.tools.idea.sqlite.queryhistory": [
+ "select * from expedition where routeFk=182933;",
+ "select * from expedition;",
+ "select * from expeditionPending;",
+ "select * from expedition where id = 7753995;\n\n",
+ "\nselect * from expedition where id = 7753995;"
]
}
-}]]>
+}
@@ -719,8 +737,8 @@
-
+
@@ -740,11 +758,11 @@
+
+
-
-
@@ -776,9 +794,10 @@
+
+
-
@@ -1258,7 +1277,7 @@
1709725795643
-
+
@@ -1336,7 +1355,6 @@
-
+
@@ -1393,8 +1417,6 @@
-
-
@@ -1403,9 +1425,7 @@
-
-
@@ -1418,7 +1438,11 @@
-
+
+
+
+
+
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 97becf18..76d1e0a1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,7 +15,7 @@ android {
applicationId = "es.verdnatura"
minSdk = 26
targetSdk = 33 // se deja con target si no Play Protect la bloquea
- versionCode = 358
+ versionCode = 361
versionName = "24.46"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
@@ -75,8 +75,8 @@ android {
}
compileOptions {
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
+ sourceCompatibility = JavaVersion.VERSION_21
+ targetCompatibility = JavaVersion.VERSION_21
}
/* composeOptions {
kotlinCompilerExtensionVersion = "1.5.15"
@@ -84,9 +84,9 @@ android {
/* kotlin {
jvmToolchain(17)
}
- kotlinOptions {
- jvmTarget = "17"
- }*/
+ kotlinOptions {
+ jvmTarget = "17"
+ }*/
dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3830ccbc..a7385a45 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,8 +29,8 @@ swiperefreshlayout = "1.1.0"
zxingAndroidEmbedded = "4.3.0"
googleDevtoolsKsp = "2.0.20-1.0.25"
#cambiar ide para subir version
-androidGradlePlugin = "8.3.2"
-kotlin = "2.0.10"
+androidGradlePlugin = "8.7.2"
+kotlin = "2.0.20"
googleServices = "4.4.2"
firebaseCrashlytics = "3.0.2"