Skip to content

Commit

Permalink
Fixing the release process (#84)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
franciscodr committed May 27, 2022
1 parent 4108811 commit 326e870
Show file tree
Hide file tree
Showing 38 changed files with 51 additions and 55 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions clients/http4k-client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions clients/http4k-client/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
6 changes: 3 additions & 3 deletions clients/ktor-client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions clients/ktor-client/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions clients/spring-web-client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions clients/spring-web-client/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions clients/spring-web-flux-client/gradle.properties

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions clients/spring-webflux-client/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pom.name=Arrow Endpoint Spring WebFlux Client
File renamed without changes.
4 changes: 1 addition & 3 deletions core/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
POM_NAME=Arrow Endpoint Core
POM_ARTIFACT_ID=arrow-endpoint-core
POM_PACKAGING=jar
pom.name=Arrow Endpoint Core
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/openapi-docs/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions docs/openapi-docs/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pom.name=Arrow Endpoint OpenApi Docs
File renamed without changes.
8 changes: 4 additions & 4 deletions examples/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion schema-reflect/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions schema-reflect/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
6 changes: 3 additions & 3 deletions servers/ktor-server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions servers/ktor-server/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
POM_NAME=ArrowEndpoint Ktor Server
POM_ARTIFACT_ID=arrow-endpoint-server-ktor
POM_PACKAGING=jar
pom.name=Arrow Endpoint Ktor Server
3 changes: 0 additions & 3 deletions servers/spring-web-server/gradle.properties

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions servers/spring-webflux-server/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pom.name=Arrow Endpoint Spring WebFlux Server
21 changes: 17 additions & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
File renamed without changes.
8 changes: 4 additions & 4 deletions test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 326e870

Please sign in to comment.