Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions auth0/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,19 @@ version = getVersionFromFile()
logger.lifecycle("Using version ${version} for ${name}")

android {
compileSdkVersion 34
compileSdk 35

defaultConfig {
minSdkVersion 21
targetSdkVersion 34
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"
}
Expand All @@ -61,11 +63,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = JavaVersion.VERSION_11.toString()
freeCompilerArgs += [
'-Xexplicit-api=strict', // or '-Xexplicit-api=warning'
]
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ plugins {
}

android {
compileSdkVersion 34
compileSdkVersion 35

defaultConfig {
minSdkVersion 21
targetSdkVersion 34
minSdkVersion 24
targetSdkVersion 35
versionCode 1
versionName "1.0"

Expand Down