Update dependencies again

Author: SupernaviX

Cargo.lock

@@ -35,7 +35,7 @@ repositories {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -60,7 +60,7 @@ android {
     defaultConfig {
         applicationId "com.simongellis.vvb"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 41
         versionName "1.15.0"
 
@@ -129,7 +129,7 @@ def includeCardboardSdk(spec, toolchain) {
     // Copy the right SDK into the project as well
     copy {
         from cardboardSdkLocation
-        into "$buildDir/rustJniLibs/$toolchain.folder"
+        into "${project.layout.buildDirectory.asFile.get()}/rustJniLibs/$toolchain.folder"
         include "lib*.so"
     }
 }
@@ -174,7 +174,7 @@ project.afterEvaluate {
     // collect all the target dirs we compile to
     def jniTargetDirs = []
     tasks.withType(CargoBuildTask).forEach {
-        jniTargetDirs += new File("$buildDir/rustJniLibs", it.toolchain.folder)
+        jniTargetDirs += new File("${project.layout.buildDirectory.asFile.get()}/rustJniLibs", it.toolchain.folder)
     }
 
     // make sure we rerun the "merge jni lib folders" tasks any time they change
@@ -187,17 +187,17 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation project(':cardboard-sdk')
     leiaImplementation project(":leia-cnsdk")
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "androidx.preference:preference-ktx:1.2.0"
-    implementation "androidx.recyclerview:recyclerview:1.3.1"
+    implementation "androidx.preference:preference-ktx:1.2.1"
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     // lifecycle things
-    def lifecycleVersion = '2.6.1'
+    def lifecycleVersion = '2.6.2'
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"

app/build.gradle

@@ -57,13 +57,13 @@ class AutoMapDialog : DialogFragment(), InputManager.InputDeviceListener {
     }
 
     private fun onDeviceChosen(deviceId: Int) {
-        val device = _inputManager.getInputDevice(deviceId)
+        val device = _inputManager.getInputDevice(deviceId) ?: return
         parentViewModel.performAutoMap(device)
         dismiss()
     }
 
     override fun onInputDeviceAdded(deviceId: Int) {
-        val device = _inputManager.getInputDevice(deviceId)
+        val device = _inputManager.getInputDevice(deviceId) ?: return
         if (parentViewModel.isMappable(device)) {
             _adapter.addDevice(device)
         }
@@ -75,7 +75,7 @@ class AutoMapDialog : DialogFragment(), InputManager.InputDeviceListener {
 
     override fun onInputDeviceChanged(deviceId: Int) {
         val device = _inputManager.getInputDevice(deviceId)
-        if (parentViewModel.isMappable(device)) {
+        if (device != null && parentViewModel.isMappable(device)) {
             _adapter.addDevice(device)
         } else {
             _adapter.removeDevice(deviceId)

app/src/main/java/com/simongellis/vvb/menu/AutoMapDialog.kt

@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.mozilla.rust-android-gradle:plugin:0.9.3"
 

build.gradle

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists