Merge pull request #4840 from sjudd:fix_android_sdk_version

PiperOrigin-RevId: 461930522
bumptech · Jul 19, 2022 · 1fe4f01 · 1fe4f01
2 parents d52c6ae + b1fd635
commit 1fe4f01
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/glide/build.gradle b/glide/build.gradle
@@ -35,8 +35,8 @@ def getAndroidSdkDirectory() {
     project(':library').android.sdkDirectory
 }
 
-def getAndroidCompileSdk() {
-    project(':library').android.compileSdk
+def getAndroidCompileSdkVersion() {
+    project(':library').android.compileSdkVersion
 }
 
 def getAndroidProjectsForJavadoc() {
@@ -58,7 +58,7 @@ def getSourceFilesForJavadoc() {
 }
 
 def getAndroidJar() {
-    "${getAndroidSdkDirectory()}/platforms/${getAndroidCompileSdk()}/android.jar"
+    "${getAndroidSdkDirectory()}/platforms/${getAndroidCompileSdkVersion()}/android.jar"
 }
 
 project.archivesBaseName = "${POM_ARTIFACT_ID}-${VERSION_NAME}"

diff --git a/scripts/ci_unit.sh b/scripts/ci_unit.sh
@@ -11,4 +11,5 @@ set -e
   -x :samples:svg:build \
   :instrumentation:assembleAndroidTest \
   :benchmark:assembleAndroidTest \
+  :glide:debugJavadoc \
   --parallel
diff --git a/scripts/upload.gradle b/scripts/upload.gradle
@@ -146,7 +146,7 @@ afterEvaluate { project ->
 
                     def getAndroidSdkDirectory = project.android.sdkDirectory
 
-                    def getAndroidJar = "${getAndroidSdkDirectory}/platforms/${project.android.compileSdk}/android.jar"
+                    def getAndroidJar = "${getAndroidSdkDirectory}/platforms/${project.android.compileSdkVersion}/android.jar"
 
                     task androidJavadocs(type: Javadoc, dependsOn: assembleDebug) {
                         source = variants.collect { it.getJavaCompileProvider().get().source }