diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 73c1af46..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,103 +0,0 @@
-buildscript {
-    repositories {
-        google()
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-    }
-}
-apply plugin: 'maven-publish'
-apply plugin: 'com.android.library'
-
-ext {
-    tools = [
-            groupID: 'com.github.infomaniak',
-            versionName: '1.9.5',
-            artifactID: 'pdfiumandroid'
-    ]
-}
-
-android {
-    namespace 'com.shockwave.pdfium'
-    
-    compileSdk 34
-    ndkVersion "26.1.10909125"
-
-    externalNativeBuild {
-        ndkBuild {
-            path "src/main/jni/Android.mk"
-        }
-    }
-
-    packagingOptions {
-        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
-        pickFirst 'lib/arm64-v8a/libc++_shared.so'
-        pickFirst 'lib/x86_64/libc++_shared.so'
-        pickFirst 'lib/x86/libc++_shared.so'
-
-        pickFirst 'lib/armeabi-v7a/libjniPdfium.so'
-        pickFirst 'lib/arm64-v8a/libjniPdfium.so'
-        pickFirst 'lib/x86_64/libjniPdfium.so'
-        pickFirst 'lib/x86/libjniPdfium.so'
-
-        pickFirst 'lib/armeabi-v7a/libmodpdfium.so'
-        pickFirst 'lib/arm64-v8a/libmodpdfium.so'
-        pickFirst 'lib/x86_64/libmodpdfium.so'
-        pickFirst 'lib/x86/libmodpdfium.so'
-    }
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdk 34
-        versionCode 1
-        versionName tools.versionName
-
-        buildConfigField("String", "LIBRARY_VERSION_NAME", "\"${defaultConfig.versionName}\"")
-
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-            withJavadocJar()
-        }
-    }
-
-    buildFeatures {
-        buildConfig = true
-    }
-}
-
-repositories {
-    google()
-    mavenLocal()
-    mavenCentral()
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.collection:collection:1.3.0'
-}
-
-afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
-                from components.findByName('release')
-                groupId = tools.groupID
-                artifactId = tools.artifactID
-                version = tools.versionName
-            }
-        }
-    }
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000..01b4a4a2
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,120 @@
+buildscript {
+
+    extra.apply {
+        set("libMinSdk", 21)
+        set("libCompileSdk", 34)
+        set("libTargetSdk", 34)
+
+        set("libGroupId", "com.github.infomaniak")
+        set("libVersionName", "1.9.6")
+        set("libArtifactId", "pdfiumandroid")
+        set("ndkVersion", "26.1.10909125")
+        set("javaVersion", JavaVersion.VERSION_17)
+    }
+}
+
+plugins {
+    alias(libs.plugins.androidLibrary)
+    id("maven-publish")
+}
+
+val libMinSdk: Int by rootProject.extra
+val libCompileSdk: Int by rootProject.extra
+val libTargetSdk: Int by rootProject.extra
+
+val libGroupId: String by rootProject.extra
+val libVersionName: String by rootProject.extra
+val libArtifactId: String by rootProject.extra
+val ndkVersion: String by rootProject.extra
+val javaVersion: JavaVersion by rootProject.extra
+
+android {
+    namespace = "com.shockwave.pdfium"
+    compileSdk = libCompileSdk
+    ndkVersion = ndkVersion
+
+    externalNativeBuild {
+        ndkBuild {
+            path = File("src/main/jni/Android.mk")
+        }
+    }
+
+    packaging {
+        resources {
+            jniLibs.pickFirsts.addAll(
+                listOf(
+                    "lib/armeabi-v7a/libc++_shared.so",
+                    "lib/arm64-v8a/libc++_shared.so",
+                    "lib/x86_64/libc++_shared.so",
+                    "lib/x86/libc++_shared.so",
+
+                    "lib/armeabi-v7a/libjniPdfium.so",
+                    "lib/arm64-v8a/libjniPdfium.so",
+                    "lib/x86_64/libjniPdfium.so",
+                    "lib/x86/libjniPdfium.so",
+
+                    "lib/armeabi-v7a/libmodpdfium.so",
+                    "lib/arm64-v8a/libmodpdfium.so",
+                    "lib/x86_64/libmodpdfium.so",
+                    "lib/x86/libmodpdfium.so"
+                )
+            )
+        }
+    }
+
+    defaultConfig {
+        minSdk = libMinSdk
+        targetSdk = libTargetSdk
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
+}
+
+repositories {
+    google()
+    mavenLocal() // TODO to comment
+    mavenCentral()
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    implementation(libs.collection)
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            create<MavenPublication>("release") {
+                from(components.findByName("release")!!)
+                groupId = libGroupId
+                artifactId = libArtifactId
+                version = libVersionName
+            }
+        }
+    }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..5966497e
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,9 @@
+[versions]
+agp = "8.6.1"
+collection = "1.3.0"
+
+[libraries]
+collection = { module = "androidx.collection:collection", version.ref = "collection" }
+
+[plugins]
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dd19c51c..9978c525 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat May 21 18:52:48 EDT 2022
+#Thu Feb 27 10:37:59 CET 2025
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 00000000..301c7410
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,15 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    @Suppress("UnstableApiUsage")
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
diff --git a/src/main/java/com/shockwave/pdfium/PdfiumCore.java b/src/main/java/com/shockwave/pdfium/PdfiumCore.java
index 7f082f75..46fc3a53 100644
--- a/src/main/java/com/shockwave/pdfium/PdfiumCore.java
+++ b/src/main/java/com/shockwave/pdfium/PdfiumCore.java
@@ -122,7 +122,6 @@ public static int getNumFd(ParcelFileDescriptor fdObj) {
     /** Context needed to get screen density */
     public PdfiumCore(Context ctx) {
         mCurrentDpi = ctx.getResources().getDisplayMetrics().densityDpi;
-        Log.d(TAG, "Starting PdfiumAndroid " + BuildConfig.LIBRARY_VERSION_NAME);
     }
 
     /** Create new document from file */