From 50b6108946e53807afedb396d9a68fd7e333578a Mon Sep 17 00:00:00 2001
From: Pablo Guardiola <pablo.guardiola@toolsforhumanity.com>
Date: Sun, 1 Feb 2026 14:26:10 -0500
Subject: [PATCH] remove walletkit-android module and publish walletkit
 snapshot + align jna aar

---
 kotlin/walletkit-android/build.gradle.kts    | 80 --------------------
 kotlin/walletkit-android/consumer-rules.pro  |  1 -
 kotlin/walletkit/.gitignore                  |  2 +
 kotlin/walletkit/build.gradle.kts            | 20 +++--
 kotlin/walletkit/src/main/jniLibs/.gitignore |  2 +
 5 files changed, 16 insertions(+), 89 deletions(-)
 delete mode 100644 kotlin/walletkit-android/build.gradle.kts
 delete mode 100644 kotlin/walletkit-android/consumer-rules.pro
 create mode 100644 kotlin/walletkit/.gitignore
 create mode 100644 kotlin/walletkit/src/main/jniLibs/.gitignore

diff --git a/kotlin/walletkit-android/build.gradle.kts b/kotlin/walletkit-android/build.gradle.kts
deleted file mode 100644
index e6f047448..000000000
--- a/kotlin/walletkit-android/build.gradle.kts
+++ /dev/null
@@ -1,80 +0,0 @@
-import java.io.ByteArrayOutputStream
-
-plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("maven-publish")
-}
-
-kotlin {
-    jvmToolchain(17)
-}
-
-android {
-    namespace = "org.world.walletkit"
-    compileSdk = 33
-
-    defaultConfig {
-        minSdk = 23
-        @Suppress("deprecation")
-        targetSdk = 33
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-        }
-    }
-}
-
-afterEvaluate {
-    publishing {
-        publications {
-            create<MavenPublication>("maven") {
-                groupId = "org.world"
-                artifactId = "walletkit-android"
-
-                // 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")
-
-                afterEvaluate {
-                    from(components["release"])
-                }
-            }
-        }
-
-        repositories {
-            maven {
-                name = "GitHubPackages"
-                url = uri("https://maven.pkg.github.com/worldcoin/walletkit")
-                credentials {
-                    username = System.getenv("GITHUB_ACTOR")
-                    password = System.getenv("GITHUB_TOKEN")
-                }
-            }
-        }
-    }
-}
-
-dependencies {
-    // UniFFI requires JNA for native calls
-    implementation("net.java.dev.jna:jna:5.13.0")
-    implementation("androidx.core:core-ktx:1.8.0")
-    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("com.google.android.material:material:1.5.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
-}
diff --git a/kotlin/walletkit-android/consumer-rules.pro b/kotlin/walletkit-android/consumer-rules.pro
deleted file mode 100644
index 8b1378917..000000000
--- a/kotlin/walletkit-android/consumer-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/kotlin/walletkit/.gitignore b/kotlin/walletkit/.gitignore
new file mode 100644
index 000000000..dc7bdfe18
--- /dev/null
+++ b/kotlin/walletkit/.gitignore
@@ -0,0 +1,2 @@
+/build
+/src/main/java/uniffi/
diff --git a/kotlin/walletkit/build.gradle.kts b/kotlin/walletkit/build.gradle.kts
index 0df6f72ce..bf8e92db6 100644
--- a/kotlin/walletkit/build.gradle.kts
+++ b/kotlin/walletkit/build.gradle.kts
@@ -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"])
@@ -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")
diff --git a/kotlin/walletkit/src/main/jniLibs/.gitignore b/kotlin/walletkit/src/main/jniLibs/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/kotlin/walletkit/src/main/jniLibs/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore