Merge pull request #75 from kennethshackleton/more-pom-meta

Supply descriptions and urls in pom. Publish remaining Javadocs.
bloomberg · Apr 8, 2021 · a2279ce · a2279ce
2 parents 2d24f0e + ff456d1
commit a2279ce
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 17 deletions.
diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml
@@ -53,7 +53,6 @@ jobs:
           -Psigning.gnupg.passphrase="${{ secrets.GPG_KEY_PASSPHRASE }}" \
           -PsonatypePassword="${{ secrets.OSSRH_PASSWORD }}" \
           -PsonatypeUsername="${{ secrets.OSSRH_USERNAME }}" \
-          --info \
           publishToSonatype \
           closeSonatypeStagingRepository
     - name: 'Clean-up'

diff --git a/AndroidLib/build.gradle.kts b/AndroidLib/build.gradle.kts
@@ -76,8 +76,6 @@ android {
     }
 }
 
-description = "Selekt Android SQLite library."
-
 dependencies {
     api(selekt("api", selektVersionName))
     compileOnly(selekt("annotations", selektVersionName))
@@ -125,7 +123,10 @@ afterEvaluate {
             artifactId = "selekt-android"
             version = android.defaultConfig.versionName
             from(components["release"])
-            pom { commonInitialisation(project) }
+            pom {
+                commonInitialisation(project)
+                description.set("Selekt Android SQLite library.")
+            }
             artifact("$buildDir/libs/selekt-sources.jar") { classifier = "sources" }
         }.also {
             signing { sign(it) }

diff --git a/AndroidLint/build.gradle.kts b/AndroidLint/build.gradle.kts
@@ -26,12 +26,12 @@ plugins {
     signing
 }
 
-description = "Selekt Android Lint library."
-
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
     @Suppress("UnstableApiUsage")
+    withJavadocJar()
+    @Suppress("UnstableApiUsage")
     withSourcesJar()
 }
 
@@ -52,6 +52,9 @@ publishing {
         artifactId = "selekt-android-lint"
         version = selektVersionName
         from(components.getByName("java"))
-        pom { commonInitialisation(project) }
+        pom {
+            commonInitialisation(project)
+            description.set("Selekt Android Lint library.")
+        }
     }
 }
diff --git a/Annotations/build.gradle.kts b/Annotations/build.gradle.kts
@@ -26,6 +26,8 @@ plugins {
 }
 
 java {
+    @Suppress("UnstableApiUsage")
+    withJavadocJar()
     @Suppress("UnstableApiUsage")
     withSourcesJar()
 }
@@ -43,6 +45,9 @@ publishing {
         artifactId = "selekt-annotations"
         version = selektVersionName
         from(components.getByName("java"))
-        pom { commonInitialisation(project) }
+        pom {
+            commonInitialisation(project)
+            description.set("Selekt annotations library.")
+        }
     }
 }
diff --git a/ApiLib/build.gradle.kts b/ApiLib/build.gradle.kts
@@ -28,9 +28,9 @@ plugins {
     signing
 }
 
-description = "Selekt shared API library."
-
 java {
+    @Suppress("UnstableApiUsage")
+    withJavadocJar()
     @Suppress("UnstableApiUsage")
     withSourcesJar()
 }
@@ -54,6 +54,9 @@ publishing {
         artifactId = "selekt-api"
         version = selektVersionName
         from(components.getByName("java"))
-        pom { commonInitialisation(project) }
+        pom {
+            commonInitialisation(project)
+            description.set("Selekt shared API library.")
+        }
     }
 }
diff --git a/Lib/build.gradle.kts b/Lib/build.gradle.kts
@@ -27,11 +27,11 @@ plugins {
     signing
 }
 
-description = "Selekt core library."
-
 disableKotlinCompilerAssertions()
 
 java {
+    @Suppress("UnstableApiUsage")
+    withJavadocJar()
     @Suppress("UnstableApiUsage")
     withSourcesJar()
 }
@@ -53,6 +53,9 @@ publishing {
         artifactId = "selekt-java"
         version = selektVersionName
         from(components.getByName("java"))
-        pom { commonInitialisation(project) }
+        pom {
+            commonInitialisation(project)
+            description.set("Selekt core library.")
+        }
     }
 }
diff --git a/SQLite3/build.gradle.kts b/SQLite3/build.gradle.kts
@@ -59,6 +59,8 @@ val cFlags = arrayOf(
 disableKotlinCompilerAssertions()
 
 java {
+    @Suppress("UnstableApiUsage")
+    withJavadocJar()
     @Suppress("UnstableApiUsage")
     withSourcesJar()
 }
@@ -73,7 +75,10 @@ publishing {
         artifactId = "selekt-sqlite3"
         version = selektVersionName
         from(components.getByName("java"))
-        pom { commonInitialisation(project) }
+        pom {
+            commonInitialisation(project)
+            description.set("Selekt Java SQLite interface library.")
+        }
     }
 }
 

diff --git a/buildSrc/src/main/kotlin/SelektExtensions.kt b/buildSrc/src/main/kotlin/SelektExtensions.kt
@@ -96,14 +96,14 @@ fun MavenPom.commonInitialisation(project: Project) {
             email.set("[email protected]")
             name.set("Kenneth J. Shackleton")
             organization.set("Bloomberg LP")
-            organizationUrl.set("https://www.bloomberg.com")
+            organizationUrl.set("https://github.com/bloomberg")
         }
         developer {
             id.set("xouabita")
             email.set("[email protected]")
             name.set("Alexandre Abita")
             organization.set("Bloomberg LP")
-            organizationUrl.set("https://www.bloomberg.com")
+            organizationUrl.set("https://github.com/bloomberg")
         }
     }
     inceptionYear.set("2019")
@@ -120,11 +120,13 @@ fun MavenPom.commonInitialisation(project: Project) {
     }
     organization {
         name.set("Bloomberg LP")
+        url.set("https://www.bloomberg.com")
     }
     scm {
         connection.set("[email protected]:bloomberg/selekt.git")
         developerConnection.set("[email protected]:bloomberg/selekt.git")
         tag.set(project.gitCommit())
         url.set("https://github.com/bloomberg/Selekt")
     }
+    url.set("https://github.com/bloomberg/selekt")
 }