Fix some gradle deprecations

bumptech · Jul 11, 2022 · 31e7ce3 · 31e7ce3
1 parent 2895b35
commit 31e7ce3
Show file tree

Hide file tree

Showing 26 changed files with 74 additions and 74 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
     }
 }