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