Merge pull request #389 from skydoves/migrate/nexus-plugin

Migrate nexus plugin
skydoves · Dec 31, 2023 · 17e3b90 · 17e3b90
2 parents 6efd2ac + bd14f3d
commit 17e3b90
Show file tree

Hide file tree

Showing 17 changed files with 174 additions and 225 deletions.
diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
@@ -18,12 +18,22 @@ import com.github.skydoves.landscapist.Configuration
 
 plugins {
   kotlin("jvm")
+  id(libs.plugins.nexus.plugin.get().pluginId)
 }
 
-rootProject.extra.apply {
-  set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
-  set("PUBLISH_ARTIFACT_ID", "landscapist-bom")
-  set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
+apply(from = "${rootDir}/scripts/publish-module.gradle.kts")
+
+mavenPublishing {
+  val artifactId = "landscapist-bom"
+  coordinates(
+    Configuration.artifactGroup,
+    artifactId,
+    rootProject.extra.get("libVersion").toString()
+  )
+
+  pom {
+    name.set(artifactId)
+  }
 }
 
 dependencies {
@@ -40,5 +50,3 @@ dependencies {
   }
 }
 
-apply(from ="${rootDir}/scripts/publish-module.gradle")
-
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
@@ -31,6 +31,7 @@ class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
     with(target) {
       pluginManager.apply("com.android.library")
       pluginManager.apply("org.jetbrains.kotlin.android")
+      pluginManager.apply("com.vanniktech.maven.publish")
       pluginManager.apply("binary-compatibility-validator")
       pluginManager.apply("org.jetbrains.dokka")
       pluginManager.apply("androidx.baselineprofile")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,5 +10,3 @@ plugins {
   alias(libs.plugins.nexus.plugin)
   alias(libs.plugins.dokka)
 }
-
-apply(from = "${rootDir}/scripts/publish-root.gradle")
diff --git a/coil/build.gradle.kts b/coil/build.gradle.kts
@@ -21,13 +21,20 @@ plugins {
   id("landscapist.spotless")
 }
 
-rootProject.extra.apply {
-  set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
-  set("PUBLISH_ARTIFACT_ID", "landscapist-coil")
-  set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
-}
+apply(from = "${rootDir}/scripts/publish-module.gradle.kts")
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
+mavenPublishing {
+  val artifactId = "landscapist-coil"
+  coordinates(
+    Configuration.artifactGroup,
+    artifactId,
+    rootProject.extra.get("libVersion").toString()
+  )
+
+  pom {
+    name.set(artifactId)
+  }
+}
 
 android {
   namespace = "com.skydoves.landscapist.coil"
@@ -36,9 +43,6 @@ android {
     minSdk = Configuration.minSdk
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
-  publishing {
-    singleVariant("release")
-  }
 }
 
 baselineProfile {

diff --git a/fresco-websupport/build.gradle.kts b/fresco-websupport/build.gradle.kts
@@ -21,23 +21,27 @@ plugins {
   id("landscapist.spotless")
 }
 
-rootProject.extra.apply {
-  set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
-  set("PUBLISH_ARTIFACT_ID", "landscapist-fresco-websupport")
-  set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
-}
+apply(from = "${rootDir}/scripts/publish-module.gradle.kts")
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
+mavenPublishing {
+  val artifactId = "landscapist-fresco-websupport"
+  coordinates(
+    Configuration.artifactGroup,
+    artifactId,
+    rootProject.extra.get("libVersion").toString()
+  )
+
+  pom {
+    name.set(artifactId)
+  }
+}
 
 android {
   namespace = "com.skydoves.landscapist.fresco.websupport"
   compileSdk = Configuration.compileSdk
   defaultConfig {
     minSdk = Configuration.minSdk
   }
-  publishing {
-    singleVariant("release")
-  }
 }
 
 baselineProfile {

diff --git a/fresco/build.gradle.kts b/fresco/build.gradle.kts
@@ -21,13 +21,20 @@ plugins {
   id("landscapist.spotless")
 }
 
-rootProject.extra.apply {
-  set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
-  set("PUBLISH_ARTIFACT_ID", "landscapist-fresco")
-  set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
-}
+apply(from = "${rootDir}/scripts/publish-module.gradle.kts")
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
+mavenPublishing {
+  val artifactId = "landscapist-fresco"
+  coordinates(
+    Configuration.artifactGroup,
+    artifactId,
+    rootProject.extra.get("libVersion").toString()
+  )
+
+  pom {
+    name.set(artifactId)
+  }
+}
 
 android {
   namespace = "com.skydoves.landscapist.fresco"
@@ -36,9 +43,6 @@ android {
     minSdk = Configuration.minSdk
     testInstrumentationRunner = "com.skydoves.landscapist.fresco.FrescoTestRunner"
   }
-  publishing {
-    singleVariant("release")
-  }
 }
 
 baselineProfile {

diff --git a/glide/build.gradle.kts b/glide/build.gradle.kts
@@ -21,13 +21,20 @@ plugins {
   id("landscapist.spotless")
 }
 
-rootProject.extra.apply {
-  set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
-  set("PUBLISH_ARTIFACT_ID", "landscapist-glide")
-  set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
-}
+apply(from = "${rootDir}/scripts/publish-module.gradle.kts")
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
+mavenPublishing {
+  val artifactId = "landscapist-glide"
+  coordinates(
+    Configuration.artifactGroup,
+    artifactId,
+    rootProject.extra.get("libVersion").toString()
+  )
+
+  pom {
+    name.set(artifactId)
+  }
+}
 
 android {
   namespace = "com.skydoves.landscapist.glide"
@@ -36,9 +43,6 @@ android {
     minSdk = Configuration.minSdk
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
-  publishing {
-    singleVariant("release")
-  }
 }
 
 baselineProfile {

diff --git a/gradle.properties b/gradle.properties
@@ -36,6 +36,32 @@ android.defaults.buildfeatures.shaders=false
 # thereby reducing the size of the R class for that library
 # https://developer.android.com/studio/releases/gradle-plugin#4.1-nontransitive-r-class
 android.nonTransitiveRClass=true
+
 # Eanble compose compiler options
 enableComposeCompilerMetrics=true
-enableComposeCompilerReports=true
+enableComposeCompilerReports=true
+
+# Required to publish to Nexus (see https://github.com/gradle/gradle/issues/11308)
+systemProp.org.gradle.internal.publish.checksums.insecure=true
+
+# Increase timeout when pushing to Sonatype (otherwise we get timeouts)
+systemProp.org.gradle.internal.http.socketTimeout=120000
+
+POM_URL=https://github.com/skydoves/landscapist/
+POM_SCM_URL=https://github.com/skydoves/landscapist/
+POM_SCM_CONNECTION=scm:git:git://github.com/skydoves/landscapist.git
+POM_SCM_DEV_CONNECTION=scm:git:git://github.com/skydoves/landscapist.git
+POM_DESCRIPTION=A pluggable, highly optimized Jetpack Compose image loading library that fetches and displays network images with Glide, Coil, and Fresco.
+
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+
+POM_DEVELOPER_ID=skydoves
+POM_DEVELOPER_NAME=Jaewoong Eum
+POM_DEVELOPER_URL=https://github.com/skydoves/
+POM_DEVELOPER_EMAIL=[email protected]
+
+SONATYPE_HOST=DEFAULT
+RELEASE_SIGNING_ENABLED=true
+SONATYPE_AUTOMATIC_RELEASE=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin = "1.9.21"
 dokka = "1.9.10"
 jvmTarget = "11"
-nexusPlugin = "1.3.0"
+nexusPlugin = "0.26.0"
 kotlinxCoroutines = "1.7.3"
 kotlinBinaryCompatibility = "0.13.2"
 androidGradlePlugin = "8.2.0"
@@ -75,7 +75,7 @@ android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
-nexus-plugin = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexusPlugin" }
+nexus-plugin = { id = "com.vanniktech.maven.publish", version.ref = "nexusPlugin" }
 kotlin-binary-compatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinBinaryCompatibility" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

diff --git a/landscapist-animation/build.gradle.kts b/landscapist-animation/build.gradle.kts
@@ -20,13 +20,20 @@ plugins {
   id("landscapist.spotless")
 }
 
-rootProject.extra.apply {
-  set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
-  set("PUBLISH_ARTIFACT_ID", "landscapist-animation")
-  set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
-}
+apply(from = "${rootDir}/scripts/publish-module.gradle.kts")
+
+mavenPublishing {
+  val artifactId = "landscapist-animation"
+  coordinates(
+    Configuration.artifactGroup,
+    artifactId,
+    rootProject.extra.get("libVersion").toString()
+  )
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
+  pom {
+    name.set(artifactId)
+  }
+}
 
 android {
   namespace = "com.skydoves.landscapist.animation"
@@ -36,10 +43,6 @@ android {
     minSdk = Configuration.minSdk
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
-
-  publishing {
-    singleVariant("release")
-  }
 }
 
 baselineProfile {

diff --git a/landscapist-palette/build.gradle.kts b/landscapist-palette/build.gradle.kts
@@ -20,13 +20,20 @@ plugins {
   id("landscapist.spotless")
 }
 
-rootProject.extra.apply {
-  set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
-  set("PUBLISH_ARTIFACT_ID", "landscapist-palette")
-  set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
-}
+apply(from = "${rootDir}/scripts/publish-module.gradle.kts")
+
+mavenPublishing {
+  val artifactId = "landscapist-palette"
+  coordinates(
+    Configuration.artifactGroup,
+    artifactId,
+    rootProject.extra.get("libVersion").toString()
+  )
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
+  pom {
+    name.set(artifactId)
+  }
+}
 
 android {
   namespace = "com.skydoves.landscapist.palette"
@@ -36,10 +43,6 @@ android {
     minSdk = Configuration.minSdk
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
-
-  publishing {
-    singleVariant("release")
-  }
 }
 
 baselineProfile {

diff --git a/landscapist-placeholder/build.gradle.kts b/landscapist-placeholder/build.gradle.kts
@@ -20,13 +20,20 @@ plugins {
   id("landscapist.spotless")
 }
 
-rootProject.extra.apply {
-  set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
-  set("PUBLISH_ARTIFACT_ID", "landscapist-placeholder")
-  set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
-}
+apply(from = "${rootDir}/scripts/publish-module.gradle.kts")
+
+mavenPublishing {
+  val artifactId = "landscapist-placeholder"
+  coordinates(
+    Configuration.artifactGroup,
+    artifactId,
+    rootProject.extra.get("libVersion").toString()
+  )
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
+  pom {
+    name.set(artifactId)
+  }
+}
 
 android {
   namespace = "com.skydoves.landscapist.placeholder"
@@ -36,10 +43,6 @@ android {
     minSdk = Configuration.minSdk
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
-
-  publishing {
-    singleVariant("release")
-  }
 }
 
 baselineProfile {

diff --git a/landscapist-transformation/build.gradle.kts b/landscapist-transformation/build.gradle.kts
@@ -20,13 +20,20 @@ plugins {
   id("landscapist.spotless")
 }
 
-rootProject.extra.apply {
-  set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
-  set("PUBLISH_ARTIFACT_ID", "landscapist-transformation")
-  set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
-}
+apply(from = "${rootDir}/scripts/publish-module.gradle.kts")
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
+mavenPublishing {
+  val artifactId = "landscapist-transformation"
+  coordinates(
+    Configuration.artifactGroup,
+    artifactId,
+    rootProject.extra.get("libVersion").toString()
+  )
+
+  pom {
+    name.set(artifactId)
+  }
+}
 
 android {
   namespace = "com.skydoves.landscapist.transformation"
@@ -47,9 +54,6 @@ android {
       path = file("src/main/cpp/CMakeLists.txt")
     }
   }
-  publishing {
-    singleVariant("release")
-  }
 }
 
 baselineProfile {