diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 454162f4..766ba8f2 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        api-level: [21, 25, 26, 29]
+        api-level: [24, 25, 26, 29]
     steps:
       - name: checkout
         uses: actions/checkout@v2
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7ce850e5..053b9429 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Thu Jan 28 11:38:35 PST 2021
+#Fri Jan 03 20:03:08 BDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 org.gradle.jvmargs=-Xmx1g
+zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
diff --git a/odp/build.gradle b/odp/build.gradle
index 4550d5d7..ac2e6b58 100644
--- a/odp/build.gradle
+++ b/odp/build.gradle
@@ -46,9 +46,8 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
     buildToolsVersion build_tools_version
-
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt b/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt
index f95f7e27..8918f8a3 100644
--- a/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt
+++ b/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt
@@ -20,7 +20,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mockito.*
+import org.mockito.Mockito.mock
 import org.mockito.Mockito.verify
 
 @RunWith(AndroidJUnit4::class)