From 5a502bc5241ec8f44ecec76142e1f86ed1dcef90 Mon Sep 17 00:00:00 2001
From: Luke Daley <ld@ldaley.com>
Date: Fri, 7 May 2021 13:14:08 +1000
Subject: [PATCH] Fix publication of manual zip

---
 ratpack-manual/ratpack-manual.gradle               | 14 ++++++++------
 .../ratpack-spring-boot-starter.gradle             |  2 ++
 ratpack.gradle                                     | 12 ++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ratpack-manual/ratpack-manual.gradle b/ratpack-manual/ratpack-manual.gradle
index 23525ecd2..5dcf3edf4 100644
--- a/ratpack-manual/ratpack-manual.gradle
+++ b/ratpack-manual/ratpack-manual.gradle
@@ -40,6 +40,7 @@ buildscript {
 description = "The manual for Ratpack (documentation & API reference)"
 
 apply from: "$rootDir/gradle/javaModule.gradle"
+apply from: "$rootDir/gradle/publish-base.gradle"
 apply plugin: "com.eriwen.gradle.js"
 apply plugin: 'io.freefair.jsass-base'
 
@@ -372,14 +373,15 @@ task openApi(dependsOn: packageManual) {
   }
 }
 
-task manualZip(type: Zip) {
-  from packageManual
+def manualZip = tasks.create("manualZip", Zip) {
+  it.from packageManual
 }
 
-configurations {
-  published.extendsFrom zip
+def publications = extensions.getByType(PublishingExtension).publications
+def publication = publications.create("main", MavenPublication) {
+  it.artifact(manualZip)
 }
 
-artifacts {
-  zip manualZip
+extensions.findByType(SigningExtension).with {
+  it.sign(publication)
 }
diff --git a/ratpack-spring-boot-starter/ratpack-spring-boot-starter.gradle b/ratpack-spring-boot-starter/ratpack-spring-boot-starter.gradle
index ec3ddfc6c..c14ee3b87 100644
--- a/ratpack-spring-boot-starter/ratpack-spring-boot-starter.gradle
+++ b/ratpack-spring-boot-starter/ratpack-spring-boot-starter.gradle
@@ -16,6 +16,8 @@
 
 description = "Spring Boot starter for Ratpack - http://projects.spring.io/spring-boot/"
 
+apply from: "$rootDir/gradle/publish-pom.gradle"
+
 dependencies {
   api project(":ratpack-spring-boot")
   api("org.springframework.boot:spring-boot-starter:$commonVersions.springBoot") {
diff --git a/ratpack.gradle b/ratpack.gradle
index d6284d177..d7a6300e4 100644
--- a/ratpack.gradle
+++ b/ratpack.gradle
@@ -32,7 +32,6 @@ ext {
     "ratpack-hikari",
     "ratpack-hystrix",
     "ratpack-jdbc-tx",
-    "ratpack-manual",
     "ratpack-newrelic",
     "ratpack-pac4j",
     "ratpack-reactor",
@@ -52,7 +51,8 @@ ext {
   ].collect { project(it) }
 
   nonLibraryPublishedModules = [
-    "ratpack-spring-boot-starter"
+    "ratpack-spring-boot-starter", "ratpack-manual"
+
   ].collect { project(it) }
 
   apiModules = publishedModules.findAll { !(it.name in ["ratpack-manual", "ratpack-gradle", "ratpack-spring-boot-starter", "ratpack-thymeleaf3"]) }
@@ -90,12 +90,8 @@ gradle.beforeProject {
     tasks.register("sanityCheck")
 
     apply from: "$rootDir/gradle/ratpackLocal.gradle"
-    if (project in publishedModules) {
-      if (project in nonLibraryPublishedModules) {
-        apply from: "$rootDir/gradle/publish-pom.gradle"
-      } else {
-        apply from: "$rootDir/gradle/publish-library.gradle"
-      }
+    if (project in publishedModules && !(project in nonLibraryPublishedModules)) {
+      apply from: "$rootDir/gradle/publish-library.gradle"
     }
   }
 }