Move gradle-tasks module to bitcoind module

bisq-network · Sep 13, 2024 · 35e05d7 · 35e05d7
1 parent df1129a
commit 35e05d7
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 7 deletions.
diff --git a/build-logic/bitcoin-core-binaries/build.gradle.kts b/build-logic/bitcoin-core-binaries/build.gradle.kts
@@ -17,6 +17,6 @@ gradlePlugin {
 }
 
 dependencies {
-    implementation(project(":gradle-tasks"))
+    implementation("bitcoind-build-logic:gradle-tasks")
     implementation(libs.google.guava)
 }
diff --git a/build-logic/electrum-binaries/build.gradle.kts b/build-logic/electrum-binaries/build.gradle.kts
@@ -17,5 +17,5 @@ gradlePlugin {
 }
 
 dependencies {
-    implementation(project(":gradle-tasks"))
+    implementation("bitcoind-build-logic:gradle-tasks")
 }
diff --git a/build-logic/packaging/build.gradle.kts b/build-logic/packaging/build.gradle.kts
@@ -17,7 +17,7 @@ gradlePlugin {
 }
 
 dependencies {
-    implementation(project(":gradle-tasks"))
     implementation(project(":commons"))
+    implementation("bitcoind-build-logic:gradle-tasks")
     implementation(libs.commons.codec)
 }
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -6,10 +6,13 @@ dependencyResolutionManagement {
     }
 }
 
+includeBuild("../wallets/bitcoind/build-logic") {
+    name = "bitcoind-build-logic"
+}
+
 include("commons")
 include("bitcoin-core-binaries")
 include("desktop-regtest")
-include("gradle-tasks")
 include("electrum-binaries")
 include("packaging")
 include("tor-binary")

diff --git a/build-logic/tor-binary/build.gradle.kts b/build-logic/tor-binary/build.gradle.kts
@@ -17,5 +17,5 @@ gradlePlugin {
 }
 
 dependencies {
-    implementation(project(":gradle-tasks"))
+    implementation("bitcoind-build-logic:gradle-tasks")
 }
diff --git a/build-logic/webcam-app/build.gradle.kts b/build-logic/webcam-app/build.gradle.kts
@@ -18,5 +18,5 @@ gradlePlugin {
 }
 
 dependencies {
-    implementation(project(":gradle-tasks"))
+    implementation("bitcoind-build-logic:gradle-tasks")
 }
diff --git a/build-logic/gradle-tasks/build.gradle.kts → ...build-logic/gradle-tasks/build.gradle.kts b/build-logic/gradle-tasks/build.gradle.kts → ...build-logic/gradle-tasks/build.gradle.kts
diff --git a/...kotlin/bisq/gradle/common/Architecture.kt → ...kotlin/bisq/gradle/common/Architecture.kt b/...kotlin/bisq/gradle/common/Architecture.kt → ...kotlin/bisq/gradle/common/Architecture.kt
diff --git a/.../src/main/kotlin/bisq/gradle/common/OS.kt → .../src/main/kotlin/bisq/gradle/common/OS.kt b/.../src/main/kotlin/bisq/gradle/common/OS.kt → .../src/main/kotlin/bisq/gradle/common/OS.kt
diff --git a/...ain/kotlin/bisq/gradle/common/Platform.kt → ...ain/kotlin/bisq/gradle/common/Platform.kt b/...ain/kotlin/bisq/gradle/common/Platform.kt → ...ain/kotlin/bisq/gradle/common/Platform.kt
diff --git a/...s/src/main/kotlin/bisq/gradle/tasks/OS.kt → ...s/src/main/kotlin/bisq/gradle/tasks/OS.kt b/...s/src/main/kotlin/bisq/gradle/tasks/OS.kt → ...s/src/main/kotlin/bisq/gradle/tasks/OS.kt
diff --git a/...sq/gradle/tasks/PerPlatformUrlProvider.kt → ...sq/gradle/tasks/PerPlatformUrlProvider.kt b/...sq/gradle/tasks/PerPlatformUrlProvider.kt → ...sq/gradle/tasks/PerPlatformUrlProvider.kt
diff --git a/...otlin/bisq/gradle/tasks/PgpFingerprint.kt → ...otlin/bisq/gradle/tasks/PgpFingerprint.kt b/...otlin/bisq/gradle/tasks/PgpFingerprint.kt → ...otlin/bisq/gradle/tasks/PgpFingerprint.kt
diff --git a/...n/kotlin/bisq/gradle/tasks/VersionUtil.kt → ...n/kotlin/bisq/gradle/tasks/VersionUtil.kt b/...n/kotlin/bisq/gradle/tasks/VersionUtil.kt → ...n/kotlin/bisq/gradle/tasks/VersionUtil.kt
diff --git a/...isq/gradle/tasks/download/DownloadTask.kt → ...isq/gradle/tasks/download/DownloadTask.kt b/...isq/gradle/tasks/download/DownloadTask.kt → ...isq/gradle/tasks/download/DownloadTask.kt
diff --git a/...dle/tasks/download/DownloadTaskFactory.kt → ...dle/tasks/download/DownloadTaskFactory.kt b/...dle/tasks/download/DownloadTaskFactory.kt → ...dle/tasks/download/DownloadTaskFactory.kt
diff --git a/.../tasks/download/SignedBinaryDownloader.kt → .../tasks/download/SignedBinaryDownloader.kt b/.../tasks/download/SignedBinaryDownloader.kt → .../tasks/download/SignedBinaryDownloader.kt
diff --git a/...dle/tasks/signature/PpgPublicKeyParser.kt → ...dle/tasks/signature/PpgPublicKeyParser.kt b/...dle/tasks/signature/PpgPublicKeyParser.kt → ...dle/tasks/signature/PpgPublicKeyParser.kt
diff --git a/...ks/signature/SignatureVerificationTask.kt → ...ks/signature/SignatureVerificationTask.kt b/...ks/signature/SignatureVerificationTask.kt → ...ks/signature/SignatureVerificationTask.kt
diff --git a/...adle/tasks/signature/SignatureVerifier.kt → ...adle/tasks/signature/SignatureVerifier.kt b/...adle/tasks/signature/SignatureVerifier.kt → ...adle/tasks/signature/SignatureVerifier.kt
diff --git a/wallets/bitcoind/build-logic/gradle.properties b/wallets/bitcoind/build-logic/gradle.properties
@@ -0,0 +1 @@
+org.gradle.caching=true
diff --git a/wallets/bitcoind/build-logic/settings.gradle.kts b/wallets/bitcoind/build-logic/settings.gradle.kts
@@ -0,0 +1,11 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../../../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+include("gradle-tasks")
+
+rootProject.name = "bitcoind-build-logic"
diff --git a/wallets/bitcoind/settings.gradle.kts b/wallets/bitcoind/settings.gradle.kts
@@ -2,7 +2,10 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
     }
-    includeBuild("../../build-logic")
+    includeBuild("build-logic")
+    includeBuild("../../build-logic") {
+        name = "root-build-logic"
+    }
 }
 
 dependencyResolutionManagement {