diff --git a/app/build.gradle b/app/build.gradle
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,14 +4,14 @@
 
 
 android {
-    compileSdk 34
+    compileSdk 35
     namespace "it.reyboz.bustorino"
 
     defaultConfig {
         applicationId "it.reyboz.bustorino"
         minSdkVersion 21
-        targetSdkVersion 34
-        buildToolsVersion = '34.0.0'
+        targetSdkVersion 35
+        buildToolsVersion = '35.0.1'
         versionCode 62
         versionName "2.3.1"
         vectorDrawables.useSupportLibrary = true
@@ -65,6 +65,10 @@
     androidResources {
         generateLocaleConfig true
     }
+
+    buildFeatures{
+        buildConfig = true
+    }
 }
 
 dependencies {
@@ -114,8 +118,7 @@
     implementation 'com.google.protobuf:protobuf-java:3.19.6'
     // mqtt library
     implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
-    implementation 'com.github.fabmazz:paho.mqtt.android:v1.0.0'
-
+    implementation 'com.github.hannesa2:paho.mqtt.android:4.4'
     // ViewModel
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     // LiveData
diff --git a/app/src/main/java/it/reyboz/bustorino/data/MatoPatternsDownloadWorker.kt b/app/src/main/java/it/reyboz/bustorino/data/MatoPatternsDownloadWorker.kt
--- a/app/src/main/java/it/reyboz/bustorino/data/MatoPatternsDownloadWorker.kt
+++ b/app/src/main/java/it/reyboz/bustorino/data/MatoPatternsDownloadWorker.kt
@@ -86,7 +86,7 @@
 
             Log.d(DEBUG_TAG, "Request to download and insert patterns for ${routesIds.size} routes, proceed: $runNewWork, workstate: $addDat")
             if(runNewWork){
-                val routeIdsArray = routesIds.toTypedArray()
+                val routeIdsArray: Array<String?> = routesIds.toTypedArray()
                 val dataBuilder = Data.Builder().putStringArray(ROUTES_KEYS,routeIdsArray)
 
                 val requ = OneTimeWorkRequest.Builder(MatoPatternsDownloadWorker::class.java)
diff --git a/app/src/main/java/it/reyboz/bustorino/data/MatoTripsDownloadWorker.kt b/app/src/main/java/it/reyboz/bustorino/data/MatoTripsDownloadWorker.kt
--- a/app/src/main/java/it/reyboz/bustorino/data/MatoTripsDownloadWorker.kt
+++ b/app/src/main/java/it/reyboz/bustorino/data/MatoTripsDownloadWorker.kt
@@ -125,7 +125,7 @@
                 null else  info[0].state
             Log.d(debugTag, "Request to download and insert ${trips.size} trips, proceed: $runNewWork, workstate: $addDat")
             if(runNewWork) {
-                val tripsArr = trips.toTypedArray()
+                val tripsArr: Array<String?> = trips.toTypedArray()
                 val dataBuilder = Data.Builder().putStringArray(TRIPS_KEYS, tripsArr)
                 //build()
                 val requ = OneTimeWorkRequest.Builder(MatoTripsDownloadWorker::class.java)
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
--- a/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
@@ -76,6 +76,7 @@
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onLowMemory() {
         super.onLowMemory()
         mapView.onLowMemory()
diff --git a/app/src/main/java/it/reyboz/bustorino/middleware/AppLocationManager.kt b/app/src/main/java/it/reyboz/bustorino/middleware/AppLocationManager.kt
--- a/app/src/main/java/it/reyboz/bustorino/middleware/AppLocationManager.kt
+++ b/app/src/main/java/it/reyboz/bustorino/middleware/AppLocationManager.kt
@@ -178,6 +178,7 @@
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
         //IF ANOTHER LOCATION SOURCE IS READY, USE IT
         //OTHERWISE, SIGNAL THAT WE HAVE NO LOCATION
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -290,8 +290,7 @@
         <item>@string/positions_source_mato_descr</item>
         <item>@string/positions_source_gtfsrt_descr</item>
     </array>
-    <string name="positions_source_mato_descr">MaTO (updated more frequently, might be offline)</string>
-    <string name="positions_source_gtfsrt_descr">GTFS RT (more stable, less frequently updated)</string>
+
     <string name="map_style_pref_title">Style of the map</string>
     <string name="map_style_versatiles">Versatiles (vector)</string>
     <string name="map_style_legacy_raster">OSM legacy (raster, lighter)</string>
diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -9,12 +9,13 @@
 
 
     }
+    //TODO: Migrate tfrom kapt to KSP
     //kotlin
-    ext.kotlin_version = '1.9.21'
-    ext.coroutines_version = "1.8.0"
+    ext.kotlin_version = '2.1.10'
+    ext.coroutines_version = "1.10.2"
     dependencies {
 
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }