diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 5deb032a2..2acd689bb 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -47,7 +47,6 @@
 
 -dontwarn org.joda.convert.**
 
--dontwarn org.eclipse.jgit.**
 -dontwarn com.jcraft.**
 -dontwarn org.slf4j.**
 
@@ -59,3 +58,59 @@
 
 -keepnames public class * extends org.eclipse.jgit.nls.TranslationBundle
 -keepclassmembers class * extends org.eclipse.jgit.nls.TranslationBundle { *; }
+
+# Added when upgrading to AGP 8
+-keep public class org.apache.sshd.common.**
+-dontwarn com.google.errorprone.annotations.CanIgnoreReturnValue
+-dontwarn com.google.errorprone.annotations.CheckReturnValue
+-dontwarn com.google.errorprone.annotations.Immutable
+-dontwarn java.lang.management.ManagementFactory
+-dontwarn java.lang.management.RuntimeMXBean
+-dontwarn javax.management.InstanceAlreadyExistsException
+-dontwarn javax.management.InstanceNotFoundException
+-dontwarn javax.management.JMException
+-dontwarn javax.management.MBeanException
+-dontwarn javax.management.MBeanRegistrationException
+-dontwarn javax.management.MBeanServer
+-dontwarn javax.management.MalformedObjectNameException
+-dontwarn javax.management.NotCompliantMBeanException
+-dontwarn javax.management.ObjectInstance
+-dontwarn javax.management.ObjectName
+-dontwarn javax.management.ReflectionException
+-dontwarn javax.security.auth.login.CredentialException
+-dontwarn javax.security.auth.login.FailedLoginException
+-dontwarn org.apache.sshd.sftp.SftpModuleProperties
+-dontwarn org.apache.sshd.sftp.client.SftpClient$Attributes
+-dontwarn org.apache.sshd.sftp.client.SftpClient$CloseableHandle
+-dontwarn org.apache.sshd.sftp.client.SftpClient$CopyMode
+-dontwarn org.apache.sshd.sftp.client.SftpClient$DirEntry
+-dontwarn org.apache.sshd.sftp.client.SftpClient$Handle
+-dontwarn org.apache.sshd.sftp.client.SftpClient
+-dontwarn org.apache.sshd.sftp.client.SftpClientFactory
+-dontwarn org.apache.sshd.sftp.common.SftpException
+-dontwarn org.bouncycastle.crypto.prng.RandomGenerator
+-dontwarn org.bouncycastle.crypto.prng.VMPCRandomGenerator
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.bouncycastle.openssl.PEMDecryptorProvider
+-dontwarn org.bouncycastle.openssl.PEMEncryptedKeyPair
+-dontwarn org.bouncycastle.openssl.PEMKeyPair
+-dontwarn org.bouncycastle.openssl.PEMParser
+-dontwarn org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
+-dontwarn org.bouncycastle.openssl.jcajce.JcaPEMWriter
+-dontwarn org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.ietf.jgss.GSSContext
+-dontwarn org.ietf.jgss.GSSCredential
+-dontwarn org.ietf.jgss.GSSException
+-dontwarn org.ietf.jgss.GSSManager
+-dontwarn org.ietf.jgss.GSSName
+-dontwarn org.ietf.jgss.MessageProp
+-dontwarn org.ietf.jgss.Oid
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
+-dontwarn sun.security.x509.X509Key
diff --git a/build.gradle b/build.gradle
index 4a15a34b4..30562eab0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 
     def versions = [:]
 
-    versions.android_gradle_plugin = '7.4.2'
+    versions.android_gradle_plugin = '8.1.1'
 
     versions.kotlin = '1.7.20'
 
diff --git a/gradle.properties b/gradle.properties
index bdcc4dff5..d86f94bb1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,3 +20,6 @@ org.gradle.unsafe.configuration-cache=true
 
 # org.gradle.warning.mode=all
 android.jetifier.ignorelist = bcprov-jdk18on-1.78.1.jar
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 67f31dcaf..76ae8f5f4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Jan 29 20:23:20 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/shared-test/build.gradle b/shared-test/build.gradle
index 18202921b..2bfbdf184 100644
--- a/shared-test/build.gradle
+++ b/shared-test/build.gradle
@@ -44,7 +44,7 @@ android {
 }
 
 dependencies {
-    implementation project(":app")
+    implementation project(path: ':app')
     implementation "junit:junit:$versions.junit"
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation "org.eclipse.jgit:org.eclipse.jgit:$versions.jgit"