diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml
index d0542f3ce..5dd53ffdb 100644
--- a/.github/workflows/functional-test.yml
+++ b/.github/workflows/functional-test.yml
@@ -51,7 +51,7 @@ jobs:
     - uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '22'
     - name: Setup Android SDK
       uses: android-actions/setup-android@v3
     - run: npm install --no-package-lock
diff --git a/.github/workflows/publish.js.yml b/.github/workflows/publish.js.yml
index d54965fa0..dc566061d 100644
--- a/.github/workflows/publish.js.yml
+++ b/.github/workflows/publish.js.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        java-version: '17'
+        java-version: '22'
         distribution: 'temurin'
         cache: gradle
     - run: npm install --no-package-lock
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 4b3de4f17..9601c9121 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -40,7 +40,7 @@ jobs:
     - uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '22'
     - run: npm install --no-package-lock
       name: Install dev dependencies
     - run: npm run lint:java
diff --git a/app/build.gradle b/app/build.gradle
index 62f35005a..fdb99a497 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -108,6 +108,7 @@ dependencies {
     testImplementation 'org.powermock:powermock-module-junit4-rule:2.0.9'
     testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
     testImplementation 'org.robolectric:robolectric:4.13'
+    testImplementation 'org.javassist:javassist:3.30.2-GA'
     androidTestImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'com.squareup.okhttp:okhttp:2.7.5'
diff --git a/build.gradle b/build.gradle
index 76c367968..76b6d511d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.android.tools.build:gradle:8.7.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 06df79349..c6dd1d2f2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip