ffi: fix Unresolved reference: Cleaner error when compiling kotlin …

…bindings * Bump `gradle` to `8.4` * Bump `com.android.tools.build:gradle` to `8.3.0` * Bump `compileSdk` to `33` * Remove `targetSdk` * Remove `package` from `AndroidManifest.xml` * Add android `namespace` * Add `android_cleaner = true` in `uniffi.toml`
rust-nostr · Mar 14, 2024 · 903aa43 · 903aa43
1 parent 12d55f4
commit 903aa43
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/bindings/nostr-ffi/bindings-android/build.gradle.kts b/bindings/nostr-ffi/bindings-android/build.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.2")
+        classpath("com.android.tools.build:gradle:8.3.0")
     }
 }
 

diff --git a/bindings/nostr-ffi/bindings-android/gradle/wrapper/gradle-wrapper.properties b/bindings/nostr-ffi/bindings-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/bindings/nostr-ffi/bindings-android/lib/build.gradle.kts b/bindings/nostr-ffi/bindings-android/lib/build.gradle.kts
@@ -14,16 +14,18 @@ repositories {
 }
 
 android {
-    compileSdk = 31
+    namespace = "rust.nostr.protocol"
+
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 31
+
         consumerProguardFiles("consumer-rules.pro")
     }
 
     buildTypes {
-        getByName("release") {
+        release {
             isMinifyEnabled = false
             proguardFiles(file("proguard-android-optimize.txt"), file("proguard-rules.pro"))
         }

diff --git a/bindings/nostr-ffi/bindings-android/lib/src/main/AndroidManifest.xml b/bindings/nostr-ffi/bindings-android/lib/src/main/AndroidManifest.xml
@@ -1,6 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="rust.nostr">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.INTERNET" />
-
 </manifest>
diff --git a/bindings/nostr-ffi/uniffi.toml b/bindings/nostr-ffi/uniffi.toml
@@ -1,2 +1,3 @@
 [bindings.kotlin]
-package_name = "rust.nostr.protocol"
+package_name = "rust.nostr.protocol"
+android_cleaner = true
diff --git a/bindings/nostr-sdk-ffi/bindings-android/build.gradle.kts b/bindings/nostr-sdk-ffi/bindings-android/build.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.2")
+        classpath("com.android.tools.build:gradle:8.3.0")
     }
 }
 

diff --git a/bindings/nostr-sdk-ffi/bindings-android/gradle/wrapper/gradle-wrapper.properties b/bindings/nostr-sdk-ffi/bindings-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/bindings/nostr-sdk-ffi/bindings-android/lib/build.gradle.kts b/bindings/nostr-sdk-ffi/bindings-android/lib/build.gradle.kts
@@ -14,16 +14,18 @@ repositories {
 }
 
 android {
-    compileSdk = 31
+    namespace = "rust.nostr.sdk"
+
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 31
+
         consumerProguardFiles("consumer-rules.pro")
     }
 
     buildTypes {
-        getByName("release") {
+        release {
             isMinifyEnabled = false
             proguardFiles(file("proguard-android-optimize.txt"), file("proguard-rules.pro"))
         }

diff --git a/bindings/nostr-sdk-ffi/bindings-android/lib/src/main/AndroidManifest.xml b/bindings/nostr-sdk-ffi/bindings-android/lib/src/main/AndroidManifest.xml
@@ -1,6 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="rust.nostr.sdk">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.INTERNET" />
-
 </manifest>
diff --git a/bindings/nostr-sdk-ffi/uniffi.toml b/bindings/nostr-sdk-ffi/uniffi.toml
@@ -1,2 +1,3 @@
 [bindings.kotlin]
 package_name = "rust.nostr.sdk"
+android_cleaner = true