SNAPSHOT publishing #2

GradleUp · Feb 18, 2024 · 0b8edf2 · 0b8edf2
1 parent c50f3f2
commit 0b8edf2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/build-logic/src/main/kotlin/internal/publishing.kt b/build-logic/src/main/kotlin/internal/publishing.kt
@@ -150,7 +150,7 @@ internal fun Project.configurePublishing(
  * @param githubOptions CI options. May be null to skip publishing on CI. If non-null, creates `publishIfNeeded` task
  * that publishes to SNAPSHOTS if the version ends with `-SNAPSHOT` or Maven Central else
  */
-internal fun Project.configureGitHub(sonatypeOptions: SonatypeOptions?, githubOptions: GithubOptions?) {
+internal fun Project.configureGitHub(projectOptions: ProjectOptions, sonatypeOptions: SonatypeOptions?, githubOptions: GithubOptions?) {
     if (githubOptions != null && this == rootProject && sonatypeOptions != null) {
         val publishIfNeeded = project.publishIfNeededTaskProvider()
         val ossStagingReleaseTask =
@@ -159,8 +159,7 @@ internal fun Project.configureGitHub(sonatypeOptions: SonatypeOptions?, githubOp
         val eventName = System.getenv("GITHUB_EVENT_NAME")
         val ref = System.getenv("GITHUB_REF")
 
-        if (eventName == "push" && ref == "refs/heads/${githubOptions.mainBranch}" && project.version.toString()
-                .endsWith("-SNAPSHOT")
+        if (eventName == "push" && ref == "refs/heads/${githubOptions.mainBranch}" && projectOptions.version.endsWith("-SNAPSHOT")
         ) {
             project.logger.log(LogLevel.LIFECYCLE, "Deploying snapshot to OssSnapshot...")
             publishIfNeeded.dependsOn(project.tasks.named("publishAllPublicationsToOssSnapshotsRepository"))

diff --git a/build-logic/src/main/kotlin/main.kt b/build-logic/src/main/kotlin/main.kt
@@ -15,19 +15,21 @@ private val sonatypeOptions = System.getenv("OSSRH_USER")?.let {
     )
 }
 
+private val projectOptions = ProjectOptions(
+    groupId = "com.gradleup.gratatouille",
+    version = "0.0.1-SNAPSHOT",
+    descriptions = "Cook yourself delicious Gradle plugins",
+    vcsUrl = "https://github.com/GradleUp/gratatouille",
+    developers = "GradleUp authors",
+    license = "MIT License",
+    licenseUrl = "https://github.com/GradleUp/gratatouille/blob/main/LICENSE"
+)
+
 fun Project.configureLib() {
     targetJdk(11)
 
     configurePublishing(
-        projectOptions = ProjectOptions(
-            groupId = "com.gradleup.gratatouille",
-            version = "0.0.1-SNAPSHOT",
-            descriptions = "Cook yourself delicious Gradle plugins",
-            vcsUrl = "https://github.com/GradleUp/gratatouille",
-            developers = "GradleUp authors",
-            license = "MIT License",
-            licenseUrl = "https://github.com/GradleUp/gratatouille/blob/main/LICENSE"
-        ),
+        projectOptions = projectOptions,
         sonatypeOptions = sonatypeOptions,
         signingOptions = System.getenv("GPG_KEY")?.let {
             SigningOptions(
@@ -40,6 +42,7 @@ fun Project.configureLib() {
 
 fun Project.configureRoot() {
     configureGitHub(
+        projectOptions = projectOptions,
         sonatypeOptions = sonatypeOptions,
         githubOptions = GithubOptions(
             mainBranch = "main",