try with dependency resolution

solana-mobile · Jun 11, 2024 · 9ac3c12 · 9ac3c12
1 parent a244423
commit 9ac3c12
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,13 @@ plugins {
     alias(libs.plugins.publish) apply false
 }
 
+configurations.all {
+    resolutionStrategy.dependencySubstitution {
+        substitute(module("com.solanamobile:web3-core")).using(project(":core"))
+        substitute(module("com.solanamobile:web3-solana")).using(project(":solana"))
+    }
+}
+
 //tasks.register("clean", Delete::class) {
 //    delete(rootProject.buildDir)
 //}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/solana/build.gradle.kts b/solana/build.gradle.kts
@@ -6,6 +6,8 @@ plugins {
 
 val artifactIdPrefix: String by project
 val moduleArtifactId = "$artifactIdPrefix-solana"
+val buildDir = layout.buildDirectory.asFile.get()
+val generatedDir = "${buildDir}/generated/src/commonTest/kotlin"
 
 kotlin {
     jvmToolchain(11)
@@ -36,7 +38,7 @@ kotlin {
             }
         }
         val commonTest by getting {
-            kotlin.srcDir(File("${buildDir}/generated/src/commonTest/kotlin"))
+            kotlin.srcDir(File(generatedDir))
             dependencies {
                 implementation(libs.kotlin.test)
                 implementation(libs.kotlinx.coroutines.test)
@@ -63,7 +65,7 @@ afterEvaluate {
     val localRpcUrl = project.properties["testing.rpc.localUrl"]
     if (useLocalValidator && localRpcUrl != null) rpcUrl = localRpcUrl
 
-    val dir = "${buildDir}/generated/src/commonTest/kotlin/com/solana/config"
+    val dir = "${generatedDir}/com/solana/config"
     mkdir(dir)
     File(dir, "TestConfig.kt").writeText(
         """