Merge branch 'develop'

mikepenz · Aug 15, 2023 · c558b0c · c558b0c
2 parents a049439 + b03f1d4
commit c558b0c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 25 deletions.
diff --git a/gradle-release.gradle b/gradle-release.gradle
@@ -15,31 +15,15 @@ def getRepositoryPassword() {
     return project.hasProperty('NEXUS_PASSWORD') ? project.property('NEXUS_PASSWORD') : System.getenv('NEXUS_PASSWORD')
 }
 
-afterEvaluate { project ->
-    if (JavaVersion.current().isJava8Compatible()) {
-        allprojects {
-            tasks.withType(Javadoc) {
-                options.addStringOption('Xdoclint:none', '-quiet')
-            }
+if (JavaVersion.current().isJava8Compatible()) {
+    allprojects {
+        tasks.withType(Javadoc) {
+            options.addStringOption('Xdoclint:none', '-quiet')
         }
     }
+}
 
-    task androidJavadocs(type: Javadoc) {
-        failOnError = false
-        source = android.sourceSets.main.java.source
-        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    }
-
-    task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-        archiveClassifier = 'javadoc'
-        from androidJavadocs.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        archiveClassifier = 'sources'
-        from android.sourceSets.main.java.source
-    }
-
+afterEvaluate { project ->
     def pomConfig = {
         licenses {
             license {
@@ -71,9 +55,6 @@ afterEvaluate { project ->
                 artifactId POM_ARTIFACT_ID
                 version android.defaultConfig.versionName
 
-                artifact androidSourcesJar
-                artifact androidJavadocsJar
-
                 pom.withXml {
                     asNode().appendNode('name', POM_NAME)
                     asNode().appendNode('description', POM_DESCRIPTION)

diff --git a/materialdrawer-iconics/build.gradle b/materialdrawer-iconics/build.gradle
@@ -37,6 +37,13 @@ android {
         freeCompilerArgs += ["-module-name", POM_ARTIFACT_ID] // specify the artifactId as module-name for kotlin
         jvmTarget = "11"
     }
+
+    publishing {
+        singleVariant("release") {
+            withJavadocJar()
+            withSourcesJar()
+        }
+    }
 }
 
 dependencies {

diff --git a/materialdrawer-nav/build.gradle b/materialdrawer-nav/build.gradle
@@ -37,6 +37,13 @@ android {
         freeCompilerArgs += ["-module-name", POM_ARTIFACT_ID] // specify the artifactId as module-name for kotlin
         jvmTarget = "11"
     }
+
+    publishing {
+        singleVariant("release") {
+            withJavadocJar()
+            withSourcesJar()
+        }
+    }
 }
 
 dependencies {

diff --git a/materialdrawer/build.gradle b/materialdrawer/build.gradle
@@ -39,6 +39,13 @@ android {
         freeCompilerArgs += ["-module-name", POM_ARTIFACT_ID] // specify the artifactId as module-name for kotlin
         jvmTarget = "11"
     }
+
+    publishing {
+        singleVariant("release") {
+            withJavadocJar()
+            withSourcesJar()
+        }
+    }
 }
 
 dependencies {