Merge pull request #5 from solana-mobile/revert-4-fix-artifact-naming

Revert "correct artifact ids"
solana-mobile · Jan 10, 2024 · 7e46972 · 7e46972
2 parents 3387263 + 2504456
commit 7e46972
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.js.compiler=ir
 # Group name and project version, used when publishing. For official releases, the version should be
 # provided to Gradle via '-P version="1.0"'.
 group=com.solanamobile
-artifactIdPrefix=rpc
+artifactId=rpc-core
 version=main-SNAPSHOT
 
 SONATYPE_HOST=S01

diff --git a/okiodriver/build.gradle.kts b/okiodriver/build.gradle.kts
@@ -3,8 +3,8 @@ plugins {
     id("com.vanniktech.maven.publish")
 }
 
-val artifactIdPrefix: String by project
-val moduleArtifactId = "$artifactIdPrefix-core"
+val artifactId: String by project
+val moduleArtifactId = "$artifactId-okiodriver"
 
 kotlin {
     jvm {

diff --git a/rpccore/build.gradle.kts b/rpccore/build.gradle.kts
@@ -4,8 +4,7 @@ plugins {
     id("com.vanniktech.maven.publish")
 }
 
-val artifactIdPrefix: String by project
-val moduleArtifactId = "$artifactIdPrefix-core"
+val artifactId: String by project
 
 kotlin {
     jvm {
@@ -23,7 +22,7 @@ kotlin {
         macosArm64()
     ).forEach {
         it.binaries.framework {
-            baseName = moduleArtifactId
+            baseName = artifactId
         }
     }
 //    js(BOTH) {
@@ -66,5 +65,5 @@ kotlin {
 }
 
 mavenPublishing {
-    coordinates(group as String, moduleArtifactId, version as String)
+    coordinates(group as String, artifactId, version as String)
 }