Fixing the release process (#84)

* Rename projects by adding arrow-endpoint as prefix * Change POM properties in gradle.properties files * Rename folders for WebFlux client and server * Remove unnecessary env variables in workflow * Rename public API files
arrow-kt · May 27, 2022 · 326e870 · 326e870
1 parent 4108811
commit 326e870
Show file tree

Hide file tree

Showing 38 changed files with 51 additions and 55 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,8 +8,6 @@ on:
 env:
   SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
   SONATYPE_PWD: ${{ secrets.SONATYPE_PWD }}
-  ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET }}
-  ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
   OSS_USER: '${{ secrets.OSS_USER }}'
   OSS_TOKEN: '${{ secrets.OSS_TOKEN }}'
   OSS_STAGING_PROFILE_ID: '${{ secrets.OSS_STAGING_PROFILE_ID }}'

diff --git a/clients/http4k-client/api/http4k-client.api → ...ient/api/arrow-endpoint-http4k-client.api b/clients/http4k-client/api/http4k-client.api → ...ient/api/arrow-endpoint-http4k-client.api
diff --git a/clients/http4k-client/build.gradle.kts b/clients/http4k-client/build.gradle.kts
@@ -7,10 +7,10 @@ plugins {
 }
 
 dependencies {
-  api(projects.core)
+  api(projects.arrowEndpointCore)
   api(libs.http4k.core)
 
-  testImplementation(projects.test)
+  testImplementation(projects.arrowEndpointTest)
   testImplementation(libs.http4k.client.apache)
   testImplementation(libs.coroutines.core)
   testImplementation(libs.kotest.assertionsCore)

diff --git a/clients/http4k-client/gradle.properties b/clients/http4k-client/gradle.properties
@@ -1,3 +1 @@
-POM_NAME=Arrow Endpoint Http4k Client
-POM_ARTIFACT_ID=arrow-endpoint-client-http4k
-POM_PACKAGING=jar
+pom.name=Arrow Endpoint Http4k Client
diff --git a/clients/ktor-client/api/ktor-client.api → ...client/api/arrow-endpoint-ktor-client.api b/clients/ktor-client/api/ktor-client.api → ...client/api/arrow-endpoint-ktor-client.api
diff --git a/clients/ktor-client/build.gradle.kts b/clients/ktor-client/build.gradle.kts
@@ -7,12 +7,12 @@ plugins {
 }
 
 dependencies {
-  api(projects.core)
+  api(projects.arrowEndpointCore)
   api(libs.ktor.client.core)
 
-  testImplementation(projects.core)
+  testImplementation(projects.arrowEndpointCore)
   testImplementation(libs.ktor.client.cio)
-  testImplementation(projects.test)
+  testImplementation(projects.arrowEndpointTest)
   testImplementation(libs.coroutines.core)
   testImplementation(libs.kotest.assertionsCore)
   testImplementation(libs.kotest.property)

diff --git a/clients/ktor-client/gradle.properties b/clients/ktor-client/gradle.properties
@@ -1,3 +1 @@
-POM_NAME=Arrow Endpoint Ktor Client
-POM_ARTIFACT_ID=arrow-endpoint-client-ktor
-POM_PACKAGING=jar
+pom.name=Arrow Endpoint Ktor Client
diff --git a/...ring-web-client/api/spring-web-client.api → .../api/arrow-endpoint-spring-web-client.api b/...ring-web-client/api/spring-web-client.api → .../api/arrow-endpoint-spring-web-client.api
diff --git a/clients/spring-web-client/build.gradle.kts b/clients/spring-web-client/build.gradle.kts
@@ -7,10 +7,10 @@ plugins {
 }
 
 dependencies {
-  api(projects.core)
+  api(projects.arrowEndpointCore)
   api(libs.spring.boot.starter.web)
 
-  testImplementation(projects.test)
+  testImplementation(projects.arrowEndpointTest)
   testImplementation(libs.coroutines.core)
   testImplementation(libs.kotest.assertionsCore)
   testImplementation(libs.kotest.property)

diff --git a/clients/spring-web-client/gradle.properties b/clients/spring-web-client/gradle.properties
@@ -1,3 +1 @@
-POM_NAME=Arrow Endpoint Spring Web Client
-POM_ARTIFACT_ID=arrow-endpoint-client-spring-web
-POM_PACKAGING=jar
+pom.name=Arrow Endpoint Spring Web Client
diff --git a/clients/spring-web-flux-client/gradle.properties b/clients/spring-web-flux-client/gradle.properties
diff --git a/...lux-client/api/spring-web-flux-client.api → .../arrow-endpoint-spring-webflux-client.api b/...lux-client/api/spring-web-flux-client.api → .../arrow-endpoint-spring-webflux-client.api
diff --git a/...s/spring-web-flux-client/build.gradle.kts → ...ts/spring-webflux-client/build.gradle.kts b/...s/spring-web-flux-client/build.gradle.kts → ...ts/spring-webflux-client/build.gradle.kts
@@ -7,13 +7,13 @@ plugins {
 }
 
 dependencies {
-  api(projects.core)
+  api(projects.arrowEndpointCore)
   api(libs.coroutines.reactive)
   api(libs.coroutines.reactor)
   api(libs.spring.boot.starter.webflux)
   api(libs.netty.transport.native.kqueue)
 
-  testImplementation(projects.test)
+  testImplementation(projects.arrowEndpointTest)
   testImplementation(libs.coroutines.core)
   testImplementation(libs.kotest.assertionsCore)
   testImplementation(libs.kotest.property)

diff --git a/clients/spring-webflux-client/gradle.properties b/clients/spring-webflux-client/gradle.properties
@@ -0,0 +1 @@
+pom.name=Arrow Endpoint Spring WebFlux Client
diff --git a/...int/spring/client/webClientInterpreter.kt → ...int/spring/client/webClientInterpreter.kt b/...int/spring/client/webClientInterpreter.kt → ...int/spring/client/webClientInterpreter.kt
diff --git a/...spring/client/WebClientInterpreterTest.kt → ...spring/client/WebClientInterpreterTest.kt b/...spring/client/WebClientInterpreterTest.kt → ...spring/client/WebClientInterpreterTest.kt
diff --git a/core/api/core.api → core/api/arrow-endpoint-core.api b/core/api/core.api → core/api/arrow-endpoint-core.api
diff --git a/core/gradle.properties b/core/gradle.properties
@@ -1,3 +1 @@
-POM_NAME=Arrow Endpoint Core
-POM_ARTIFACT_ID=arrow-endpoint-core
-POM_PACKAGING=jar
+pom.name=Arrow Endpoint Core
diff --git a/docs/openapi-docs/api/openapi-docs.api → ...-docs/api/arrow-endpoint-openapi-docs.api b/docs/openapi-docs/api/openapi-docs.api → ...-docs/api/arrow-endpoint-openapi-docs.api
diff --git a/docs/openapi-docs/build.gradle.kts b/docs/openapi-docs/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 apply(plugin = "kotlinx-serialization")
 
 dependencies {
-  api(projects.core)
+  api(projects.arrowEndpointCore)
   implementation(libs.kotlinx.serialization.json)
 
   testImplementation(rootProject.libs.coroutines.core)

diff --git a/docs/openapi-docs/gradle.properties b/docs/openapi-docs/gradle.properties
@@ -0,0 +1 @@
+pom.name=Arrow Endpoint OpenApi Docs
diff --git a/examples/api/examples.api → examples/api/arrow-endpoint-examples.api b/examples/api/examples.api → examples/api/arrow-endpoint-examples.api
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -7,15 +7,15 @@ plugins {
 apply(plugin = "kotlinx-serialization")
 
 dependencies {
-  api(projects.core)
-  implementation(projects.servers.ktorServer)
-  implementation(projects.docs.openapiDocs)
+  api(projects.arrowEndpointCore)
+  implementation(projects.arrowEndpointKtorServer)
+  implementation(projects.arrowEndpointOpenapiDocs)
   implementation(libs.ktor.server.core)
   implementation(libs.ktor.server.netty)
   implementation(libs.spring.boot.starter.webflux)
   implementation(libs.logback.classic)
   implementation(libs.kotlinx.serialization.json)
-  implementation(project(":servers:spring-web-server"))
+  implementation(projects.arrowEndpointSpringWebfluxServer)
 }
 
 application {

diff --git a/schema-reflect/api/schema-reflect.api → ...ect/api/arrow-endpoint-schema-reflect.api b/schema-reflect/api/schema-reflect.api → ...ect/api/arrow-endpoint-schema-reflect.api
diff --git a/schema-reflect/build.gradle.kts b/schema-reflect/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 dependencies {
   runtimeOnly(libs.kotlin.reflect)
-  api(projects.core)
+  api(projects.arrowEndpointCore)
 
   testImplementation(rootProject.libs.coroutines.core)
   testImplementation(rootProject.libs.kotest.assertionsCore)

diff --git a/schema-reflect/gradle.properties b/schema-reflect/gradle.properties
@@ -1,3 +1 @@
-POM_NAME=Arrow Endpoint Schema Reflect
-POM_ARTIFACT_ID=arrow-endpoint-schema-reflect
-POM_PACKAGING=jar
+pom.name=Arrow Endpoint Schema Reflect
diff --git a/servers/ktor-server/api/ktor-server.api → ...server/api/arrow-endpoint-ktor-server.api b/servers/ktor-server/api/ktor-server.api → ...server/api/arrow-endpoint-ktor-server.api
diff --git a/servers/ktor-server/build.gradle.kts b/servers/ktor-server/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 }
 
 dependencies {
-  api(projects.core)
+  api(projects.arrowEndpointCore)
   api(libs.ktor.server.core)
 
-  testImplementation(projects.test)
-  testImplementation(projects.clients.ktorClient)
+  testImplementation(projects.arrowEndpointTest)
+  testImplementation(projects.arrowEndpointKtorClient)
   testImplementation(libs.ktor.test)
   testImplementation(libs.ktor.server.netty)
   testImplementation(libs.coroutines.core)

diff --git a/servers/ktor-server/gradle.properties b/servers/ktor-server/gradle.properties
@@ -1,3 +1 @@
-POM_NAME=ArrowEndpoint Ktor Server
-POM_ARTIFACT_ID=arrow-endpoint-server-ktor
-POM_PACKAGING=jar
+pom.name=Arrow Endpoint Ktor Server
diff --git a/servers/spring-web-server/gradle.properties b/servers/spring-web-server/gradle.properties
diff --git a/...ring-web-server/api/spring-web-server.api → .../arrow-endpoint-spring-webflux-server.api b/...ring-web-server/api/spring-web-server.api → .../arrow-endpoint-spring-webflux-server.api
diff --git a/servers/spring-web-server/build.gradle.kts → ...rs/spring-webflux-server/build.gradle.kts b/servers/spring-web-server/build.gradle.kts → ...rs/spring-webflux-server/build.gradle.kts
@@ -7,15 +7,15 @@ plugins {
 }
 
 dependencies {
-  api(projects.core)
+  api(projects.arrowEndpointCore)
   implementation(libs.coroutines.reactive)
   implementation(libs.coroutines.reactor)
   implementation(libs.spring.boot.starter.webflux)
   implementation(libs.reactor.kotlin.extensions)
   implementation(libs.netty.transport.native.kqueue)
 
-  testImplementation(projects.test)
-  testImplementation(projects.clients.springWebFluxClient)
+  testImplementation(projects.arrowEndpointTest)
+  testImplementation(projects.arrowEndpointSpringWebfluxClient)
   testImplementation(libs.undertow)
   testImplementation(rootProject.libs.coroutines.core)
   testImplementation(rootProject.libs.kotest.assertionsCore)

diff --git a/servers/spring-webflux-server/gradle.properties b/servers/spring-webflux-server/gradle.properties
@@ -0,0 +1 @@
+pom.name=Arrow Endpoint Spring WebFlux Server
diff --git a/...ring/server/SpringWebServerInterpreter.kt → ...ring/server/SpringWebServerInterpreter.kt b/...ring/server/SpringWebServerInterpreter.kt → ...ring/server/SpringWebServerInterpreter.kt
diff --git a/...ng/server/SpringServerInterpreterSuite.kt → ...ng/server/SpringServerInterpreterSuite.kt b/...ng/server/SpringServerInterpreterSuite.kt → ...ng/server/SpringServerInterpreterSuite.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,13 +14,26 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "arrow-endpoint"
-include("core", "examples", "schema-reflect", "test")
+
+include(":arrow-endpoint-core", ":arrow-endpoint-examples", ":arrow-endpoint-schema-reflect", ":arrow-endpoint-test")
 
 // clients
-include(":clients:ktor-client", ":clients:http4k-client", ":clients:spring-web-client", ":clients:spring-web-flux-client")
+include(":arrow-endpoint-ktor-client", ":arrow-endpoint-http4k-client", ":arrow-endpoint-spring-web-client", ":arrow-endpoint-spring-webflux-client")
 
 // servers
-include(":servers:ktor-server", ":servers:spring-web-server")
+include(":arrow-endpoint-ktor-server", ":arrow-endpoint-spring-webflux-server")
 
 // docs
-include(":docs:openapi-docs")
+include(":arrow-endpoint-openapi-docs")
+
+project(":arrow-endpoint-core").projectDir = file("core")
+project(":arrow-endpoint-examples").projectDir = file("examples")
+project(":arrow-endpoint-schema-reflect").projectDir = file("schema-reflect")
+project(":arrow-endpoint-test").projectDir = file("test")
+project(":arrow-endpoint-ktor-client").projectDir = file("clients/ktor-client")
+project(":arrow-endpoint-http4k-client").projectDir = file("clients/http4k-client")
+project(":arrow-endpoint-spring-web-client").projectDir = file("clients/spring-web-client")
+project(":arrow-endpoint-spring-webflux-client").projectDir = file("clients/spring-webflux-client")
+project(":arrow-endpoint-ktor-server").projectDir = file("servers/ktor-server")
+project(":arrow-endpoint-spring-webflux-server").projectDir = file("servers/spring-webflux-server")
+project(":arrow-endpoint-openapi-docs").projectDir = file("docs/openapi-docs")
diff --git a/test/api/test.api → test/api/arrow-endpoint-test.api b/test/api/test.api → test/api/arrow-endpoint-test.api
diff --git a/test/build.gradle.kts b/test/build.gradle.kts
@@ -6,14 +6,14 @@ plugins {
 apply(plugin = "kotlinx-serialization")
 
 dependencies {
-  api(projects.core)
+  api(projects.arrowEndpointCore)
   api(libs.kotest.frameworkEngine)
   api(libs.kotest.assertionsCore)
   api(libs.kotest.property)
 
-  implementation(projects.clients.http4kClient)
-  implementation(projects.clients.springWebClient)
-  implementation(projects.clients.springWebFluxClient)
+  implementation(projects.arrowEndpointHttp4kClient)
+  implementation(projects.arrowEndpointSpringWebClient)
+  implementation(projects.arrowEndpointSpringWebfluxClient)
   implementation(libs.kotlinx.serialization.json)
   implementation(libs.http4k.client.apache)
   implementation(libs.mockwebserver)