diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 4f1c5cd..0000000 --- a/.editorconfig +++ /dev/null @@ -1,29 +0,0 @@ -root = true - -[*] -charset = utf-8 -end_of_line = lf -indent_size = 2 -indent_style = space -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false - -[*.rs] -indent_size = 4 - -[*.kt] -indent_size = 4 - -[*.gradle] -indent_size = 4 - -[tests/**/*.rs] -charset = utf-8 -end_of_line = unset -indent_size = unset -indent_style = unset -trim_trailing_whitespace = unset -insert_final_newline = unset diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml deleted file mode 100644 index 65cdb95..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: Bug Report -description: Create a report to help us improve -labels: [ "bug", "triage" ] -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to fill out this bug report! - - type: textarea - id: description - attributes: - label: Description - description: A concise description of the bug, what happened? - placeholder: What did you see... - validations: - required: true - - type: textarea - id: reproduce - attributes: - label: How to Reproduce - description: Steps or code to reproduce the behavior. - placeholder: How can we reproduce it... - validations: - required: true - - type: textarea - id: expected - attributes: - label: Expected Result - description: What did you expected to happen. - placeholder: Tell us what you were expecting... - validations: - required: true - - type: textarea - id: version - attributes: - label: Version - description: Which release version(s), commit, or branch of code do you see this bug? - placeholder: Tell us which version(s) of code you saw the bug in... - validations: - required: true - - type: checkboxes - id: artifact - attributes: - label: Artifact - description: With which artifact(s) are you seeing this bug? - options: - - label: bdk-jvm - - label: bdk-android - - type: checkboxes - id: platform - attributes: - label: Platform - description: What target platform(s) are you seeing the problem on? - options: - - label: ARM64 Android - - label: 64-bit x86 Android - - label: 32-bit x86 Android - - label: 64-bit x86 Linux (kernel 2.6.32+, glibc 2.11+) - - label: 64-bit x86 macOS (10.7+, Lion+) - - label: ARM64 macOS (11.0+, Big Sur+) - - type: textarea - id: logs - attributes: - label: Relevant log output - description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. - render: shell diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 9e5f358..0000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -blank_issues_enabled: true -contact_links: - - name: 📝 Official Documentation - url: https://bitcoindevkit.org/getting-started/ - about: Check our documentation for answers to common questions - - name: 💬 Community Chat - url: https://discord.com/invite/dstn4dQ - about: Ask general questions and get community support in real-time diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml deleted file mode 100644 index cd16c23..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Feature Request -description: Request a new feature -labels: [ "enhancement", "triage" ] -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to request and document this new feature! - - type: textarea - id: problem - attributes: - label: Problem - description: A concise description of the problem you need this new feature to solve. - placeholder: What is the problem you are trying to solve... - validations: - required: true - - type: textarea - id: description - attributes: - label: Description - description: A concise description of the new feature you need. - placeholder: What will this new feature do, how will it work... - validations: - required: true - - type: textarea - id: alternatives - attributes: - label: Alternatives - description: Describe any other alternatives you considered. - placeholder: Other ways you considered to solve your problem... - validations: - required: false diff --git a/.github/workflows/publish-android.yaml b/.github/workflows/publish-android.yaml index bb86761..76c8cd3 100644 --- a/.github/workflows/publish-android.yaml +++ b/.github/workflows/publish-android.yaml @@ -3,7 +3,7 @@ on: [workflow_dispatch] env: ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529 - # By default the new ubuntu-20.04 images use the following ANDROID_NDK_ROOT + # By default, the new ubuntu-20.04 images use the following ANDROID_NDK_ROOT # ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/25.0.8775105 jobs: diff --git a/.gitignore b/.gitignore index c91c338..dcc7919 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ target build Cargo.lock -/bindings/bdk-kotlin/local.properties .gradle wallet_db bdk_ffi_test @@ -15,3 +14,5 @@ xcuserdata .lsp .clj-kondo .idea/ +.editorconfig +*/bdk.kt diff --git a/bdk-kotlin/bdk-android/build.gradle.kts b/bdk-android/build.gradle.kts similarity index 100% rename from bdk-kotlin/bdk-android/build.gradle.kts rename to bdk-android/build.gradle.kts diff --git a/bdk-kotlin/bdk-android/gradle.properties b/bdk-android/gradle.properties similarity index 100% rename from bdk-kotlin/bdk-android/gradle.properties rename to bdk-android/gradle.properties diff --git a/bdk-kotlin/api-docs/gradle/wrapper/gradle-wrapper.jar b/bdk-android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from bdk-kotlin/api-docs/gradle/wrapper/gradle-wrapper.jar rename to bdk-android/gradle/wrapper/gradle-wrapper.jar diff --git a/bdk-kotlin/bdk-android/gradle/wrapper/gradle-wrapper.properties b/bdk-android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from bdk-kotlin/bdk-android/gradle/wrapper/gradle-wrapper.properties rename to bdk-android/gradle/wrapper/gradle-wrapper.properties diff --git a/bdk-kotlin/api-docs/gradlew b/bdk-android/gradlew similarity index 100% rename from bdk-kotlin/api-docs/gradlew rename to bdk-android/gradlew diff --git a/bdk-kotlin/api-docs/gradlew.bat b/bdk-android/gradlew.bat similarity index 100% rename from bdk-kotlin/api-docs/gradlew.bat rename to bdk-android/gradlew.bat diff --git a/bdk-kotlin/bdk-android/lib/build.gradle.kts b/bdk-android/lib/build.gradle.kts similarity index 100% rename from bdk-kotlin/bdk-android/lib/build.gradle.kts rename to bdk-android/lib/build.gradle.kts diff --git a/bdk-kotlin/bdk-android/lib/proguard-rules.pro b/bdk-android/lib/proguard-rules.pro similarity index 100% rename from bdk-kotlin/bdk-android/lib/proguard-rules.pro rename to bdk-android/lib/proguard-rules.pro diff --git a/bdk-kotlin/bdk-android/lib/src/androidTest/assets/logback.xml b/bdk-android/lib/src/androidTest/assets/logback.xml similarity index 100% rename from bdk-kotlin/bdk-android/lib/src/androidTest/assets/logback.xml rename to bdk-android/lib/src/androidTest/assets/logback.xml diff --git a/bdk-kotlin/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt similarity index 100% rename from bdk-kotlin/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt rename to bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt diff --git a/bdk-kotlin/bdk-android/lib/src/main/AndroidManifest.xml b/bdk-android/lib/src/main/AndroidManifest.xml similarity index 100% rename from bdk-kotlin/bdk-android/lib/src/main/AndroidManifest.xml rename to bdk-android/lib/src/main/AndroidManifest.xml diff --git a/bdk-kotlin/bdk-android/plugins/README.md b/bdk-android/plugins/README.md similarity index 100% rename from bdk-kotlin/bdk-android/plugins/README.md rename to bdk-android/plugins/README.md diff --git a/bdk-kotlin/bdk-android/plugins/build.gradle.kts b/bdk-android/plugins/build.gradle.kts similarity index 100% rename from bdk-kotlin/bdk-android/plugins/build.gradle.kts rename to bdk-android/plugins/build.gradle.kts diff --git a/bdk-kotlin/bdk-android/plugins/settings.gradle.kts b/bdk-android/plugins/settings.gradle.kts similarity index 100% rename from bdk-kotlin/bdk-android/plugins/settings.gradle.kts rename to bdk-android/plugins/settings.gradle.kts diff --git a/bdk-kotlin/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt b/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt similarity index 100% rename from bdk-kotlin/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt rename to bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt diff --git a/bdk-kotlin/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt b/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt similarity index 100% rename from bdk-kotlin/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt rename to bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt diff --git a/bdk-kotlin/bdk-android/settings.gradle.kts b/bdk-android/settings.gradle.kts similarity index 100% rename from bdk-kotlin/bdk-android/settings.gradle.kts rename to bdk-android/settings.gradle.kts diff --git a/bdk-kotlin/bdk-jvm/build.gradle.kts b/bdk-jvm/build.gradle.kts similarity index 100% rename from bdk-kotlin/bdk-jvm/build.gradle.kts rename to bdk-jvm/build.gradle.kts diff --git a/bdk-kotlin/bdk-jvm/gradle.properties b/bdk-jvm/gradle.properties similarity index 100% rename from bdk-kotlin/bdk-jvm/gradle.properties rename to bdk-jvm/gradle.properties diff --git a/bdk-kotlin/bdk-android/gradle/wrapper/gradle-wrapper.jar b/bdk-jvm/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from bdk-kotlin/bdk-android/gradle/wrapper/gradle-wrapper.jar rename to bdk-jvm/gradle/wrapper/gradle-wrapper.jar diff --git a/bdk-kotlin/bdk-jvm/gradle/wrapper/gradle-wrapper.properties b/bdk-jvm/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from bdk-kotlin/bdk-jvm/gradle/wrapper/gradle-wrapper.properties rename to bdk-jvm/gradle/wrapper/gradle-wrapper.properties diff --git a/bdk-kotlin/bdk-android/gradlew b/bdk-jvm/gradlew similarity index 100% rename from bdk-kotlin/bdk-android/gradlew rename to bdk-jvm/gradlew diff --git a/bdk-kotlin/bdk-android/gradlew.bat b/bdk-jvm/gradlew.bat similarity index 100% rename from bdk-kotlin/bdk-android/gradlew.bat rename to bdk-jvm/gradlew.bat diff --git a/bdk-kotlin/bdk-jvm/lib/build.gradle.kts b/bdk-jvm/lib/build.gradle.kts similarity index 100% rename from bdk-kotlin/bdk-jvm/lib/build.gradle.kts rename to bdk-jvm/lib/build.gradle.kts diff --git a/bdk-kotlin/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt similarity index 100% rename from bdk-kotlin/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt rename to bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt diff --git a/bdk-kotlin/bdk-jvm/plugins/README.md b/bdk-jvm/plugins/README.md similarity index 100% rename from bdk-kotlin/bdk-jvm/plugins/README.md rename to bdk-jvm/plugins/README.md diff --git a/bdk-kotlin/bdk-jvm/plugins/build.gradle.kts b/bdk-jvm/plugins/build.gradle.kts similarity index 100% rename from bdk-kotlin/bdk-jvm/plugins/build.gradle.kts rename to bdk-jvm/plugins/build.gradle.kts diff --git a/bdk-kotlin/bdk-jvm/plugins/settings.gradle.kts b/bdk-jvm/plugins/settings.gradle.kts similarity index 100% rename from bdk-kotlin/bdk-jvm/plugins/settings.gradle.kts rename to bdk-jvm/plugins/settings.gradle.kts diff --git a/bdk-kotlin/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt b/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt similarity index 100% rename from bdk-kotlin/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt rename to bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt diff --git a/bdk-kotlin/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt b/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt similarity index 100% rename from bdk-kotlin/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt rename to bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt diff --git a/bdk-kotlin/bdk-jvm/settings.gradle.kts b/bdk-jvm/settings.gradle.kts similarity index 100% rename from bdk-kotlin/bdk-jvm/settings.gradle.kts rename to bdk-jvm/settings.gradle.kts diff --git a/bdk-kotlin/.editorconfig b/bdk-kotlin/.editorconfig deleted file mode 100644 index 4f1c5cd..0000000 --- a/bdk-kotlin/.editorconfig +++ /dev/null @@ -1,29 +0,0 @@ -root = true - -[*] -charset = utf-8 -end_of_line = lf -indent_size = 2 -indent_style = space -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false - -[*.rs] -indent_size = 4 - -[*.kt] -indent_size = 4 - -[*.gradle] -indent_size = 4 - -[tests/**/*.rs] -charset = utf-8 -end_of_line = unset -indent_size = unset -indent_style = unset -trim_trailing_whitespace = unset -insert_final_newline = unset diff --git a/bdk-kotlin/.gitignore b/bdk-kotlin/.gitignore deleted file mode 100644 index 7b20211..0000000 --- a/bdk-kotlin/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -target -build -Cargo.lock -/bindings/bdk-kotlin/local.properties -.gradle -wallet_db -bdk_ffi_test -local.properties -*.log -*.dylib -*.so -.DS_Store -testdb -xcuserdata -.lsp -.clj-kondo -.idea -bdk-android/lib/src/main/kotlin/org/bitcoindevkit/bdk.kt -bdk-jvm/lib/src/main/kotlin/org/bitcoindevkit/bdk.kt diff --git a/bdk-kotlin/.gitmodules b/bdk-kotlin/.gitmodules deleted file mode 100644 index c582725..0000000 --- a/bdk-kotlin/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "bdk-ffi"] - path = bdk-ffi - url = https://github.com/bitcoindevkit/bdk-ffi.git diff --git a/bdk-kotlin/api-docs/Module1.md b/kotlin-api-docs/Module1.md similarity index 100% rename from bdk-kotlin/api-docs/Module1.md rename to kotlin-api-docs/Module1.md diff --git a/bdk-kotlin/api-docs/Module2.md b/kotlin-api-docs/Module2.md similarity index 100% rename from bdk-kotlin/api-docs/Module2.md rename to kotlin-api-docs/Module2.md diff --git a/bdk-kotlin/api-docs/build.gradle.kts b/kotlin-api-docs/build.gradle.kts similarity index 100% rename from bdk-kotlin/api-docs/build.gradle.kts rename to kotlin-api-docs/build.gradle.kts diff --git a/bdk-kotlin/api-docs/deploy.sh b/kotlin-api-docs/deploy.sh similarity index 100% rename from bdk-kotlin/api-docs/deploy.sh rename to kotlin-api-docs/deploy.sh diff --git a/bdk-kotlin/api-docs/gradle.properties b/kotlin-api-docs/gradle.properties similarity index 100% rename from bdk-kotlin/api-docs/gradle.properties rename to kotlin-api-docs/gradle.properties diff --git a/bdk-kotlin/bdk-jvm/gradle/wrapper/gradle-wrapper.jar b/kotlin-api-docs/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from bdk-kotlin/bdk-jvm/gradle/wrapper/gradle-wrapper.jar rename to kotlin-api-docs/gradle/wrapper/gradle-wrapper.jar diff --git a/bdk-kotlin/api-docs/gradle/wrapper/gradle-wrapper.properties b/kotlin-api-docs/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from bdk-kotlin/api-docs/gradle/wrapper/gradle-wrapper.properties rename to kotlin-api-docs/gradle/wrapper/gradle-wrapper.properties diff --git a/bdk-kotlin/bdk-jvm/gradlew b/kotlin-api-docs/gradlew similarity index 100% rename from bdk-kotlin/bdk-jvm/gradlew rename to kotlin-api-docs/gradlew diff --git a/bdk-kotlin/bdk-jvm/gradlew.bat b/kotlin-api-docs/gradlew.bat similarity index 100% rename from bdk-kotlin/bdk-jvm/gradlew.bat rename to kotlin-api-docs/gradlew.bat diff --git a/bdk-kotlin/api-docs/settings.gradle.kts b/kotlin-api-docs/settings.gradle.kts similarity index 100% rename from bdk-kotlin/api-docs/settings.gradle.kts rename to kotlin-api-docs/settings.gradle.kts diff --git a/bdk-kotlin/api-docs/src/main/kotlin/org/bitcoindevkit/bdk.kt b/kotlin-api-docs/src/main/kotlin/org/bitcoindevkit/bdk.kt similarity index 100% rename from bdk-kotlin/api-docs/src/main/kotlin/org/bitcoindevkit/bdk.kt rename to kotlin-api-docs/src/main/kotlin/org/bitcoindevkit/bdk.kt diff --git a/bdk-kotlin/api-docs/src/test/kotlin/org/bitcoindevkit/Samples.kt b/kotlin-api-docs/src/test/kotlin/org/bitcoindevkit/Samples.kt similarity index 100% rename from bdk-kotlin/api-docs/src/test/kotlin/org/bitcoindevkit/Samples.kt rename to kotlin-api-docs/src/test/kotlin/org/bitcoindevkit/Samples.kt