From 979384de31510d05a1a0193b9ba097c7458740f2 Mon Sep 17 00:00:00 2001
From: Fei Chen <fei.chen@okta.com>
Date: Fri, 5 Jun 2026 13:06:11 -0700
Subject: [PATCH] Update AGP and gradle

---
 android/build.gradle                          | 23 ++++++++++---------
 android/gradle.properties                     |  1 -
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index df85505c..457e6795 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -22,7 +22,7 @@ buildscript {
     }
 
     dependencies {
-        classpath('com.android.tools.build:gradle:8.4.1')
+        classpath('com.android.tools.build:gradle:9.2.1')
     }
 }
 
@@ -69,7 +69,7 @@ allprojects {
 }
 
 dependencies {
-    implementation "com.facebook.react:react-android:+"
+    implementation "com.facebook.react:react-android:0.80.0"
     implementation 'com.okta.android:okta-oidc-android:1.3.4'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okio:okio:3.5.0'
@@ -105,15 +105,6 @@ afterEvaluate { project ->
         include '**/*.java'
     }
 
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        def javaCompileTask = variant.javaCompileProvider.get()
-
-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
-            from javaCompileTask.destinationDir
-        }
-    }
-
     artifacts {
         archives androidSourcesJar
     }
@@ -126,3 +117,13 @@ afterEvaluate { project ->
         }
     }
 }
+
+androidComponents {
+    onVariants(selector().all()) { variant ->
+        def name = variant.name.capitalize()
+        tasks.register("jar${name}", Jar) {
+            dependsOn("compile${name}JavaWithJavac")
+            from(tasks.named("compile${name}JavaWithJavac").flatMap { it.destinationDirectory })
+        }
+    }
+}
diff --git a/android/gradle.properties b/android/gradle.properties
index cbab9d96..c3c71a8d 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -16,4 +16,3 @@ org.gradle.jvmargs=-Xmx2048m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index d9fbee2e..317a32cf 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/e2e/android/gradle/wrapper/gradle-wrapper.properties b/e2e/android/gradle/wrapper/gradle-wrapper.properties
index 79eb9d00..70fe02a5 100644
--- a/e2e/android/gradle/wrapper/gradle-wrapper.properties
+++ b/e2e/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME