Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 0 additions & 80 deletions kotlin/walletkit-android/build.gradle.kts

This file was deleted.

1 change: 0 additions & 1 deletion kotlin/walletkit-android/consumer-rules.pro

This file was deleted.

2 changes: 2 additions & 0 deletions kotlin/walletkit/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/build
/src/main/java/uniffi/
20 changes: 12 additions & 8 deletions kotlin/walletkit/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,16 @@ afterEvaluate {
groupId = "org.world"
artifactId = "walletkit"

// Read version from Cargo.toml
val cargoToml = file("../../Cargo.toml")
val versionRegex = """version\s*=\s*"([^"]+)"""".toRegex()
val cargoContent = cargoToml.readText()
version = versionRegex.find(cargoContent)?.groupValues?.get(1)
?: throw GradleException("Could not find version in Cargo.toml")
// Read version from Cargo.toml (allow override via -PversionName)
version = if (project.hasProperty("versionName")) {
project.property("versionName") as String
} else {
val cargoToml = file("../../Cargo.toml")
val versionRegex = """version\s*=\s*"([^"]+)"""".toRegex()
val cargoContent = cargoToml.readText()
versionRegex.find(cargoContent)?.groupValues?.get(1)
?: throw GradleException("Could not find version in Cargo.toml")
}

afterEvaluate {
from(components["release"])
Expand All @@ -71,8 +75,8 @@ afterEvaluate {
}

dependencies {
// UniFFI requires JNA for native calls
implementation("net.java.dev.jna:jna:5.13.0")
// UniFFI requires JNA for native calls (AAR to avoid jar+aar duplicates)
implementation("net.java.dev.jna:jna:5.13.0@aar")
implementation("androidx.core:core-ktx:1.8.0")
implementation("androidx.appcompat:appcompat:1.4.1")
implementation("com.google.android.material:material:1.5.0")
Expand Down
2 changes: 2 additions & 0 deletions kotlin/walletkit/src/main/jniLibs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
Loading