update to forked yttrium, bundle .aar without .so

Author: MrCyjaneK

.github/workflows/build-and-release.yml

@@ -39,6 +39,11 @@ jobs:
     - name: Build native dependencies
       run: |
         ./scripts/build_native_deps.sh
+    - name: Build Kotlin dependencies
+      run: |
+        pushd scripts/yttrium
+          ./generate_kotlin_locally.sh
+        popd
     
     - name: Get version tag
       id: get_version

.gitignore

@@ -58,4 +58,5 @@ run_tests_all.sh
 *.env.secret*
 
 scripts/yttrium
-libuniffi_yttrium.so
+libuniffi_yttrium.so
+*.aar

packages/reown_yttrium/android/build.gradle

@@ -56,13 +56,6 @@ android {
         }
     }
 
-    packaging {
-        jniLibs.pickFirsts.add("lib/arm64-v8a/libuniffi_yttrium.so")
-        jniLibs.pickFirsts.add("lib/armeabi-v7a/libuniffi_yttrium.so")	        
-        jniLibs.pickFirsts.add("lib/x86_64/libuniffi_yttrium.so")
-        jniLibs.pickFirsts.add("lib/**/libjnidispatch.so")
-    }
-
     testOptions {
         unitTests.all {
             useJUnitPlatform()
@@ -81,7 +74,7 @@ def yttriumVersion = project.hasProperty("yttriumCiVersion") ? project.getProper
 
 dependencies {
     implementation("net.java.dev.jna:jna:5.17.0@aar")
-    implementation("com.github.reown-com:yttrium:$yttriumVersion")
+    implementation(files("../../../android-release.aar"))
 
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("org.mockito:mockito-core:5.0.0")

scripts/build_native_deps.sh

@@ -5,19 +5,13 @@ set -x -e
 
 if [ ! -e yttrium/.git ]; then
     rm -rf yttrium
-    git clone https://github.com/reown-com/yttrium
+    git clone https://github.com/cake-tech/yttrium
 fi
 cd yttrium
-# git checkout ed8e8f5af2029406263be5993e484c3a69c1db7a
 git reset --hard
-git checkout 9f81ab8e0fb879a994392d603b7908b2104d1735
+git checkout 7a8b5bd01876662158db334381db8592c66952e6
 git reset --hard
 
-sed -i.bak "s/-i ''/-i.bak/g" build-kotlin.sh
-sed -i.bak "s/--bin uniffi-bindgen generate/-p kotlin-ffi --bin uniffi-bindgen generate/g" build-kotlin.sh
-sed -i.bak "s/stat -f%z/echo stat -f%z/g" build-kotlin.sh
-sed -i.bak "s/ -t arm64-v8a/ -t arm64-v8a -t x86_64/g" build-kotlin.sh
-
 cargo install cargo-ndk
 ENABLE_STRIP=false PROFILE=release bash -x ./build-kotlin.sh