Fix some gradle script deprecations

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

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/annotation/compiler/build.gradle b/annotation/compiler/build.gradle
@@ -32,8 +32,8 @@ def repackagedJar = file("${packagingFolder}/repackaged.jar")
 def proguardedJar = file("${packagingFolder}/proguarded.jar")
 
 task compiledJar(type: Jar, dependsOn: classes) {
-    destinationDir = packagingFolder
-    archiveName = 'compiled.jar'
+    destinationDirectory.set(packagingFolder)
+    archiveFileName.set('compiled.jar')
     from sourceSets.main.output
 }
 

diff --git a/build.gradle b/build.gradle
@@ -115,8 +115,8 @@ subprojects { project ->
     apply plugin: "se.bjurr.violations.violations-gradle-plugin"
 
     task violations(type: ViolationsTask) {
-        minSeverity 'INFO'
-        detailLevel 'VERBOSE'
+        minSeverity = 'INFO'
+        detailLevel = 'VERBOSE'
         maxViolations = 0
         diffMaxViolations = 0
 

diff --git a/glide/build.gradle b/glide/build.gradle
@@ -115,7 +115,7 @@ javadocJarTask.dependsOn(javadocTask)
 jar {
     from files(
             getAndroidLibraryVariantsForJavadoc().collect { LibraryVariant variant ->
-                variant.getJavaCompileProvider().get().destinationDir
+                variant.getJavaCompileProvider().get().destinationDirectory
             }
     )
     exclude "**/R.class"

diff --git a/library/pmd/build.gradle b/library/pmd/build.gradle
@@ -32,8 +32,8 @@ tasks.create('pmd', Pmd) {
     ignoreFailures = true
 
     reports {
-        xml.enabled = true
-        html.enabled = false
+        xml.required.set(true)
+        html.required.set(false)
     }
 }
 
diff --git a/scripts/upload.gradle b/scripts/upload.gradle
@@ -175,22 +175,22 @@ afterEvaluate { project ->
                     project.clean.dependsOn(cleanJavadocTask)
 
                     task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-                        classifier = 'javadoc'
+                        archiveClassifier.set('javadoc')
                         from androidJavadocs.destinationDir
-                        baseName "${JAR_PREFIX}${project.name}${JAR_POSTFIX}"
+                        archiveBaseName.set("${JAR_PREFIX}${project.name}${JAR_POSTFIX}")
                     }
 
                     task androidSourcesJar(type: Jar) {
-                        classifier = 'sources'
+                        archiveClassifier.set('sources')
                         from project.android.sourceSets.main.java.source
-                        baseName "${JAR_PREFIX}${project.name}${JAR_POSTFIX}"
+                        archiveBaseName.set("${JAR_PREFIX}${project.name}${JAR_POSTFIX}")
                     }
 
                     task androidLibraryJar(type: Jar, dependsOn: compileDebugJavaWithJavac /* == variant.javaCompile */) {
                         from compileDebugJavaWithJavac.destinationDir
                         exclude '**/R.class'
                         exclude '**/R$*.class'
-                        baseName "${JAR_PREFIX}${project.name}${JAR_POSTFIX}"
+                        archiveBaseName.set("${JAR_PREFIX}${project.name}${JAR_POSTFIX}")
                     }
 
                     artifact androidLibraryJar
@@ -203,12 +203,12 @@ afterEvaluate { project ->
                     artifact project.tasks.bundleDebugAar
                 } else if (project.plugins.hasPlugin('java')) {
                     task sourcesJar(type: Jar, dependsOn: classes) {
-                        classifier = 'sources'
+                        archiveClassifier.set('sources')
                         from sourceSets.main.allSource
                     }
 
                     task javadocsJar(type: Jar, dependsOn: javadoc) {
-                        classifier = 'javadoc'
+                        archiveClassifier.set('javadoc')
                         from javadoc.destinationDir
                     }