Update dependencies

BspbOrg · Nov 29, 2023 · dcaaa36 · dcaaa36
1 parent 4c9782e
commit dcaaa36
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -109,7 +109,7 @@ android {
 }
 
 dependencies {
-    def room_version = "2.5.1"
+    def room_version = "2.6.0"
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     kapt "org.androidannotations:androidannotations:4.8.0"
@@ -118,7 +118,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     // KTX extensions
-    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation "androidx.fragment:fragment-ktx:1.6.2"
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
@@ -142,7 +142,7 @@ dependencies {
 
     implementation 'org.osmdroid:osmdroid-android:6.1.16'
     implementation 'com.github.MKergall:osmbonuspack:6.9.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
 
     // http://square.github.io/retrofit/

diff --git a/app/src/main/java/org/bspb/smartbirds/pro/ui/MonitoringActivity.java b/app/src/main/java/org/bspb/smartbirds/pro/ui/MonitoringActivity.java
@@ -473,7 +473,9 @@ void onUp() {
 
     @Override
     public void onBackPressed() {
+        super.onBackPressed();
         pauseMonitoring();
+
     }
 
     void pauseMonitoring() {

diff --git a/app/src/main/java/org/bspb/smartbirds/pro/ui/NewMonitoringEntryActivity.java b/app/src/main/java/org/bspb/smartbirds/pro/ui/NewMonitoringEntryActivity.java
@@ -118,6 +118,7 @@ void onUp() {
 
     @Override
     public void onBackPressed() {
+        super.onBackPressed();
         confirmCancel();
     }
 

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = "1.8.21"
+    ext.kotlin_version = "1.9.10"
 
     repositories {
         google()
@@ -14,8 +14,8 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.novoda:gradle-build-properties-plugin:0.4.1'
 
-        classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
+        classpath 'com.google.gms:google-services:4.4.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
     }
 }