diff --git a/build.gradle b/build.gradle
index 5a187b0..f0f899f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
     ext {
         defaultPackageName = 'com.reveny.emulatordetector'
-        verCode = 150
-        verName = '1.5.0'
-        androidTargetSdkVersion = 34
+        verCode = 151
+        verName = '1.5.1'
+        androidTargetSdkVersion = 35
         androidMinSdkVersion = 23
-        androidBuildToolsVersion = '34.0.0'
-        androidCompileSdkVersion = 34
+        androidBuildToolsVersion = '35.0.0'
+        androidCompileSdkVersion = 35
         androidCompileNdkVersion = '27.0.12077973'
         androidSourceCompatibility = JavaVersion.VERSION_17
         androidTargetCompatibility = JavaVersion.VERSION_17
@@ -20,7 +20,7 @@ buildscript {
 
     dependencies {
         // classpath libs.gradle
-        classpath libs.gradle.plugin
+        classpath libs.gradle
         classpath libs.kotlin.gradle.plugin
     }
 }
diff --git a/emulatordetection/src/main/jni/Build/Android.mk b/emulatordetection/src/main/jni/Build/Android.mk
index 25ba615..296da6f 100644
--- a/emulatordetection/src/main/jni/Build/Android.mk
+++ b/emulatordetection/src/main/jni/Build/Android.mk
@@ -12,7 +12,7 @@ ifeq ($(NDK_DEBUG),0)
     LOCAL_CPPFLAGS += -O1
     LOCAL_CPPFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
     LOCAL_CPPFLAGS += -fno-unwind-tables -fno-asynchronous-unwind-tables -fomit-frame-pointer
-
+    LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
     LOCAL_LDFLAGS += -Wl,--strip-all -Wl,--exclude-libs,ALL
 endif
 
diff --git a/emulatordetection/src/main/jni/Build/Application.mk b/emulatordetection/src/main/jni/Build/Application.mk
index 87b6131..cf78ea2 100644
--- a/emulatordetection/src/main/jni/Build/Application.mk
+++ b/emulatordetection/src/main/jni/Build/Application.mk
@@ -1,6 +1,7 @@
 APP_ABI := arm64-v8a armeabi-v7a x86 x86_64
 APP_STL := c++_static
 APP_OPTIM := release
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
 
 ifeq ($(NDK_DEBUG),1)
     APP_CPPFLAGS += -DDEBUG_BUILD=1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7bf65c7..e5d7b18 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-agp = "8.1.0"
-gradle = "8.2.2"
+agp = "8.5.2"
+gradle = "8.7"
 gradle-plugin = "5.1.0"
-kotlin-gradle-plugin = "1.7.10"
+kotlin-gradle-plugin = "1.9.24"
 
 [plugins]
 agp-app = { id = "com.android.application", version.ref = "agp" }
@@ -10,7 +10,7 @@ materialthemebuilder = { id = "dev.rikka.tools.materialthemebuilder", version =
 
 # Dependencies section
 [libraries]
-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
+gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 gradle-plugin = { module = "com.github.megatronking.stringfog:gradle-plugin", version.ref = "gradle-plugin" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-gradle-plugin" }
 rikkax-appcompat = { module = "dev.rikka.rikkax.appcompat:appcompat", version = "1.6.1" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9bc2a92..4574239 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 #Sat Nov 02 10:22:35 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME