diff --git a/bindings/nostr-sdk-ffi/README.md b/bindings/nostr-sdk-ffi/README.md index ebc253015..7d3ac19ed 100644 --- a/bindings/nostr-sdk-ffi/README.md +++ b/bindings/nostr-sdk-ffi/README.md @@ -49,7 +49,7 @@ just kotlin This command will build an AAR file in `ffi/android/lib-release.aar`: ```bash -just bindings-android +just android ``` See [Add your AAR or JAR as a dependency](https://developer.android.com/studio/projects/android-library#psd-add-aar-jar-dependency) in Android's docs for more information on how to integrate such an archive into your project. @@ -83,4 +83,4 @@ just bindings-swift ## License -This project is distributed under the MIT software license - see the [LICENSE](../../LICENSE) file for details \ No newline at end of file +This project is distributed under the MIT software license - see the [LICENSE](../../LICENSE) file for details diff --git a/bindings/nostr-sdk-ffi/bindings-android/.gitignore b/bindings/nostr-sdk-ffi/android/.gitignore similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/.gitignore rename to bindings/nostr-sdk-ffi/android/.gitignore diff --git a/bindings/nostr-sdk-ffi/bindings-android/build.gradle.kts b/bindings/nostr-sdk-ffi/android/build.gradle.kts similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/build.gradle.kts rename to bindings/nostr-sdk-ffi/android/build.gradle.kts diff --git a/bindings/nostr-sdk-ffi/bindings-android/gradle.properties b/bindings/nostr-sdk-ffi/android/gradle.properties similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/gradle.properties rename to bindings/nostr-sdk-ffi/android/gradle.properties diff --git a/bindings/nostr-sdk-ffi/bindings-android/gradle/wrapper/gradle-wrapper.jar b/bindings/nostr-sdk-ffi/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/gradle/wrapper/gradle-wrapper.jar rename to bindings/nostr-sdk-ffi/android/gradle/wrapper/gradle-wrapper.jar diff --git a/bindings/nostr-sdk-ffi/bindings-android/gradle/wrapper/gradle-wrapper.properties b/bindings/nostr-sdk-ffi/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/gradle/wrapper/gradle-wrapper.properties rename to bindings/nostr-sdk-ffi/android/gradle/wrapper/gradle-wrapper.properties diff --git a/bindings/nostr-sdk-ffi/bindings-android/gradlew b/bindings/nostr-sdk-ffi/android/gradlew similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/gradlew rename to bindings/nostr-sdk-ffi/android/gradlew diff --git a/bindings/nostr-sdk-ffi/bindings-android/gradlew.bat b/bindings/nostr-sdk-ffi/android/gradlew.bat similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/gradlew.bat rename to bindings/nostr-sdk-ffi/android/gradlew.bat diff --git a/bindings/nostr-sdk-ffi/bindings-android/lib/build.gradle.kts b/bindings/nostr-sdk-ffi/android/lib/build.gradle.kts similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/lib/build.gradle.kts rename to bindings/nostr-sdk-ffi/android/lib/build.gradle.kts diff --git a/bindings/nostr-sdk-ffi/bindings-android/lib/consumer-rules.pro b/bindings/nostr-sdk-ffi/android/lib/consumer-rules.pro similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/lib/consumer-rules.pro rename to bindings/nostr-sdk-ffi/android/lib/consumer-rules.pro diff --git a/bindings/nostr-sdk-ffi/bindings-android/lib/proguard-rules.pro b/bindings/nostr-sdk-ffi/android/lib/proguard-rules.pro similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/lib/proguard-rules.pro rename to bindings/nostr-sdk-ffi/android/lib/proguard-rules.pro diff --git a/bindings/nostr-sdk-ffi/bindings-android/lib/src/main/AndroidManifest.xml b/bindings/nostr-sdk-ffi/android/lib/src/main/AndroidManifest.xml similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/lib/src/main/AndroidManifest.xml rename to bindings/nostr-sdk-ffi/android/lib/src/main/AndroidManifest.xml diff --git a/bindings/nostr-sdk-ffi/bindings-android/settings.gradle.kts b/bindings/nostr-sdk-ffi/android/settings.gradle.kts similarity index 100% rename from bindings/nostr-sdk-ffi/bindings-android/settings.gradle.kts rename to bindings/nostr-sdk-ffi/android/settings.gradle.kts diff --git a/bindings/nostr-sdk-ffi/justfile b/bindings/nostr-sdk-ffi/justfile index 9c05b9e98..5822c395e 100755 --- a/bindings/nostr-sdk-ffi/justfile +++ b/bindings/nostr-sdk-ffi/justfile @@ -56,22 +56,22 @@ kotlin: clean-android android # Copy required modules and libs and assemble AAR assemble-aar: - rm -rf bindings-android/lib/src/main/jniLibs - rm -rf bindings-android/lib/src/main/kotlin - cp -r ffi/kotlin/jniLibs bindings-android/lib/src/main - mkdir -p bindings-android/lib/src/main/kotlin/ - cp -r ffi/kotlin/rust bindings-android/lib/src/main/kotlin/ - cd bindings-android && ./gradlew assembleRelease + rm -rf android/lib/src/main/jniLibs + rm -rf android/lib/src/main/kotlin + cp -r ffi/kotlin/jniLibs android/lib/src/main + mkdir -p android/lib/src/main/kotlin/ + cp -r ffi/kotlin/rust android/lib/src/main/kotlin/ + cd android && ./gradlew assembleRelease mkdir -p ffi/android - cp bindings-android/lib/build/outputs/aar/lib-release.aar ffi/android + cp android/lib/build/outputs/aar/lib-release.aar ffi/android # Compile and build Android Archive (AAR) -bindings-android: sdk-root kotlin assemble-aar +android: sdk-root kotlin assemble-aar # Publish android bindings [confirm] -publish-android: bindings-android - cd bindings-android && ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache +publish-android: android + cd android && ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache [private] ios-universal: