diff --git a/Examples/OneSignalDemo/app/build.gradle b/Examples/OneSignalDemo/app/build.gradle
index ec2432997e..1256f547ae 100644
--- a/Examples/OneSignalDemo/app/build.gradle
+++ b/Examples/OneSignalDemo/app/build.gradle
@@ -3,9 +3,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
+    namespace = "com.onesignal.sdktest"
+
+    buildFeatures {
+        buildConfig = true
+    }
+
+    compileSdkVersion 35
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 34
         versionCode 1
         versionName "1.0"
@@ -50,16 +56,13 @@ android {
         }
     }
 
-    // Forced downgrade to Java 1.8 for compiling the application due to Android N error when building
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     packagingOptions {
-        exclude 'androidsupportmultidexversion.txt'
+        resources {
+            excludes += ['androidsupportmultidexversion.txt']
+        }
     }
 
+
     task flavorSelection() {
         if (getGradle().getStartParameter().getTaskRequests().toString().contains("Gms")) {
             apply plugin: 'com.google.gms.google-services'
@@ -71,14 +74,14 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0"
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
 
-    implementation 'com.google.android.material:material:1.7.0'
-    implementation 'com.google.android.gms:play-services-location:21.0.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'com.google.android.gms:play-services-location:21.3.0'
 
     implementation 'com.github.bumptech.glide:glide:4.12.0'
 
diff --git a/Examples/OneSignalDemo/build.gradle b/Examples/OneSignalDemo/build.gradle
index 4ec0efa17f..5062d2de8d 100644
--- a/Examples/OneSignalDemo/build.gradle
+++ b/Examples/OneSignalDemo/build.gradle
@@ -1,9 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext {
-        kotlinVersion = '1.7.10'
-    }
     repositories {
         google()
         mavenCentral()
@@ -12,8 +9,8 @@ buildscript {
         maven { url 'https://developer.huawei.com/repo/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.android.tools.build:gradle:8.9.1'
+        classpath 'com.google.gms:google-services:4.4.2'
         classpath 'com.huawei.agconnect:agcp:1.6.2.300'
         
         // TODO: Do not place your application dependencies here; they belong
@@ -28,8 +25,4 @@ allprojects {
         // Huawei maven
         maven { url 'https://developer.huawei.com/repo/' }
     }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+}
\ No newline at end of file
diff --git a/Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.properties b/Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.properties
index 669386b870..da9f5718da 100644
--- a/Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.properties
+++ b/Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Mar 26 09:51:07 PDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Examples/OneSignalDemo/local.properties b/Examples/OneSignalDemo/local.properties
index 7272adae12..5ce47eb573 100644
--- a/Examples/OneSignalDemo/local.properties
+++ b/Examples/OneSignalDemo/local.properties
@@ -4,6 +4,6 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Jul 23 19:22:28 PDT 2019
+#Wed Mar 26 09:47:42 PDT 2025
 ndk.dir=/Users/mikechoch/Library/Android/sdk/ndk-bundle
-sdk.dir=/Users/mikechoch/Library/Android/sdk
+sdk.dir=/Users/emory/Library/Android/sdk
diff --git a/OneSignalSDK/gradle/wrapper/gradle-wrapper.properties b/OneSignalSDK/gradle/wrapper/gradle-wrapper.properties
index 669386b870..2e6e5897b5 100644
--- a/OneSignalSDK/gradle/wrapper/gradle-wrapper.properties
+++ b/OneSignalSDK/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists