From 3c02543361d34b81fffc7f1b8a21cdfbd8ec9e3e Mon Sep 17 00:00:00 2001
From: Prince Mathew <prince.mathew@okta.com>
Date: Mon, 10 Feb 2025 16:40:54 +0530
Subject: [PATCH 1/3] Updated compile and target sdk version to 35

---
 auth0/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/auth0/build.gradle b/auth0/build.gradle
index 454560ae8..0e15bf16d 100644
--- a/auth0/build.gradle
+++ b/auth0/build.gradle
@@ -34,11 +34,11 @@ version = getVersionFromFile()
 logger.lifecycle("Using version ${version} for ${name}")
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 35
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName project.version
 

From 4cd5424392247387159f6bd8458220b155247f1b Mon Sep 17 00:00:00 2001
From: Prince Mathew <prince.mathew@okta.com>
Date: Wed, 12 Feb 2025 18:27:01 +0530
Subject: [PATCH 2/3] Fixed the build issue failing after updation

---
 auth0/build.gradle                       | 10 ++++++----
 build.gradle                             |  2 +-
 gradle.properties                        |  5 ++++-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 sample/build.gradle                      |  4 ++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/auth0/build.gradle b/auth0/build.gradle
index 0e15bf16d..7ed4f7bca 100644
--- a/auth0/build.gradle
+++ b/auth0/build.gradle
@@ -34,17 +34,19 @@ version = getVersionFromFile()
 logger.lifecycle("Using version ${version} for ${name}")
 
 android {
-    compileSdkVersion 35
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdk 35
         versionCode 1
         versionName project.version
 
         buildConfigField "String", "LIBRARY_NAME", "\"$project.rootProject.name\""
         buildConfigField "String", "VERSION_NAME", "\"${project.version}\""
 
+        manifestPlaceholders = [auth0Domain: '${auth0Domain}', auth0Scheme: '${auth0Scheme}']
+
         consumerProguardFiles '../proguard/proguard-gson.pro', '../proguard/proguard-okio.pro', '../proguard/proguard-jetpack.pro'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -61,8 +63,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/build.gradle b/build.gradle
index d432f1c96..0fa5d020b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jacoco:org.jacoco.core:0.8.5"
     }
diff --git a/gradle.properties b/gradle.properties
index 7dd5d5718..0dda7285b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+
+# Adding this here temporarily to fix the build with compileSdKVersion 35. Remove this when migrate to gradle 8
+android.aapt2Version=8.6.1-11315950
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 669386b87..2ec77e51a 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.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/build.gradle b/sample/build.gradle
index bce846c70..cb5773df2 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 35
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 

From 1740f31236b75c6b940e131f352201dd41d13abd Mon Sep 17 00:00:00 2001
From: Prince Mathew <prince.mathew@okta.com>
Date: Wed, 12 Feb 2025 23:59:59 +0530
Subject: [PATCH 3/3] Minor change in the sample app gradle file

---
 auth0/build.gradle  | 2 +-
 sample/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/auth0/build.gradle b/auth0/build.gradle
index 7ed4f7bca..e3b5cae26 100644
--- a/auth0/build.gradle
+++ b/auth0/build.gradle
@@ -67,7 +67,7 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_11.toString()
         freeCompilerArgs += [
                 '-Xexplicit-api=strict', // or '-Xexplicit-api=warning'
         ]
diff --git a/sample/build.gradle b/sample/build.gradle
index cb5773df2..530d63778 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -7,7 +7,7 @@ android {
     compileSdkVersion 35
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 35
         versionCode 1
         versionName "1.0"