diff --git a/apps/OboeTester/app/CMakeLists.txt b/apps/OboeTester/app/CMakeLists.txt
index 3103a1a39..a47e6abf2 100644
--- a/apps/OboeTester/app/CMakeLists.txt
+++ b/apps/OboeTester/app/CMakeLists.txt
@@ -34,4 +34,3 @@ include_directories(
 # link to oboe
 target_link_libraries(oboetester log oboe atomic)
 target_link_options(oboetester PRIVATE "-Wl,-z,max-page-size=16384")
-
diff --git a/apps/fxlab/app/CMakeLists.txt b/apps/fxlab/app/CMakeLists.txt
index 4c7c02d7e..6f6086892 100644
--- a/apps/fxlab/app/CMakeLists.txt
+++ b/apps/fxlab/app/CMakeLists.txt
@@ -76,4 +76,4 @@ target_link_libraries( # Specifies the target library.
         # Links the target library to the log library
         # included in the NDK.
         ${log-lib})
-
+target_link_options(native-lib PRIVATE "-Wl,-z,max-page-size=16384")
diff --git a/apps/fxlab/app/build.gradle b/apps/fxlab/app/build.gradle
index 52c34d813..680e6fe03 100644
--- a/apps/fxlab/app/build.gradle
+++ b/apps/fxlab/app/build.gradle
@@ -18,15 +18,13 @@ apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
 
-apply plugin: 'kotlin-android-extensions'
-
 apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 34
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     defaultConfig {
         applicationId "com.mobileer.androidfxlab"
@@ -45,12 +43,12 @@ android {
     externalNativeBuild {
         cmake {
             path "./CMakeLists.txt"
-            version "3.10.2"
         }
     }
     dataBinding {
         enabled = true
     }
+    namespace 'com.mobileer.androidfxlab'
 }
 
 dependencies {
diff --git a/apps/fxlab/app/src/main/AndroidManifest.xml b/apps/fxlab/app/src/main/AndroidManifest.xml
index 87375b4f7..4b91d528c 100644
--- a/apps/fxlab/app/src/main/AndroidManifest.xml
+++ b/apps/fxlab/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.mobileer.androidfxlab">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
             android:allowBackup="true"
diff --git a/apps/fxlab/app/src/main/cpp/native-lib.cpp b/apps/fxlab/app/src/main/cpp/native-lib.cpp
index 5ccdfb056..165de68ba 100644
--- a/apps/fxlab/app/src/main/cpp/native-lib.cpp
+++ b/apps/fxlab/app/src/main/cpp/native-lib.cpp
@@ -16,6 +16,7 @@
 
 #include <jni.h>
 
+#include <cassert>
 #include <string>
 #include <functional>
 #include <utility>
diff --git a/apps/fxlab/build.gradle b/apps/fxlab/build.gradle
index 228fb6be8..a67b14adf 100644
--- a/apps/fxlab/build.gradle
+++ b/apps/fxlab/build.gradle
@@ -17,14 +17,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.0'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         jcenter()
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/apps/fxlab/gradle.properties b/apps/fxlab/gradle.properties
index 5b3f78ef1..a2bb5f487 100644
--- a/apps/fxlab/gradle.properties
+++ b/apps/fxlab/gradle.properties
@@ -35,3 +35,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/apps/fxlab/gradle/wrapper/gradle-wrapper.properties b/apps/fxlab/gradle/wrapper/gradle-wrapper.properties
index 3bd6ace6f..5afb71ec6 100644
--- a/apps/fxlab/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/fxlab/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/samples/LiveEffect/build.gradle b/samples/LiveEffect/build.gradle
index 50fb09535..4638d5de1 100644
--- a/samples/LiveEffect/build.gradle
+++ b/samples/LiveEffect/build.gradle
@@ -29,6 +29,7 @@ android {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
+    namespace 'com.google.oboe.samples.liveEffect'
 }
 
 dependencies {
diff --git a/samples/LiveEffect/src/main/AndroidManifest.xml b/samples/LiveEffect/src/main/AndroidManifest.xml
index c55fa3057..93686306d 100644
--- a/samples/LiveEffect/src/main/AndroidManifest.xml
+++ b/samples/LiveEffect/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.oboe.samples.liveEffect" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.microphone" android:required="true" />
     <uses-feature android:name="android.hardware.audio.output" android:required="true" />
diff --git a/samples/LiveEffect/src/main/cpp/CMakeLists.txt b/samples/LiveEffect/src/main/cpp/CMakeLists.txt
index 4f16621c9..916edc0cf 100644
--- a/samples/LiveEffect/src/main/cpp/CMakeLists.txt
+++ b/samples/LiveEffect/src/main/cpp/CMakeLists.txt
@@ -38,6 +38,7 @@ target_link_libraries(liveEffect
         android
         atomic
         log)
+target_link_options(liveEffect PRIVATE "-Wl,-z,max-page-size=16384")
 
 # Enable optimization flags: if having problems with source level debugging,
 # disable -Ofast ( and debug ), re-enable it after done debugging.
diff --git a/samples/MegaDrone/build.gradle b/samples/MegaDrone/build.gradle
index 1096b1116..0bb8460f0 100644
--- a/samples/MegaDrone/build.gradle
+++ b/samples/MegaDrone/build.gradle
@@ -38,6 +38,7 @@ android {
             path "src/main/cpp/CMakeLists.txt"
         }
     }
+    namespace 'com.google.oboe.samples.megadrone'
 }
 
 dependencies {
diff --git a/samples/MegaDrone/src/main/AndroidManifest.xml b/samples/MegaDrone/src/main/AndroidManifest.xml
index d47eefef8..f89313dc7 100644
--- a/samples/MegaDrone/src/main/AndroidManifest.xml
+++ b/samples/MegaDrone/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.oboe.samples.megadrone">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/samples/MegaDrone/src/main/cpp/CMakeLists.txt b/samples/MegaDrone/src/main/cpp/CMakeLists.txt
index ca6c2b390..658eb076d 100644
--- a/samples/MegaDrone/src/main/cpp/CMakeLists.txt
+++ b/samples/MegaDrone/src/main/cpp/CMakeLists.txt
@@ -21,7 +21,8 @@ add_library( megadrone SHARED
         MegaDroneEngine.cpp
         )
 
-target_link_libraries( megadrone log oboe )
+target_link_libraries(megadrone log oboe )
+target_link_options(megadrone PRIVATE "-Wl,-z,max-page-size=16384")
 
 # Enable optimization flags: if having problems with source level debugging,
 # disable -Ofast ( and debug ), re-enable it after done debugging.
diff --git a/samples/RhythmGame/CMakeLists.txt b/samples/RhythmGame/CMakeLists.txt
index 7197c92bf..74fd746d4 100644
--- a/samples/RhythmGame/CMakeLists.txt
+++ b/samples/RhythmGame/CMakeLists.txt
@@ -60,8 +60,8 @@ else()
     set (TARGET_LIBS ${TARGET_LIBS} mediandk)
 endif()
 
-target_link_libraries( native-lib ${TARGET_LIBS} )
-
+target_link_libraries(native-lib ${TARGET_LIBS} )
+target_link_options(native-lib PRIVATE "-Wl,-z,max-page-size=16384")
 
 # Set the path to the Oboe directory.
 set (OBOE_DIR ../..)
diff --git a/samples/RhythmGame/build.gradle b/samples/RhythmGame/build.gradle
index c453fcb58..e4497099b 100644
--- a/samples/RhythmGame/build.gradle
+++ b/samples/RhythmGame/build.gradle
@@ -59,6 +59,7 @@ android {
         }
         */
     }
+    namespace 'com.google.oboe.samples.rhythmgame'
 }
 
 dependencies {
diff --git a/samples/RhythmGame/src/main/AndroidManifest.xml b/samples/RhythmGame/src/main/AndroidManifest.xml
index 4798cc2e0..36840c667 100644
--- a/samples/RhythmGame/src/main/AndroidManifest.xml
+++ b/samples/RhythmGame/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.oboe.samples.rhythmgame">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/samples/SoundBoard/build.gradle b/samples/SoundBoard/build.gradle
index fdfe8a72b..63787647c 100644
--- a/samples/SoundBoard/build.gradle
+++ b/samples/SoundBoard/build.gradle
@@ -44,6 +44,7 @@ android {
             path "src/main/cpp/CMakeLists.txt"
         }
     }
+    namespace 'com.google.oboe.samples.soundboard'
 }
 
 dependencies {
diff --git a/samples/SoundBoard/src/main/AndroidManifest.xml b/samples/SoundBoard/src/main/AndroidManifest.xml
index 707b32a31..bd480402d 100644
--- a/samples/SoundBoard/src/main/AndroidManifest.xml
+++ b/samples/SoundBoard/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.oboe.samples.soundboard">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/samples/SoundBoard/src/main/cpp/CMakeLists.txt b/samples/SoundBoard/src/main/cpp/CMakeLists.txt
index cf5ef3cd6..6e997e557 100644
--- a/samples/SoundBoard/src/main/cpp/CMakeLists.txt
+++ b/samples/SoundBoard/src/main/cpp/CMakeLists.txt
@@ -21,7 +21,8 @@ add_library( soundboard SHARED
         SoundBoardEngine.cpp
         )
 
-target_link_libraries( soundboard log oboe )
+target_link_libraries(soundboard log oboe )
+target_link_options(soundboard PRIVATE "-Wl,-z,max-page-size=16384")
 
 # Enable optimization flags: if having problems with source level debugging,
 # disable -Ofast ( and debug ), re-enable it after done debugging.
diff --git a/samples/audio-device/build.gradle b/samples/audio-device/build.gradle
index 320888bf2..3b2571d12 100644
--- a/samples/audio-device/build.gradle
+++ b/samples/audio-device/build.gradle
@@ -12,6 +12,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
     }
+    namespace 'com.google.oboe.samples.audio_device'
 }
 
 dependencies {
diff --git a/samples/audio-device/src/main/AndroidManifest.xml b/samples/audio-device/src/main/AndroidManifest.xml
index fb04a53e6..bdae66c8f 100644
--- a/samples/audio-device/src/main/AndroidManifest.xml
+++ b/samples/audio-device/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
-<manifest package="com.google.oboe.samples.audio_device">
+<manifest>
 </manifest>
diff --git a/samples/build.gradle b/samples/build.gradle
index 6b8dbbf97..50ee56334 100644
--- a/samples/build.gradle
+++ b/samples/build.gradle
@@ -28,7 +28,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files.
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
diff --git a/samples/drumthumper/build.gradle b/samples/drumthumper/build.gradle
index 7a19c632d..adaf0f646 100644
--- a/samples/drumthumper/build.gradle
+++ b/samples/drumthumper/build.gradle
@@ -32,6 +32,7 @@ android {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
+    namespace 'com.plausiblesoftware.drumthumper'
 }
 
 dependencies {
diff --git a/samples/drumthumper/src/main/AndroidManifest.xml b/samples/drumthumper/src/main/AndroidManifest.xml
index ea4c376c8..e7d59e0a9 100644
--- a/samples/drumthumper/src/main/AndroidManifest.xml
+++ b/samples/drumthumper/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.plausiblesoftware.drumthumper">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/samples/drumthumper/src/main/cpp/CMakeLists.txt b/samples/drumthumper/src/main/cpp/CMakeLists.txt
index 9d2250ac2..75fe8652d 100644
--- a/samples/drumthumper/src/main/cpp/CMakeLists.txt
+++ b/samples/drumthumper/src/main/cpp/CMakeLists.txt
@@ -71,3 +71,4 @@ target_link_libraries( # Specifies the target library.
         # Links the target library to the log library
         # included in the NDK.
         log)
+target_link_options(drumthumper PRIVATE "-Wl,-z,max-page-size=16384")
diff --git a/samples/gradle.properties b/samples/gradle.properties
index d8e5383d5..f139b6035 100644
--- a/samples/gradle.properties
+++ b/samples/gradle.properties
@@ -33,5 +33,8 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
diff --git a/samples/gradle/wrapper/gradle-wrapper.properties b/samples/gradle/wrapper/gradle-wrapper.properties
index efcdb875c..5c3c5600f 100644
--- a/samples/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/samples/hello-oboe/build.gradle b/samples/hello-oboe/build.gradle
index 59b0b188a..e64034d0e 100644
--- a/samples/hello-oboe/build.gradle
+++ b/samples/hello-oboe/build.gradle
@@ -30,6 +30,7 @@ android {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
+    namespace 'com.google.oboe.samples.hellooboe'
 }
 
 dependencies {
diff --git a/samples/hello-oboe/src/main/AndroidManifest.xml b/samples/hello-oboe/src/main/AndroidManifest.xml
index 593873e6c..84b5c0a8e 100644
--- a/samples/hello-oboe/src/main/AndroidManifest.xml
+++ b/samples/hello-oboe/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.oboe.samples.hellooboe" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.audio.output" android:required="true" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
diff --git a/samples/hello-oboe/src/main/cpp/CMakeLists.txt b/samples/hello-oboe/src/main/cpp/CMakeLists.txt
index 77e898e1e..48fc94ef5 100644
--- a/samples/hello-oboe/src/main/cpp/CMakeLists.txt
+++ b/samples/hello-oboe/src/main/cpp/CMakeLists.txt
@@ -53,6 +53,7 @@ add_library(hello-oboe SHARED
 
 # Specify the libraries needed for hello-oboe
 target_link_libraries(hello-oboe android log oboe)
+target_link_options(hello-oboe PRIVATE "-Wl,-z,max-page-size=16384")
 
 # Enable optimization flags: if having problems with source level debugging,
 # disable -Ofast ( and debug ), re-enable after done debugging.
diff --git a/samples/iolib/build.gradle b/samples/iolib/build.gradle
index 266c97892..21452ab13 100644
--- a/samples/iolib/build.gradle
+++ b/samples/iolib/build.gradle
@@ -23,6 +23,7 @@ android {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
+    namespace 'com.google.oboe.samples.iolib'
 }
 
 dependencies {
diff --git a/samples/iolib/src/main/AndroidManifest.xml b/samples/iolib/src/main/AndroidManifest.xml
index 0e0c7eda5..94cbbcfc3 100644
--- a/samples/iolib/src/main/AndroidManifest.xml
+++ b/samples/iolib/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.oboe.samples.iolib" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/samples/minimaloboe/build.gradle b/samples/minimaloboe/build.gradle
index bf03f7899..725c90e3e 100644
--- a/samples/minimaloboe/build.gradle
+++ b/samples/minimaloboe/build.gradle
@@ -49,6 +49,7 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    namespace 'com.example.minimaloboe'
 }
 
 dependencies {
diff --git a/samples/minimaloboe/src/main/AndroidManifest.xml b/samples/minimaloboe/src/main/AndroidManifest.xml
index 25d9e02c3..6ec83897e 100644
--- a/samples/minimaloboe/src/main/AndroidManifest.xml
+++ b/samples/minimaloboe/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.minimaloboe">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/samples/minimaloboe/src/main/cpp/CMakeLists.txt b/samples/minimaloboe/src/main/cpp/CMakeLists.txt
index 045ff5c5e..027b27bce 100644
--- a/samples/minimaloboe/src/main/cpp/CMakeLists.txt
+++ b/samples/minimaloboe/src/main/cpp/CMakeLists.txt
@@ -50,3 +50,4 @@ target_link_libraries( # Specifies the target library.
         # Links the target library to the log library
         # included in the NDK.
         log)
+target_link_options(minimaloboe PRIVATE "-Wl,-z,max-page-size=16384")
diff --git a/samples/parselib/build.gradle b/samples/parselib/build.gradle
index c593a5deb..05da315d2 100644
--- a/samples/parselib/build.gradle
+++ b/samples/parselib/build.gradle
@@ -22,6 +22,7 @@ android {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
+    namespace 'com.google.oboe.samples'
 }
 
 dependencies {
diff --git a/samples/parselib/src/main/AndroidManifest.xml b/samples/parselib/src/main/AndroidManifest.xml
index 009cab7de..94cbbcfc3 100644
--- a/samples/parselib/src/main/AndroidManifest.xml
+++ b/samples/parselib/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.oboe.samples" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c2d9cffd8..7fb9e5339 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -44,3 +44,4 @@ add_executable(
         )
 
 target_link_libraries(testOboe gtest oboe)
+target_link_options(testOboe PRIVATE "-Wl,-z,max-page-size=16384")
diff --git a/tests/UnitTestRunner/app/build.gradle b/tests/UnitTestRunner/app/build.gradle
index 58bf4aaa8..ae2c31661 100644
--- a/tests/UnitTestRunner/app/build.gradle
+++ b/tests/UnitTestRunner/app/build.gradle
@@ -20,6 +20,7 @@ android {
             path file('../../CMakeLists.txt')
         }
     }
+    namespace 'com.google.oboe.tests.unittestrunner'
 }
 
 dependencies {
diff --git a/tests/UnitTestRunner/app/src/main/AndroidManifest.xml b/tests/UnitTestRunner/app/src/main/AndroidManifest.xml
index aad3df6be..97453e311 100644
--- a/tests/UnitTestRunner/app/src/main/AndroidManifest.xml
+++ b/tests/UnitTestRunner/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.oboe.tests.unittestrunner">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <application
diff --git a/tests/UnitTestRunner/build.gradle b/tests/UnitTestRunner/build.gradle
index 98a6f28d6..4ce39f69a 100644
--- a/tests/UnitTestRunner/build.gradle
+++ b/tests/UnitTestRunner/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.5.1'
     }
 }
 
diff --git a/tests/UnitTestRunner/gradle.properties b/tests/UnitTestRunner/gradle.properties
index c73d2393b..ce7a7fc13 100644
--- a/tests/UnitTestRunner/gradle.properties
+++ b/tests/UnitTestRunner/gradle.properties
@@ -17,3 +17,6 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/tests/UnitTestRunner/gradle/wrapper/gradle-wrapper.properties b/tests/UnitTestRunner/gradle/wrapper/gradle-wrapper.properties
index 1f10e877d..528aad21e 100644
--- a/tests/UnitTestRunner/gradle/wrapper/gradle-wrapper.properties
+++ b/tests/UnitTestRunner/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip