diff --git a/build.gradle b/build.gradle
index b89fb89..b062b47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,9 @@
-buildscript {
-    ext {
-        compose_ui_version = '1.5.0'
-    }
-}
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias libs.plugins.androidApplication apply false
     alias libs.plugins.androidLibrary apply false
     alias libs.plugins.kotlinAndroid apply false
+    alias libs.plugins.composeCompiler apply false
     alias libs.plugins.dokka apply false
     alias libs.plugins.mavenPublish apply false
 
diff --git a/dev-app/build.gradle b/dev-app/build.gradle
index 98ddb78..b5adc00 100644
--- a/dev-app/build.gradle
+++ b/dev-app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     alias libs.plugins.androidApplication
     alias libs.plugins.kotlinAndroid
+    alias libs.plugins.composeCompiler
 }
 
 apply from:  rootProject.file("$rootDir/common.gradle")
@@ -31,15 +32,15 @@ android {
         compose true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.12'
-    }
-
     lint {
         disable 'GradleDependency'
     }
 }
 
+composeCompiler {
+    enableStrongSkippingMode = true
+}
+
 dependencies {
     implementation project(path: ':sdk')
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 889da88..e0d2b43 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
 agp = "8.4.1"
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 core-ktx = "1.13.1"
 junit = "4.13.2"
-appcompat = "1.6.1"
+appcompat = "1.7.0"
 coroutines-version = "1.8.1"
 compose = "1.9.0"
 compose-bom = "2024.05.00"
@@ -48,6 +48,7 @@ mockito-inline = { group = "org.mockito", name = "mockito-inline", version = "4.
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.28.0" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23..a441313 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4..b740cf1 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
diff --git a/sdk/src/test/java/com/uid2/UID2ManagerTest.kt b/sdk/src/test/java/com/uid2/UID2ManagerTest.kt
index 3a636b3..b2843d9 100644
--- a/sdk/src/test/java/com/uid2/UID2ManagerTest.kt
+++ b/sdk/src/test/java/com/uid2/UID2ManagerTest.kt
@@ -76,6 +76,10 @@ class UID2ManagerTest {
             it.arguments[0] as IdentityRequest.Phone
         }
 
+        whenever(storageManager.clear()).thenReturn(true)
+        whenever(
+            storageManager.saveIdentity(any(UID2Identity::class.java), any(IdentityStatus::class.java)),
+        ).thenReturn(true)
         whenever(storageManager.loadIdentity()).thenReturn(Pair(initialIdentity, initialStatus))
         manager = withManager(client, storageManager, timeUtils, inputUtils, testDispatcher, false, listener)
     }