upgrade version and dependencies, fix some warnings

Helium314 · Apr 19, 2023 · 0765b36 · 0765b36
1 parent b34e975
commit 0765b36
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,12 +10,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - Not applicable
-- Notification text for active mode now contains name of emitter that triggered the scan
-- Keep screen on during import / export operations
 
 ### Removed
 - Not applicable
 
+## [1.2.6] - 2023-04-19
+### Changed
+- Notification text for active mode now contains name of emitter that triggered the scan
+- Keep screen on during import / export operations
+
 ## [1.2.5] - 2023-02-10
 ### Changed
 - Fix MLS import not working without MCC filter

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "helium314.localbackend"
         minSdkVersion 18
         targetSdkVersion 33
-        versionCode 33
-        versionName "1.2.5"
+        versionCode 34
+        versionName "1.2.6"
     }
     buildTypes {
         release {
@@ -28,7 +28,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
     implementation 'org.microg.nlp:api:2.0-alpha10'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'

diff --git a/app/src/main/java/org/fitchfamily/android/dejavu/BackendService.kt b/app/src/main/java/org/fitchfamily/android/dejavu/BackendService.kt
@@ -988,6 +988,7 @@ class BackendService : LocationBackendService() {
     }
 
     companion object {
+        private const val TAG = "LocalNLP Backend"
         var instance: BackendService? = null
             private set
 
@@ -1070,7 +1071,6 @@ private const val GPS_COORDINATE_NOISE = 2.0 // reduced from initial 3.0 to get
 
 private val DEBUG = BuildConfig.DEBUG
 
-private const val TAG = "LocalNLP Backend"
 private val myPerms = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
     arrayOf(
         permission.ACCESS_WIFI_STATE, permission.CHANGE_WIFI_STATE,

diff --git a/app/src/main/java/org/fitchfamily/android/dejavu/GpsMonitor.kt b/app/src/main/java/org/fitchfamily/android/dejavu/GpsMonitor.kt
@@ -135,6 +135,7 @@ class GpsMonitor : Service(), LocationListener {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
         Log.d(TAG, "onStatusChanged() - provider $provider, status $status")
     }
@@ -190,7 +191,10 @@ class GpsMonitor : Service(), LocationListener {
     private fun stopGps() {
         gpsLocationManager.removeUpdates(this)
         gpsRunning?.cancel()
-        stopForeground(true)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        else
+            stopForeground(true)
     }
 
     companion object {

diff --git a/build.gradle b/build.gradle
@@ -4,8 +4,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 

diff --git a/fastlane/metadata/android/en-US/changelogs/34.txt b/fastlane/metadata/android/en-US/changelogs/34.txt
@@ -0,0 +1,2 @@
+- Notification text for active mode now contains name of emitter that triggered the scan
+- Keep screen on during import / export operations
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Notification text for active mode now contains name of emitter that triggered the scan
		- Keep screen on during import / export operations