diff --git a/auth-lib/build.gradle.kts b/auth-lib/build.gradle.kts
index 3a0842b6..cdda0263 100644
--- a/auth-lib/build.gradle.kts
+++ b/auth-lib/build.gradle.kts
@@ -41,12 +41,20 @@ val archivesBaseName = "auth"
 
 android {
     compileSdk = 33
-    buildToolsVersion = "33.0.0"
 
     buildFeatures {
         buildConfig = true
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
     defaultConfig {
         minSdk = 16
         targetSdk = 33
diff --git a/auth-sample/build.gradle.kts b/auth-sample/build.gradle.kts
index 86d48675..73bdf866 100644
--- a/auth-sample/build.gradle.kts
+++ b/auth-sample/build.gradle.kts
@@ -26,8 +26,16 @@ plugins {
 }
 
 android {
-    compileSdk = 33
-    buildToolsVersion = "33.0.0"
+    compileSdk = 36
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 
     signingConfigs {
         getByName("debug") {
@@ -40,8 +48,8 @@ android {
 
     defaultConfig {
         applicationId = "com.spotify.sdk.android.authentication.sample"
-        minSdk = 16
-        targetSdk = 33
+        minSdk = 21
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 0e81e505..77d4d8cb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,7 +27,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("com.android.tools.build:gradle:8.9.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c684..81aa1c04 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists