From fc5cce027ada043d16700e87ed6ec6d0684b3d1b Mon Sep 17 00:00:00 2001 From: Robert Chaing Date: Wed, 5 Jul 2023 15:42:03 -0700 Subject: [PATCH 1/8] Fix maven publishing --- build.gradle.kts | 3 --- client/build.gradle.kts | 1 - .../tech/figure/aggregator/api/service/TransferService.kt | 3 +-- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4de8c9dd..a747c5f3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -169,9 +169,6 @@ subprojects { } } signing { - setRequired { - gradle.taskGraph.allTasks.any { it is PublishToMavenLocal } - } sign(publishing.publications["maven"]) } } diff --git a/client/build.gradle.kts b/client/build.gradle.kts index cf2e2b16..2c9f4802 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -1,7 +1,6 @@ plugins{ kotlin("jvm") version "1.8.21" `maven-publish` - signing java idea } diff --git a/service/src/main/kotlin/tech/figure/aggregator/api/service/TransferService.kt b/service/src/main/kotlin/tech/figure/aggregator/api/service/TransferService.kt index 92adb299..b7dc5b77 100644 --- a/service/src/main/kotlin/tech/figure/aggregator/api/service/TransferService.kt +++ b/service/src/main/kotlin/tech/figure/aggregator/api/service/TransferService.kt @@ -120,7 +120,6 @@ fun Flow.toMarkerSupplyStreamResponse(): Flow = StreamResponse.newBuilder() .setMarkerSupply(data) .build() - } fun Flow.toMarkerTransferStreamResponse(): Flow = @@ -128,7 +127,7 @@ fun Flow.toMarkerTransferStreamResponse(): Flow val data = MarkerTransferOuterClass.MarkerTransfer.newBuilder() .setEventType(it.eventType) .setBlockHeight(it.blockHeight) - .setBlockTimestamp(it.blockTimestamp.toString().toOffsetDateTime().toProtoTimestamp()) + .setBlockTimestamp(it.blockTimestamp.toOffsetDateTime().toProtoTimestamp()) .setAmount(it.amount) .setDenom(it.denom) .setAdministrator(it.administrator) From 380d09c28b5d5d77117794de4917f793ec2dca1f Mon Sep 17 00:00:00 2001 From: Robert Chaing Date: Thu, 6 Jul 2023 08:50:23 -0700 Subject: [PATCH 2/8] maven local --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index a747c5f3..6f0c4a49 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,6 +18,7 @@ java.sourceCompatibility = javaVersion java.targetCompatibility = javaVersion repositories { + mavenLocal() mavenCentral() maven( url = "https://jitpack.io") } From 9fa2e48c5e34a87111a3da6672d025ef4d3dbdae Mon Sep 17 00:00:00 2001 From: Robert Chaing Date: Thu, 6 Jul 2023 09:32:27 -0700 Subject: [PATCH 3/8] Update publish-client.yml --- .github/workflows/publish-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-client.yml b/.github/workflows/publish-client.yml index 89f8af94..5ac64ee4 100644 --- a/.github/workflows/publish-client.yml +++ b/.github/workflows/publish-client.yml @@ -44,7 +44,7 @@ jobs: - name: Publish to Maven Central run: | - ./gradlew client:publishToSonatype $(if [ "${{github.event.release.prerelease}}" = "true" ]; then echo 'closeSonatypeStagingRepository'; else echo 'closeAndReleaseSonatypeStagingRepository'; fi) \ + ./gradlew publishToSonatype $(if [ "${{github.event.release.prerelease}}" = "true" ]; then echo 'closeSonatypeStagingRepository'; else echo 'closeAndReleaseSonatypeStagingRepository'; fi) \ -PlibraryVersion=$VERSION \ -Psigning.keyId=69C08EA0 -Psigning.password="${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}" -Psigning.secretKeyRingFile=$GITHUB_WORKSPACE/release.gpg \ --info From 9d7089ccb03ba5e349385dec02f9568ba9d20552 Mon Sep 17 00:00:00 2001 From: Robert Chaing Date: Thu, 6 Jul 2023 13:23:34 -0700 Subject: [PATCH 4/8] clean client gradle --- build.gradle.kts | 24 ++++++++++++------------ client/build.gradle.kts | 7 ------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6f0c4a49..ea5778b7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,18 +23,6 @@ repositories { maven( url = "https://jitpack.io") } -nexusPublishing { - repositories { - sonatype { - nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) - username.set(findProject("ossrhUsername")?.toString() ?: System.getenv("OSSRH_USERNAME")) - password.set(findProject("ossrhPassword")?.toString() ?: System.getenv("OSSRH_PASSWORD")) - stagingProfileId.set("858b6e4de4734a") // tech.figure staging id - } - } -} - dependencies { implementation(projects.common) implementation(projects.repository) @@ -175,6 +163,18 @@ subprojects { } } +nexusPublishing { + repositories { + sonatype { + nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) + snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) + username.set(findProject("ossrhUsername")?.toString() ?: System.getenv("OSSRH_USERNAME")) + password.set(findProject("ossrhPassword")?.toString() ?: System.getenv("OSSRH_PASSWORD")) + stagingProfileId.set("858b6e4de4734a") // tech.figure staging id + } + } +} + tasks.jacocoTestReport { reports { xml.required.set(true) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 2c9f4802..9b080ded 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -5,13 +5,6 @@ plugins{ idea } -group = "tech.figure.aggregate.client" -version = "1.0-SNAPSHOT" - -repositories { - mavenCentral() -} - dependencies { api(projects.proto) api(libs.bundles.grpc) From 314b1b6d9a298f3972f2f1cbdd9918cd74a101a1 Mon Sep 17 00:00:00 2001 From: Robert Chaing Date: Thu, 6 Jul 2023 13:37:31 -0700 Subject: [PATCH 5/8] fix gradle --- client/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 9b080ded..582fcc43 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -5,6 +5,10 @@ plugins{ idea } +repositories { + mavenCentral() +} + dependencies { api(projects.proto) api(libs.bundles.grpc) From afeaef5d2c0f62f20456615e3645ec10cdc7e46e Mon Sep 17 00:00:00 2001 From: Robert Chaing Date: Thu, 6 Jul 2023 14:25:52 -0700 Subject: [PATCH 6/8] test --- .github/workflows/publish-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-client.yml b/.github/workflows/publish-client.yml index 5ac64ee4..e29247c2 100644 --- a/.github/workflows/publish-client.yml +++ b/.github/workflows/publish-client.yml @@ -44,7 +44,7 @@ jobs: - name: Publish to Maven Central run: | - ./gradlew publishToSonatype $(if [ "${{github.event.release.prerelease}}" = "true" ]; then echo 'closeSonatypeStagingRepository'; else echo 'closeAndReleaseSonatypeStagingRepository'; fi) \ + ./gradlew publishToSonatype $(if [ "${{github.event.release.prerelease}}" = "true" ]; then echo 'closeAndReleaseSonatypeStagingRepository'; else echo 'closeAndReleaseSonatypeStagingRepository'; fi) \ -PlibraryVersion=$VERSION \ -Psigning.keyId=69C08EA0 -Psigning.password="${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}" -Psigning.secretKeyRingFile=$GITHUB_WORKSPACE/release.gpg \ --info From b5e07e9308916c344b7e130386fd44695061750b Mon Sep 17 00:00:00 2001 From: Robert Chaing Date: Thu, 6 Jul 2023 15:00:44 -0700 Subject: [PATCH 7/8] gradle cleanup --- .github/workflows/publish-client.yml | 2 +- build.gradle.kts | 12 ++++++------ client/build.gradle.kts | 4 ---- common/build.gradle.kts | 6 ------ proto/build.gradle.kts | 4 ---- repository/build.gradle.kts | 7 ------- service/build.gradle.kts | 9 --------- 7 files changed, 7 insertions(+), 37 deletions(-) diff --git a/.github/workflows/publish-client.yml b/.github/workflows/publish-client.yml index e29247c2..5ac64ee4 100644 --- a/.github/workflows/publish-client.yml +++ b/.github/workflows/publish-client.yml @@ -44,7 +44,7 @@ jobs: - name: Publish to Maven Central run: | - ./gradlew publishToSonatype $(if [ "${{github.event.release.prerelease}}" = "true" ]; then echo 'closeAndReleaseSonatypeStagingRepository'; else echo 'closeAndReleaseSonatypeStagingRepository'; fi) \ + ./gradlew publishToSonatype $(if [ "${{github.event.release.prerelease}}" = "true" ]; then echo 'closeSonatypeStagingRepository'; else echo 'closeAndReleaseSonatypeStagingRepository'; fi) \ -PlibraryVersion=$VERSION \ -Psigning.keyId=69C08EA0 -Psigning.password="${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}" -Psigning.secretKeyRingFile=$GITHUB_WORKSPACE/release.gpg \ --info diff --git a/build.gradle.kts b/build.gradle.kts index ea5778b7..58499f2b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,16 +11,16 @@ plugins { id("org.openapi.generator") version "5.4.0" } -group = "tech.figure.aggregate" -version = "0.0.1-SNAPSHOT" val javaVersion = JavaVersion.VERSION_17 java.sourceCompatibility = javaVersion java.targetCompatibility = javaVersion -repositories { - mavenLocal() - mavenCentral() - maven( url = "https://jitpack.io") +allprojects { + repositories { + mavenLocal() + mavenCentral() + maven(url = "https://jitpack.io") + } } dependencies { diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 582fcc43..9b080ded 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -5,10 +5,6 @@ plugins{ idea } -repositories { - mavenCentral() -} - dependencies { api(projects.proto) api(libs.bundles.grpc) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index e1c12731..11b6821d 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -4,16 +4,10 @@ plugins { idea } -group = "tech.figure.aggregate" -version = "0.0.1-SNAPSHOT" val javaTarget = JavaVersion.VERSION_17 java.sourceCompatibility = javaTarget java.targetCompatibility = javaTarget -repositories { - mavenCentral() -} - dependencies { implementation(project(":proto")) implementation(libs.bundles.kotlin) diff --git a/proto/build.gradle.kts b/proto/build.gradle.kts index 01978395..85d70b8f 100644 --- a/proto/build.gradle.kts +++ b/proto/build.gradle.kts @@ -9,10 +9,6 @@ plugins { `maven-publish` } -repositories { - mavenCentral() -} - dependencies { implementation(libs.bundles.grpc) implementation(libs.bundles.protobuf) diff --git a/repository/build.gradle.kts b/repository/build.gradle.kts index 35cd213c..0e5d4f0e 100644 --- a/repository/build.gradle.kts +++ b/repository/build.gradle.kts @@ -4,17 +4,10 @@ plugins { idea } -group = "tech.figure.aggregate" -version = "0.0.1-SNAPSHOT" val javaTarget = JavaVersion.VERSION_17 java.sourceCompatibility = javaTarget java.targetCompatibility = javaTarget -repositories { - mavenCentral() - maven { url = uri("https://s01.oss.sonatype.org/content/groups/staging/") } -} - dependencies { implementation(projects.common) diff --git a/service/build.gradle.kts b/service/build.gradle.kts index 3c935e9b..1be1d168 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts @@ -1,4 +1,3 @@ - plugins { kotlin("jvm") kotlin("plugin.serialization").version("1.8.21") @@ -7,20 +6,12 @@ plugins { idea } -group = "tech.figure.aggregate" -version = "0.0.1-SNAPSHOT" java.sourceCompatibility = JavaVersion.VERSION_17 application { mainClass.set("tech.figure.aggregator.api.ApplicationKt") } -repositories { - mavenLocal() - mavenCentral() - maven( url = "https://jitpack.io") -} - kotlin { jvmToolchain(17) } From d930b2aa4ebb21c99e633e8b577e9455ac565ecc Mon Sep 17 00:00:00 2001 From: Robert Chaing Date: Fri, 7 Jul 2023 08:19:30 -0700 Subject: [PATCH 8/8] developer metadata --- build.gradle.kts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 58499f2b..bcce5ecf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -149,6 +149,14 @@ subprojects { } } + developers { + developer { + id.set("FigureTechnologies") + name.set("Figure Technologies") + email.set("tech@figure.com") + } + } + scm { connection.set("git@github.com:FigureTechnologies/aggregate-service.git") developerConnection.set("git@github.com:FigureTechnologies/aggregate-service.git")