From 7507287b241bfd1523379142c71001af9495e4f2 Mon Sep 17 00:00:00 2001
From: Oliver Spryn <2717340+oliverspryn@users.noreply.github.com>
Date: Thu, 28 Mar 2024 17:05:17 -0400
Subject: [PATCH] Add Nexus Publication Plugin

---
 .github/workflows/publish-library.yml                         | 2 +-
 .../gradle/plugin/base/BaseModuleConventionPlugin.kt          | 2 +-
 build.gradle.kts                                              | 3 ++-
 gradle/libs.versions.toml                                     | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-library.yml b/.github/workflows/publish-library.yml
index b9b379a..c664468 100644
--- a/.github/workflows/publish-library.yml
+++ b/.github/workflows/publish-library.yml
@@ -34,4 +34,4 @@ jobs:
       uses: gradle/actions/setup-gradle@v3
   
     - name: Publish the Library
-      run: ./gradlew publishMultimodalSpannerPublicationToCentralRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
+      run: ./gradlew publishMultimodalSpannerPublicationToCentralRepository --max-workers 1 closeAndReleaseStagingRepositories
diff --git a/build-logic/convention/src/main/kotlin/com/oliverspryn/gradle/plugin/base/BaseModuleConventionPlugin.kt b/build-logic/convention/src/main/kotlin/com/oliverspryn/gradle/plugin/base/BaseModuleConventionPlugin.kt
index 8224bcc..01124b4 100644
--- a/build-logic/convention/src/main/kotlin/com/oliverspryn/gradle/plugin/base/BaseModuleConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/com/oliverspryn/gradle/plugin/base/BaseModuleConventionPlugin.kt
@@ -19,7 +19,7 @@ abstract class BaseModuleConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             plugins {
-                apply(plugin("kotlin-android"))
+                apply(plugin("kotlin"))
             }
 
             android {
diff --git a/build.gradle.kts b/build.gradle.kts
index 7bfbeec..b0f0cca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.dokka)
     alias(libs.plugins.hilt) apply false
-    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin) apply false
     alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.nexus)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 04935dd..415c4ad 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,6 +6,7 @@ hilt = "2.50"
 hilt-navigation-compose = "1.2.0"
 kotlin = "1.9.22"      # KSP and Kotlin must...
 ksp = "1.9.22-1.0.17"  # ... share the same major.minor.patch version
+nexus = "2.0.0-rc-2"
 
 # AndroidX
 activity-ktx = "1.8.2"
@@ -59,8 +60,9 @@ android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
 
 # Multimodal Spanner Convention Plugins
 multimodal-app = { id = "multimodal.app", version = "unspecified" }