Merge pull request #146 from FigureTechnologies/maven_publish_fix

Fix publishing to maven and gradle cleanup
FigureTechnologies · Jul 7, 2023 · 7914327 · 7914327
2 parents 5c339c0 + d930b2a
commit 7914327
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 55 deletions.
diff --git 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

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,26 +11,15 @@ 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 {
-    mavenCentral()
-    maven( url = "https://jitpack.io")
-}
-
-nexusPublishing {
+allprojects {
     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
-        }
+        mavenLocal()
+        mavenCentral()
+        maven(url = "https://jitpack.io")
     }
 }
 
@@ -160,6 +149,14 @@ subprojects {
                         }
                     }
 
+                    developers {
+                        developer {
+                            id.set("FigureTechnologies")
+                            name.set("Figure Technologies")
+                            email.set("[email protected]")
+                        }
+                    }
+
                     scm {
                         connection.set("[email protected]:FigureTechnologies/aggregate-service.git")
                         developerConnection.set("[email protected]:FigureTechnologies/aggregate-service.git")
@@ -169,14 +166,23 @@ subprojects {
             }
         }
         signing {
-            setRequired {
-                gradle.taskGraph.allTasks.any { it is PublishToMavenLocal }
-            }
             sign(publishing.publications["maven"])
         }
     }
 }
 
+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
@@ -1,18 +1,10 @@
 plugins{
     kotlin("jvm") version "1.8.21"
     `maven-publish`
-    signing
     java
     idea
 }
 
-group = "tech.figure.aggregate.client"
-version = "1.0-SNAPSHOT"
-
-repositories {
-    mavenCentral()
-}
-
 dependencies {
     api(projects.proto)
     api(libs.bundles.grpc)

diff --git 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
@@ -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
@@ -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
@@ -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)
 }

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
@@ -120,15 +120,14 @@ fun Flow<MarkerSupply>.toMarkerSupplyStreamResponse(): Flow<StreamResponse> =
         StreamResponse.newBuilder()
             .setMarkerSupply(data)
             .build()
-
     }
 
 fun Flow<MarkerTransfer>.toMarkerTransferStreamResponse(): Flow<StreamResponse> =
     this.map {
         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)