diff --git a/app/build.gradle b/app/build.gradle
index df6aa39..53b21e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,9 +25,9 @@ apply plugin: 'kotlin-android'
 android {
     defaultConfig {
         applicationId "ru.nsu.bobrofon.easysshfs"
-        compileSdk 34
+        compileSdk 35
         minSdkVersion 16
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 94
         versionName "0.5.15-dev"
 
diff --git a/app/gradle.properties b/app/gradle.properties
index 4b392e7..fd2fe2c 100644
--- a/app/gradle.properties
+++ b/app/gradle.properties
@@ -4,3 +4,5 @@ android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx768m -XX:MaxMetaspaceSize=512m
+# ndk is not actually used by this project
+android.ndk.suppressMinSdkVersionError=21
diff --git a/app/gradle/wrapper/gradle-wrapper.properties b/app/gradle/wrapper/gradle-wrapper.properties
index 42defcc..20db9ad 100644
--- a/app/gradle/wrapper/gradle-wrapper.properties
+++ b/app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/app/src/main/java/ru/nsu/bobrofon/easysshfs/mountpointlist/mountpoint/EditFragment.kt b/app/src/main/java/ru/nsu/bobrofon/easysshfs/mountpointlist/mountpoint/EditFragment.kt
index 3ca9c89..5248591 100644
--- a/app/src/main/java/ru/nsu/bobrofon/easysshfs/mountpointlist/mountpoint/EditFragment.kt
+++ b/app/src/main/java/ru/nsu/bobrofon/easysshfs/mountpointlist/mountpoint/EditFragment.kt
@@ -105,7 +105,7 @@ class EditFragment : EasySSHFSFragment() {
                 }
             } else {
                 if (optionList.last() == "reconnect") {
-                    optionList.removeLast()
+                    optionList.removeLastOrNull()
                 }
             }
 
@@ -221,6 +221,7 @@ class EditFragment : EasySSHFSFragment() {
         EasySSHFSActivity.showToast(message, context)
     }
 
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     private val localDirPicker =
         registerForActivityResult(OpenDocumentTree()) { uri: Uri? ->
             uri?.let { setLocalPath(it) }