Lint fixes

google · Aug 9, 2023 · c188695 · c188695
1 parent 3d5f224
commit c188695
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -142,14 +142,14 @@ if (androidSdkInstalled) {
 
     def javadocsJar = tasks.register("javadocsJar", Jar) {
         dependsOn javadocs
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
         from {
             javadocs.get().destinationDir
         }
     }
 
     def sourcesJar = tasks.register("sourcesJar", Jar) {
-        classifier = 'sources'
+        archiveClassifier = 'sources'
         from android.sourceSets.main.java.srcDirs
     }
 

diff --git a/build.gradle b/build.gradle
@@ -200,12 +200,12 @@ subprojects {
         }
 
         tasks.register("javadocJar", Jar) {
-            classifier = 'javadoc'
+            archiveClassifier = 'javadoc'
             from javadoc
         }
 
         tasks.register("sourcesJar", Jar) {
-            classifier = 'sources'
+            archiveClassifier = 'sources'
             from sourceSets.main.allSource
         }
 

diff --git a/openjdk/build.gradle b/openjdk/build.gradle
@@ -168,11 +168,15 @@ processResources {
 }
 
 tasks.register("testJar", ShadowJar) {
-    classifier = 'tests'
+    archiveClassifier = 'tests'
     configurations = [project.configurations.testRuntimeClasspath]
     from sourceSets.test.output
 }
 
+tasks.named("sourcesJar") {
+    dependsOn generateProperties
+}
+
 if (isExecutableOnPath('cpplint')) {
     def cpplint = tasks.register("cpplint", Exec) {
         executable = 'cpplint'