gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2069 from nextcloud/chore/noid/compileSdk31

Browse Source 
Bump compile to sdk31, format build script
This commit is contained in:
Andy Scherzinger 2022-05-19 10:23:27 +02:00 committed by GitHub
commit 0688211d35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@ -35,7 +35,7 @@ apply plugin: 'io.gitlab.arturbosch.detekt'
apply plugin: "org.jlleitschuh.gradle.ktlint" apply plugin: "org.jlleitschuh.gradle.ktlint"
android { android {
compileSdkVersion 30 compileSdkVersion 31
buildToolsVersion '32.0.0' buildToolsVersion '32.0.0'
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
@ -91,6 +91,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
packagingOptions { packagingOptions {
resources { resources {
excludes += [ excludes += [
@ -104,7 +105,6 @@ android {
} }
} }
android.applicationVariants.all { variant -> android.applicationVariants.all { variant ->
String variantName = variant.name String variantName = variant.name
String capVariantName = variantName.substring(0, 1).toUpperCase(Locale.ROOT) + variantName.substring(1) String capVariantName = variantName.substring(0, 1).toUpperCase(Locale.ROOT) + variantName.substring(1)
@ -132,10 +132,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
buildFeatures { buildFeatures {
viewBinding true viewBinding true
} }
lint { lint {
abortOnError false abortOnError false
disable 'MissingTranslation' disable 'MissingTranslation'
@ -162,6 +162,7 @@ def webRtcVersion = "96.4664.0"
tasks.register('downloadWebRtc', DownloadWebRtcTask){ tasks.register('downloadWebRtc', DownloadWebRtcTask){
version = webRtcVersion version = webRtcVersion
} }
preBuild.dependsOn('downloadWebRtc') preBuild.dependsOn('downloadWebRtc')
configurations.all { configurations.all {
@ -198,7 +199,6 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.biometric:biometric:1.1.0' implementation 'androidx.biometric:biometric:1.1.0'
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
@ -296,10 +296,8 @@ dependencies {
testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}" testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
androidTestImplementation "androidx.test:core:1.4.0" androidTestImplementation "androidx.test:core:1.4.0"
// Espresso core // Espresso core
androidTestImplementation ("androidx.test.espresso:espresso-core:$espressoVersion", { androidTestImplementation ("androidx.test.espresso:espresso-core:$espressoVersion", {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'