diff --git a/build.gradle b/build.gradle
index f7d8abd1c..d1c46a90e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,11 +37,11 @@ subprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
 
-task installGitHooks(type: Copy, group: "development") {
+tasks.register('installGitHooks', Copy) {
     def sourceFolder = "${rootProject.projectDir}/scripts/hooks"
     def destFolder = "${rootProject.projectDir}/.git/hooks"
 
diff --git a/gradle.properties b/gradle.properties
index f61f80964..b60c16c8a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,19 +16,13 @@ android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 
 # JVM arguments to optimize heap usage, enable heap dump on out-of-memory errors, and set the file encoding
-org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8
 org.gradle.dependency.verification.console=verbose
-kotlin.daemon.jvmargs=-Xmx4096m
+kotlin.daemon.jvmargs=-Xmx3072m
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 android.defaults.buildfeatures.resvalues=true
-android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
-android.enableAppCompileTimeRClass=false
 android.usesSdkInManifest.disallowed=false
 android.uniquePackageNames=false
 android.dependency.useConstraints=true
-android.r8.strictFullModeForKeepRules=false
-android.r8.optimizedResourceShrinking=false
-android.builtInKotlin=false
-android.newDsl=false
diff --git a/library/build.gradle b/library/build.gradle
index b493be61e..e7a5fc99f 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -33,7 +33,6 @@ plugins {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 apply from: "$rootProject.projectDir/jacoco.gradle"
 apply plugin: "com.github.spotbugs"
@@ -157,12 +156,14 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
-	
-    kotlinOptions {
-        jvmTarget = '17'
+
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(21))
+        }
     }
 
     testOptions {
@@ -178,6 +179,12 @@ android {
     }
 
     namespace = 'com.owncloud.android.lib'
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
 }
 
 tasks.register("combinedTestReport", JacocoReport) {