From 0c1a9d7f1d4b8d4ed95fd2d7817160c2e0516542 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Mon, 14 Nov 2022 08:56:17 -0500 Subject: [PATCH] Move all bdk-kotlin into subdirectory to prepare for ffi merge Signed-off-by: thunderbiscuit --- bdk-ffi | 1 - .editorconfig => bdk-kotlin/.editorconfig | 0 .gitignore => bdk-kotlin/.gitignore | 0 .gitmodules => bdk-kotlin/.gitmodules | 0 LICENSE => bdk-kotlin/LICENSE | 0 LICENSE-APACHE => bdk-kotlin/LICENSE-APACHE | 0 LICENSE-MIT => bdk-kotlin/LICENSE-MIT | 0 .../PGP-BDK-BINDINGS.asc | 0 README.md => bdk-kotlin/README.md | 0 {api-docs => bdk-kotlin/api-docs}/Module1.md | 0 {api-docs => bdk-kotlin/api-docs}/Module2.md | 0 .../api-docs}/build.gradle.kts | 26 +++++++++--------- {api-docs => bdk-kotlin/api-docs}/deploy.sh | 0 .../api-docs}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {api-docs => bdk-kotlin/api-docs}/gradlew | 0 {api-docs => bdk-kotlin/api-docs}/gradlew.bat | 0 .../api-docs}/settings.gradle.kts | 0 .../src/main/kotlin/org/bitcoindevkit/bdk.kt | 0 .../test/kotlin/org/bitcoindevkit/Samples.kt | 0 .../bdk-android}/build.gradle.kts | 0 .../bdk-android}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../bdk-android}/gradlew | 0 .../bdk-android}/gradlew.bat | 0 .../bdk-android}/lib/build.gradle.kts | 0 .../bdk-android}/lib/proguard-rules.pro | 0 .../lib/src/androidTest/assets/logback.xml | 0 .../org/bitcoindevkit/AndroidLibTest.kt | 0 .../lib/src/main/AndroidManifest.xml | 0 .../bdk-android}/plugins/README.md | 0 .../bdk-android}/plugins/build.gradle.kts | 0 .../bdk-android}/plugins/settings.gradle.kts | 0 .../kotlin/org/bitcoindevkit/plugins/Enums.kt | 0 .../plugins/UniFfiAndroidPlugin.kt | 0 .../bdk-android}/settings.gradle.kts | 0 .../bdk-jvm}/build.gradle.kts | 0 .../bdk-jvm}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {bdk-jvm => bdk-kotlin/bdk-jvm}/gradlew | 0 {bdk-jvm => bdk-kotlin/bdk-jvm}/gradlew.bat | 0 .../bdk-jvm}/lib/build.gradle.kts | 0 .../kotlin/org/bitcoindevkit/JvmLibTest.kt | 0 .../bdk-jvm}/plugins/README.md | 0 .../bdk-jvm}/plugins/build.gradle.kts | 0 .../bdk-jvm}/plugins/settings.gradle.kts | 0 .../kotlin/org/bitcoindevkit/plugins/Enums.kt | 0 .../bitcoindevkit/plugins/UniFfiJvmPlugin.kt | 0 .../bdk-jvm}/settings.gradle.kts | 0 52 files changed, 13 insertions(+), 14 deletions(-) delete mode 160000 bdk-ffi rename .editorconfig => bdk-kotlin/.editorconfig (100%) rename .gitignore => bdk-kotlin/.gitignore (100%) rename .gitmodules => bdk-kotlin/.gitmodules (100%) rename LICENSE => bdk-kotlin/LICENSE (100%) rename LICENSE-APACHE => bdk-kotlin/LICENSE-APACHE (100%) rename LICENSE-MIT => bdk-kotlin/LICENSE-MIT (100%) rename PGP-BDK-BINDINGS.asc => bdk-kotlin/PGP-BDK-BINDINGS.asc (100%) rename README.md => bdk-kotlin/README.md (100%) rename {api-docs => bdk-kotlin/api-docs}/Module1.md (100%) rename {api-docs => bdk-kotlin/api-docs}/Module2.md (100%) rename {api-docs => bdk-kotlin/api-docs}/build.gradle.kts (84%) rename {api-docs => bdk-kotlin/api-docs}/deploy.sh (100%) rename {api-docs => bdk-kotlin/api-docs}/gradle.properties (100%) rename {api-docs => bdk-kotlin/api-docs}/gradle/wrapper/gradle-wrapper.jar (100%) rename {api-docs => bdk-kotlin/api-docs}/gradle/wrapper/gradle-wrapper.properties (100%) rename {api-docs => bdk-kotlin/api-docs}/gradlew (100%) rename {api-docs => bdk-kotlin/api-docs}/gradlew.bat (100%) rename {api-docs => bdk-kotlin/api-docs}/settings.gradle.kts (100%) rename {api-docs => bdk-kotlin/api-docs}/src/main/kotlin/org/bitcoindevkit/bdk.kt (100%) rename {api-docs => bdk-kotlin/api-docs}/src/test/kotlin/org/bitcoindevkit/Samples.kt (100%) rename {bdk-android => bdk-kotlin/bdk-android}/build.gradle.kts (100%) rename {bdk-android => bdk-kotlin/bdk-android}/gradle.properties (100%) rename {bdk-android => bdk-kotlin/bdk-android}/gradle/wrapper/gradle-wrapper.jar (100%) rename {bdk-android => bdk-kotlin/bdk-android}/gradle/wrapper/gradle-wrapper.properties (100%) rename {bdk-android => bdk-kotlin/bdk-android}/gradlew (100%) rename {bdk-android => bdk-kotlin/bdk-android}/gradlew.bat (100%) rename {bdk-android => bdk-kotlin/bdk-android}/lib/build.gradle.kts (100%) rename {bdk-android => bdk-kotlin/bdk-android}/lib/proguard-rules.pro (100%) rename {bdk-android => bdk-kotlin/bdk-android}/lib/src/androidTest/assets/logback.xml (100%) rename {bdk-android => bdk-kotlin/bdk-android}/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt (100%) rename {bdk-android => bdk-kotlin/bdk-android}/lib/src/main/AndroidManifest.xml (100%) rename {bdk-android => bdk-kotlin/bdk-android}/plugins/README.md (100%) rename {bdk-android => bdk-kotlin/bdk-android}/plugins/build.gradle.kts (100%) rename {bdk-android => bdk-kotlin/bdk-android}/plugins/settings.gradle.kts (100%) rename {bdk-android => bdk-kotlin/bdk-android}/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt (100%) rename {bdk-android => bdk-kotlin/bdk-android}/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt (100%) rename {bdk-android => bdk-kotlin/bdk-android}/settings.gradle.kts (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/build.gradle.kts (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/gradle.properties (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/gradle/wrapper/gradle-wrapper.jar (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/gradle/wrapper/gradle-wrapper.properties (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/gradlew (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/gradlew.bat (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/lib/build.gradle.kts (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/plugins/README.md (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/plugins/build.gradle.kts (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/plugins/settings.gradle.kts (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt (100%) rename {bdk-jvm => bdk-kotlin/bdk-jvm}/settings.gradle.kts (100%) diff --git a/bdk-ffi b/bdk-ffi deleted file mode 160000 index 0648075..0000000 --- a/bdk-ffi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0648075555b86365e2408fab484782a2b793b545 diff --git a/.editorconfig b/bdk-kotlin/.editorconfig similarity index 100% rename from .editorconfig rename to bdk-kotlin/.editorconfig diff --git a/.gitignore b/bdk-kotlin/.gitignore similarity index 100% rename from .gitignore rename to bdk-kotlin/.gitignore diff --git a/.gitmodules b/bdk-kotlin/.gitmodules similarity index 100% rename from .gitmodules rename to bdk-kotlin/.gitmodules diff --git a/LICENSE b/bdk-kotlin/LICENSE similarity index 100% rename from LICENSE rename to bdk-kotlin/LICENSE diff --git a/LICENSE-APACHE b/bdk-kotlin/LICENSE-APACHE similarity index 100% rename from LICENSE-APACHE rename to bdk-kotlin/LICENSE-APACHE diff --git a/LICENSE-MIT b/bdk-kotlin/LICENSE-MIT similarity index 100% rename from LICENSE-MIT rename to bdk-kotlin/LICENSE-MIT diff --git a/PGP-BDK-BINDINGS.asc b/bdk-kotlin/PGP-BDK-BINDINGS.asc similarity index 100% rename from PGP-BDK-BINDINGS.asc rename to bdk-kotlin/PGP-BDK-BINDINGS.asc diff --git a/README.md b/bdk-kotlin/README.md similarity index 100% rename from README.md rename to bdk-kotlin/README.md diff --git a/api-docs/Module1.md b/bdk-kotlin/api-docs/Module1.md similarity index 100% rename from api-docs/Module1.md rename to bdk-kotlin/api-docs/Module1.md diff --git a/api-docs/Module2.md b/bdk-kotlin/api-docs/Module2.md similarity index 100% rename from api-docs/Module2.md rename to bdk-kotlin/api-docs/Module2.md diff --git a/api-docs/build.gradle.kts b/bdk-kotlin/api-docs/build.gradle.kts similarity index 84% rename from api-docs/build.gradle.kts rename to bdk-kotlin/api-docs/build.gradle.kts index bbd6ed7..b969511 100644 --- a/api-docs/build.gradle.kts +++ b/bdk-kotlin/api-docs/build.gradle.kts @@ -23,24 +23,24 @@ tasks.withType { kotlinOptions.jvmTarget = "1.8" } -tasks.withType().configureEach { - dokkaSourceSets { - named("main") { - moduleName.set("bdk-android") - moduleVersion.set("0.11.0") - includes.from("Module1.md") - samples.from("src/test/kotlin/org/bitcoindevkit/Samples.kt") - } - } -} - // tasks.withType().configureEach { // dokkaSourceSets { // named("main") { -// moduleName.set("bdk-jvm") +// moduleName.set("bdk-android") // moduleVersion.set("0.11.0") -// includes.from("Module2.md") +// includes.from("Module1.md") // samples.from("src/test/kotlin/org/bitcoindevkit/Samples.kt") // } // } // } + +tasks.withType().configureEach { + dokkaSourceSets { + named("main") { + moduleName.set("bdk-jvm") + moduleVersion.set("0.11.0") + includes.from("Module2.md") + samples.from("src/test/kotlin/org/bitcoindevkit/Samples.kt") + } + } +} diff --git a/api-docs/deploy.sh b/bdk-kotlin/api-docs/deploy.sh similarity index 100% rename from api-docs/deploy.sh rename to bdk-kotlin/api-docs/deploy.sh diff --git a/api-docs/gradle.properties b/bdk-kotlin/api-docs/gradle.properties similarity index 100% rename from api-docs/gradle.properties rename to bdk-kotlin/api-docs/gradle.properties diff --git a/api-docs/gradle/wrapper/gradle-wrapper.jar b/bdk-kotlin/api-docs/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from api-docs/gradle/wrapper/gradle-wrapper.jar rename to bdk-kotlin/api-docs/gradle/wrapper/gradle-wrapper.jar diff --git a/api-docs/gradle/wrapper/gradle-wrapper.properties b/bdk-kotlin/api-docs/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from api-docs/gradle/wrapper/gradle-wrapper.properties rename to bdk-kotlin/api-docs/gradle/wrapper/gradle-wrapper.properties diff --git a/api-docs/gradlew b/bdk-kotlin/api-docs/gradlew similarity index 100% rename from api-docs/gradlew rename to bdk-kotlin/api-docs/gradlew diff --git a/api-docs/gradlew.bat b/bdk-kotlin/api-docs/gradlew.bat similarity index 100% rename from api-docs/gradlew.bat rename to bdk-kotlin/api-docs/gradlew.bat diff --git a/api-docs/settings.gradle.kts b/bdk-kotlin/api-docs/settings.gradle.kts similarity index 100% rename from api-docs/settings.gradle.kts rename to bdk-kotlin/api-docs/settings.gradle.kts diff --git a/api-docs/src/main/kotlin/org/bitcoindevkit/bdk.kt b/bdk-kotlin/api-docs/src/main/kotlin/org/bitcoindevkit/bdk.kt similarity index 100% rename from api-docs/src/main/kotlin/org/bitcoindevkit/bdk.kt rename to bdk-kotlin/api-docs/src/main/kotlin/org/bitcoindevkit/bdk.kt diff --git a/api-docs/src/test/kotlin/org/bitcoindevkit/Samples.kt b/bdk-kotlin/api-docs/src/test/kotlin/org/bitcoindevkit/Samples.kt similarity index 100% rename from api-docs/src/test/kotlin/org/bitcoindevkit/Samples.kt rename to bdk-kotlin/api-docs/src/test/kotlin/org/bitcoindevkit/Samples.kt diff --git a/bdk-android/build.gradle.kts b/bdk-kotlin/bdk-android/build.gradle.kts similarity index 100% rename from bdk-android/build.gradle.kts rename to bdk-kotlin/bdk-android/build.gradle.kts diff --git a/bdk-android/gradle.properties b/bdk-kotlin/bdk-android/gradle.properties similarity index 100% rename from bdk-android/gradle.properties rename to bdk-kotlin/bdk-android/gradle.properties diff --git a/bdk-android/gradle/wrapper/gradle-wrapper.jar b/bdk-kotlin/bdk-android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from bdk-android/gradle/wrapper/gradle-wrapper.jar rename to bdk-kotlin/bdk-android/gradle/wrapper/gradle-wrapper.jar diff --git a/bdk-android/gradle/wrapper/gradle-wrapper.properties b/bdk-kotlin/bdk-android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from bdk-android/gradle/wrapper/gradle-wrapper.properties rename to bdk-kotlin/bdk-android/gradle/wrapper/gradle-wrapper.properties diff --git a/bdk-android/gradlew b/bdk-kotlin/bdk-android/gradlew similarity index 100% rename from bdk-android/gradlew rename to bdk-kotlin/bdk-android/gradlew diff --git a/bdk-android/gradlew.bat b/bdk-kotlin/bdk-android/gradlew.bat similarity index 100% rename from bdk-android/gradlew.bat rename to bdk-kotlin/bdk-android/gradlew.bat diff --git a/bdk-android/lib/build.gradle.kts b/bdk-kotlin/bdk-android/lib/build.gradle.kts similarity index 100% rename from bdk-android/lib/build.gradle.kts rename to bdk-kotlin/bdk-android/lib/build.gradle.kts diff --git a/bdk-android/lib/proguard-rules.pro b/bdk-kotlin/bdk-android/lib/proguard-rules.pro similarity index 100% rename from bdk-android/lib/proguard-rules.pro rename to bdk-kotlin/bdk-android/lib/proguard-rules.pro diff --git a/bdk-android/lib/src/androidTest/assets/logback.xml b/bdk-kotlin/bdk-android/lib/src/androidTest/assets/logback.xml similarity index 100% rename from bdk-android/lib/src/androidTest/assets/logback.xml rename to bdk-kotlin/bdk-android/lib/src/androidTest/assets/logback.xml diff --git a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt b/bdk-kotlin/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt similarity index 100% rename from bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt rename to bdk-kotlin/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt diff --git a/bdk-android/lib/src/main/AndroidManifest.xml b/bdk-kotlin/bdk-android/lib/src/main/AndroidManifest.xml similarity index 100% rename from bdk-android/lib/src/main/AndroidManifest.xml rename to bdk-kotlin/bdk-android/lib/src/main/AndroidManifest.xml diff --git a/bdk-android/plugins/README.md b/bdk-kotlin/bdk-android/plugins/README.md similarity index 100% rename from bdk-android/plugins/README.md rename to bdk-kotlin/bdk-android/plugins/README.md diff --git a/bdk-android/plugins/build.gradle.kts b/bdk-kotlin/bdk-android/plugins/build.gradle.kts similarity index 100% rename from bdk-android/plugins/build.gradle.kts rename to bdk-kotlin/bdk-android/plugins/build.gradle.kts diff --git a/bdk-android/plugins/settings.gradle.kts b/bdk-kotlin/bdk-android/plugins/settings.gradle.kts similarity index 100% rename from bdk-android/plugins/settings.gradle.kts rename to bdk-kotlin/bdk-android/plugins/settings.gradle.kts diff --git a/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt b/bdk-kotlin/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt similarity index 100% rename from bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt rename to bdk-kotlin/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt diff --git a/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt b/bdk-kotlin/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt similarity index 100% rename from bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt rename to bdk-kotlin/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt diff --git a/bdk-android/settings.gradle.kts b/bdk-kotlin/bdk-android/settings.gradle.kts similarity index 100% rename from bdk-android/settings.gradle.kts rename to bdk-kotlin/bdk-android/settings.gradle.kts diff --git a/bdk-jvm/build.gradle.kts b/bdk-kotlin/bdk-jvm/build.gradle.kts similarity index 100% rename from bdk-jvm/build.gradle.kts rename to bdk-kotlin/bdk-jvm/build.gradle.kts diff --git a/bdk-jvm/gradle.properties b/bdk-kotlin/bdk-jvm/gradle.properties similarity index 100% rename from bdk-jvm/gradle.properties rename to bdk-kotlin/bdk-jvm/gradle.properties diff --git a/bdk-jvm/gradle/wrapper/gradle-wrapper.jar b/bdk-kotlin/bdk-jvm/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from bdk-jvm/gradle/wrapper/gradle-wrapper.jar rename to bdk-kotlin/bdk-jvm/gradle/wrapper/gradle-wrapper.jar diff --git a/bdk-jvm/gradle/wrapper/gradle-wrapper.properties b/bdk-kotlin/bdk-jvm/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from bdk-jvm/gradle/wrapper/gradle-wrapper.properties rename to bdk-kotlin/bdk-jvm/gradle/wrapper/gradle-wrapper.properties diff --git a/bdk-jvm/gradlew b/bdk-kotlin/bdk-jvm/gradlew similarity index 100% rename from bdk-jvm/gradlew rename to bdk-kotlin/bdk-jvm/gradlew diff --git a/bdk-jvm/gradlew.bat b/bdk-kotlin/bdk-jvm/gradlew.bat similarity index 100% rename from bdk-jvm/gradlew.bat rename to bdk-kotlin/bdk-jvm/gradlew.bat diff --git a/bdk-jvm/lib/build.gradle.kts b/bdk-kotlin/bdk-jvm/lib/build.gradle.kts similarity index 100% rename from bdk-jvm/lib/build.gradle.kts rename to bdk-kotlin/bdk-jvm/lib/build.gradle.kts diff --git a/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt b/bdk-kotlin/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt similarity index 100% rename from bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt rename to bdk-kotlin/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt diff --git a/bdk-jvm/plugins/README.md b/bdk-kotlin/bdk-jvm/plugins/README.md similarity index 100% rename from bdk-jvm/plugins/README.md rename to bdk-kotlin/bdk-jvm/plugins/README.md diff --git a/bdk-jvm/plugins/build.gradle.kts b/bdk-kotlin/bdk-jvm/plugins/build.gradle.kts similarity index 100% rename from bdk-jvm/plugins/build.gradle.kts rename to bdk-kotlin/bdk-jvm/plugins/build.gradle.kts diff --git a/bdk-jvm/plugins/settings.gradle.kts b/bdk-kotlin/bdk-jvm/plugins/settings.gradle.kts similarity index 100% rename from bdk-jvm/plugins/settings.gradle.kts rename to bdk-kotlin/bdk-jvm/plugins/settings.gradle.kts diff --git a/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt b/bdk-kotlin/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt similarity index 100% rename from bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt rename to bdk-kotlin/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt diff --git a/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt b/bdk-kotlin/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt similarity index 100% rename from bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt rename to bdk-kotlin/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt diff --git a/bdk-jvm/settings.gradle.kts b/bdk-kotlin/bdk-jvm/settings.gradle.kts similarity index 100% rename from bdk-jvm/settings.gradle.kts rename to bdk-kotlin/bdk-jvm/settings.gradle.kts