diff --git a/annotation/compiler/test/build.gradle b/annotation/compiler/test/build.gradle index 57c49bcf48..f9f56e703a 100644 --- a/annotation/compiler/test/build.gradle +++ b/annotation/compiler/test/build.gradle @@ -27,11 +27,11 @@ afterEvaluate { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String } diff --git a/benchmark/build.gradle b/benchmark/build.gradle index aa3bd001ea..b9938fa0dc 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - compileSdkVersion 30 + compileSdk 30 buildToolsVersion "30.0.3" compileOptions { @@ -13,8 +13,8 @@ android { } defaultConfig { - minSdkVersion 19 - targetSdkVersion 30 + minSdk 19 + targetSdk 30 versionCode 1 versionName "1.0" diff --git a/build.gradle b/build.gradle index dbe07d1a10..9d11d66701 100644 --- a/build.gradle +++ b/build.gradle @@ -134,7 +134,7 @@ subprojects { project -> if (project.hasProperty("android") && project.name != 'pmd' ) { android { - lintOptions { + lint { warningsAsErrors true quiet true // Caught by the violations plugin. diff --git a/glide/build.gradle b/glide/build.gradle index ec28bd51d7..5196cff87d 100644 --- a/glide/build.gradle +++ b/glide/build.gradle @@ -35,8 +35,8 @@ def getAndroidSdkDirectory() { project(':library').android.sdkDirectory } -def getAndroidCompileSdkVersion() { - project(':library').android.compileSdkVersion +def getAndroidCompileSdk() { + project(':library').android.compileSdk } def getAndroidProjectsForJavadoc() { @@ -58,7 +58,7 @@ def getSourceFilesForJavadoc() { } def getAndroidJar() { - "${getAndroidSdkDirectory()}/platforms/${getAndroidCompileSdkVersion()}/android.jar" + "${getAndroidSdkDirectory()}/platforms/${getAndroidCompileSdk()}/android.jar" } project.archivesBaseName = "${POM_ARTIFACT_ID}-${VERSION_NAME}" diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle index b6d8d50359..00bf8c3686 100644 --- a/instrumentation/build.gradle +++ b/instrumentation/build.gradle @@ -26,12 +26,12 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { applicationId 'com.bumptech.glide.instrumentation' - minSdkVersion 16 as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk 16 as int + targetSdk TARGET_SDK_VERSION as int versionCode 1 versionName '1.0' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/integration/avif/build.gradle b/integration/avif/build.gradle index 2463bba2ee..ec372f9e96 100644 --- a/integration/avif/build.gradle +++ b/integration/avif/build.gradle @@ -9,11 +9,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String } diff --git a/integration/concurrent/build.gradle b/integration/concurrent/build.gradle index 749aad7820..fbcf2118ca 100644 --- a/integration/concurrent/build.gradle +++ b/integration/concurrent/build.gradle @@ -14,11 +14,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName = VERSION_NAME as String } diff --git a/integration/cronet/build.gradle b/integration/cronet/build.gradle index 18356936b1..4ae86036e5 100644 --- a/integration/cronet/build.gradle +++ b/integration/cronet/build.gradle @@ -15,11 +15,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion 16 as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk 16 as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String } diff --git a/integration/gifencoder/build.gradle b/integration/gifencoder/build.gradle index 4e578c13e9..ca9543beea 100644 --- a/integration/gifencoder/build.gradle +++ b/integration/gifencoder/build.gradle @@ -14,7 +14,7 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int sourceSets { main { @@ -23,8 +23,8 @@ android { } defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName = VERSION_NAME as String } diff --git a/integration/okhttp/build.gradle b/integration/okhttp/build.gradle index 6931cb0aec..2ad9df11fa 100644 --- a/integration/okhttp/build.gradle +++ b/integration/okhttp/build.gradle @@ -9,11 +9,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String } diff --git a/integration/okhttp3/build.gradle b/integration/okhttp3/build.gradle index a74c387b11..8d69f27b2b 100644 --- a/integration/okhttp3/build.gradle +++ b/integration/okhttp3/build.gradle @@ -9,11 +9,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String } diff --git a/integration/recyclerview/build.gradle b/integration/recyclerview/build.gradle index 37062c7166..3bb4ac4f25 100644 --- a/integration/recyclerview/build.gradle +++ b/integration/recyclerview/build.gradle @@ -7,11 +7,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String } diff --git a/integration/volley/build.gradle b/integration/volley/build.gradle index b1c883d255..d0a9c3febb 100644 --- a/integration/volley/build.gradle +++ b/integration/volley/build.gradle @@ -18,11 +18,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String } diff --git a/library/build.gradle b/library/build.gradle index 223a263795..8bbc1c7ee4 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -54,11 +54,11 @@ if (project.plugins.hasPlugin('net.ltgt.errorprone')) { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String consumerProguardFiles 'proguard-rules.txt' } diff --git a/library/test/build.gradle b/library/test/build.gradle index 3143e95dc2..1c8198616f 100644 --- a/library/test/build.gradle +++ b/library/test/build.gradle @@ -38,11 +38,11 @@ android.testOptions.unitTests.all { Test testTask -> } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String } diff --git a/mocks/build.gradle b/mocks/build.gradle index bdb62aec17..329b5581f5 100644 --- a/mocks/build.gradle +++ b/mocks/build.gradle @@ -8,11 +8,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName = VERSION_NAME as String } diff --git a/samples/contacturi/build.gradle b/samples/contacturi/build.gradle index 237fe294a5..b76fb33b58 100644 --- a/samples/contacturi/build.gradle +++ b/samples/contacturi/build.gradle @@ -7,12 +7,12 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { applicationId 'com.bumptech.glide.samples.contacturi' - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionCode 1 versionName '1.0' diff --git a/samples/flickr/build.gradle b/samples/flickr/build.gradle index 1e632c322f..ad61f941d7 100644 --- a/samples/flickr/build.gradle +++ b/samples/flickr/build.gradle @@ -13,12 +13,12 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { applicationId 'com.bumptech.glide.samples.flickr' - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionCode 1 versionName '1.0' diff --git a/samples/gallery/build.gradle b/samples/gallery/build.gradle index e0684293a6..778ce33558 100644 --- a/samples/gallery/build.gradle +++ b/samples/gallery/build.gradle @@ -28,12 +28,12 @@ kotlin { } android { - compileSdkVersion 32 + compileSdk 32 defaultConfig { applicationId 'com.bumptech.glide.samples.gallery' - minSdkVersion 29 - targetSdkVersion 32 + minSdk 29 + targetSdk 32 versionCode 1 versionName '1.0' } diff --git a/samples/giphy/build.gradle b/samples/giphy/build.gradle index 48fa531b54..0f6f3b3e14 100644 --- a/samples/giphy/build.gradle +++ b/samples/giphy/build.gradle @@ -12,12 +12,12 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { applicationId 'com.bumptech.glide.samples.giphy' - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionCode 1 versionName '1.0' } diff --git a/samples/imgur/build.gradle b/samples/imgur/build.gradle index 5a64a87b22..2f678528ef 100644 --- a/samples/imgur/build.gradle +++ b/samples/imgur/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { applicationId "com.bumptech.glide.samples.imgur" - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionCode 1 versionName "1.0" diff --git a/samples/svg/build.gradle b/samples/svg/build.gradle index 692663619a..0bf05d57c7 100644 --- a/samples/svg/build.gradle +++ b/samples/svg/build.gradle @@ -8,12 +8,12 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { applicationId 'com.bumptech.glide.samples.svg' - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionCode 1 versionName '1.0' diff --git a/scripts/upload.gradle b/scripts/upload.gradle index 1419a86c63..b87b00b36f 100644 --- a/scripts/upload.gradle +++ b/scripts/upload.gradle @@ -150,7 +150,7 @@ afterEvaluate { project -> def getAndroidSdkDirectory = project.android.sdkDirectory - def getAndroidJar = "${getAndroidSdkDirectory}/platforms/${project.android.compileSdkVersion}/android.jar" + def getAndroidJar = "${getAndroidSdkDirectory}/platforms/${project.android.compileSdk}/android.jar" task androidJavadocs(type: Javadoc, dependsOn: assembleDebug) { source = variants.collect { it.getJavaCompileProvider().get().source } diff --git a/testutil/build.gradle b/testutil/build.gradle index 46ac766fb4..7c5ea6591b 100644 --- a/testutil/build.gradle +++ b/testutil/build.gradle @@ -9,11 +9,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String } diff --git a/third_party/disklrucache/build.gradle b/third_party/disklrucache/build.gradle index a98a84db45..d868500f60 100644 --- a/third_party/disklrucache/build.gradle +++ b/third_party/disklrucache/build.gradle @@ -14,11 +14,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int versionName VERSION_NAME as String consumerProguardFiles 'proguard-rules.txt' } diff --git a/third_party/gif_decoder/build.gradle b/third_party/gif_decoder/build.gradle index 4c734b2514..fc783c776a 100644 --- a/third_party/gif_decoder/build.gradle +++ b/third_party/gif_decoder/build.gradle @@ -12,11 +12,11 @@ dependencies { } android { - compileSdkVersion COMPILE_SDK_VERSION as int + compileSdk COMPILE_SDK_VERSION as int defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int + minSdk MIN_SDK_VERSION as int + targetSdk TARGET_SDK_VERSION as int } }