Skip to content

Commit 42200c6

Browse files
authored
Updated compile and target sdk version to 35 (#799)
2 parents b9bfe0a + 1740f31 commit 42200c6

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

auth0/build.gradle

+7-5
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,19 @@ version = getVersionFromFile()
3434
logger.lifecycle("Using version ${version} for ${name}")
3535

3636
android {
37-
compileSdkVersion 34
37+
compileSdk 35
3838

3939
defaultConfig {
4040
minSdkVersion 21
41-
targetSdkVersion 34
41+
targetSdk 35
4242
versionCode 1
4343
versionName project.version
4444

4545
buildConfigField "String", "LIBRARY_NAME", "\"$project.rootProject.name\""
4646
buildConfigField "String", "VERSION_NAME", "\"${project.version}\""
4747

48+
manifestPlaceholders = [auth0Domain: '${auth0Domain}', auth0Scheme: '${auth0Scheme}']
49+
4850
consumerProguardFiles '../proguard/proguard-gson.pro', '../proguard/proguard-okio.pro', '../proguard/proguard-jetpack.pro'
4951
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
5052
}
@@ -61,11 +63,11 @@ android {
6163
}
6264
}
6365
compileOptions {
64-
sourceCompatibility JavaVersion.VERSION_1_8
65-
targetCompatibility JavaVersion.VERSION_1_8
66+
sourceCompatibility JavaVersion.VERSION_11
67+
targetCompatibility JavaVersion.VERSION_11
6668
}
6769
kotlinOptions {
68-
jvmTarget = '1.8'
70+
jvmTarget = JavaVersion.VERSION_11.toString()
6971
freeCompilerArgs += [
7072
'-Xexplicit-api=strict', // or '-Xexplicit-api=warning'
7173
]

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
}
1414
}
1515
dependencies {
16-
classpath 'com.android.tools.build:gradle:4.2.2'
16+
classpath 'com.android.tools.build:gradle:7.4.0'
1717
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1818
classpath "org.jacoco:org.jacoco.core:0.8.5"
1919
}

gradle.properties

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@ android.useAndroidX=true
2424
# Automatically convert third-party libraries to use AndroidX
2525
android.enableJetifier=false
2626
# Kotlin code style for this project: "official" or "obsolete":
27-
kotlin.code.style=official
27+
kotlin.code.style=official
28+
29+
# Adding this here temporarily to fix the build with compileSdKVersion 35. Remove this when migrate to gradle 8
30+
android.aapt2Version=8.6.1-11315950
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

sample/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44
}
55

66
android {
7-
compileSdkVersion 34
7+
compileSdkVersion 35
88

99
defaultConfig {
10-
minSdkVersion 21
11-
targetSdkVersion 34
10+
minSdkVersion 24
11+
targetSdkVersion 35
1212
versionCode 1
1313
versionName "1.0"
1414

0 commit comments

Comments
 (0)