chore: yttrium_lib -> yttrium

.github/workflows/release-dart.yml

@@ -124,8 +124,8 @@ jobs:
         run: |
           mkdir -p jniLibs/arm64-v8a
           mkdir -p jniLibs/armeabi-v7a
-          cp target/aarch64-linux-android/uniffi-release/libyttrium_lib.so jniLibs/arm64-v8a/libyttrium_lib.so
-          cp target/armv7-linux-androideabi/uniffi-release/libyttrium_lib.so jniLibs/armeabi-v7a/libyttrium_lib.so
+          cp target/aarch64-linux-android/uniffi-release/libyttrium.so jniLibs/arm64-v8a/libyttrium.so
+          cp target/armv7-linux-androideabi/uniffi-release/libyttrium.so jniLibs/armeabi-v7a/libyttrium.so
 
       # Upload Android artifacts
       - name: Upload Android artifacts
@@ -158,9 +158,9 @@ jobs:
         shell: bash
         run: |
           mkdir -p universal
-          lipo -create target/aarch64-apple-ios/uniffi-release/libyttrium_lib.dylib target/x86_64-apple-ios/uniffi-release/libyttrium_lib.dylib -output universal/libyttrium_lib_universal.dylib
-          install_name_tool -id @rpath/libyttrium_lib_universal.dylib universal/libyttrium_lib_universal.dylib
-          codesign --force --sign - universal/libyttrium_lib_universal.dylib
+          lipo -create target/aarch64-apple-ios/uniffi-release/libyttrium.dylib target/x86_64-apple-ios/uniffi-release/libyttrium.dylib -output universal/libyttrium_universal.dylib
+          install_name_tool -id @rpath/libyttrium_universal.dylib universal/libyttrium_universal.dylib
+          codesign --force --sign - universal/libyttrium_universal.dylib
 
       # Upload iOS artifacts
       - name: Upload iOS artifacts

crates/yttrium/Cargo.toml

@@ -6,7 +6,6 @@ rust-version.workspace = true
 license.workspace = true
 
 [lib]
-name = "yttrium_lib"
 crate-type = ["lib", "cdylib", "staticlib"]
 
 [features]

crates/yttrium_dart/bin/setup.dart

@@ -64,7 +64,7 @@ Future<void> _setupFiles({
             '-o',
             '-j',
             zipFile,
-            'universal/libyttrium_lib_universal.dylib',
+            'universal/libyttrium_universal.dylib',
             '-d',
             targetDir,
           ]

crates/yttrium_dart/generate_android_lib.sh

@@ -18,7 +18,7 @@ mkdir -p android/src/main/jniLibs/armeabi-v7a
 cd .. #/crates
 cd .. #/yttrium
 
-cp target/aarch64-linux-android/uniffi-release/libyttrium_lib.so crates/yttrium_dart/android/src/main/jniLibs/arm64-v8a/libyttrium_lib.so
-cp target/armv7-linux-androideabi/uniffi-release/libyttrium_lib.so crates/yttrium_dart/android/src/main/jniLibs/armeabi-v7a/libyttrium_lib.so
-# cp target/i686-linux-android/uniffi-release/libyttrium_lib.so crates/yttrium_dart/android/src/main/jniLibs/x86/libyttrium_lib.so
-# cp target/x86_64-linux-android/uniffi-release/libyttrium_lib.so crates/yttrium_dart/android/src/main/jniLibs/x86_64/libyttrium_lib.so
+cp target/aarch64-linux-android/uniffi-release/libyttrium.so crates/yttrium_dart/android/src/main/jniLibs/arm64-v8a/libyttrium.so
+cp target/armv7-linux-androideabi/uniffi-release/libyttrium.so crates/yttrium_dart/android/src/main/jniLibs/armeabi-v7a/libyttrium.so
+# cp target/i686-linux-android/uniffi-release/libyttrium.so crates/yttrium_dart/android/src/main/jniLibs/x86/libyttrium.so
+# cp target/x86_64-linux-android/uniffi-release/libyttrium.so crates/yttrium_dart/android/src/main/jniLibs/x86_64/libyttrium.so

crates/yttrium_dart/generate_ios_lib.sh

@@ -37,19 +37,19 @@ pwd
 
 mkdir -p target/universal/ios/uniffi-release
 
-lipo -create target/$TARGET/uniffi-release/libyttrium_lib.dylib target/x86_64-apple-ios/uniffi-release/libyttrium_lib.dylib -output target/universal/ios/uniffi-release/libyttrium_lib_universal.dylib
+lipo -create target/$TARGET/uniffi-release/libyttrium.dylib target/x86_64-apple-ios/uniffi-release/libyttrium.dylib -output target/universal/ios/uniffi-release/libyttrium_universal.dylib
 
-lipo -info target/universal/ios/uniffi-release/libyttrium_lib_universal.dylib
+lipo -info target/universal/ios/uniffi-release/libyttrium_universal.dylib
 
-cp target/universal/ios/uniffi-release/libyttrium_lib_universal.dylib crates/yttrium_dart/ios/libyttrium_lib_universal.dylib
+cp target/universal/ios/uniffi-release/libyttrium_universal.dylib crates/yttrium_dart/ios/libyttrium_universal.dylib
 
-# otool -L crates/yttrium_dart/ios/libyttrium_lib_universal.dylib
+# otool -L crates/yttrium_dart/ios/libyttrium_universal.dylib
 
-install_name_tool -id @rpath/libyttrium_lib_universal.dylib crates/yttrium_dart/ios/libyttrium_lib_universal.dylib
+install_name_tool -id @rpath/libyttrium_universal.dylib crates/yttrium_dart/ios/libyttrium_universal.dylib
 
-codesign --force --sign - crates/yttrium_dart/ios/libyttrium_lib_universal.dylib
+codesign --force --sign - crates/yttrium_dart/ios/libyttrium_universal.dylib
 
-otool -L crates/yttrium_dart/ios/libyttrium_lib_universal.dylib
+otool -L crates/yttrium_dart/ios/libyttrium_universal.dylib
 
 pwd
 

crates/yttrium_dart/ios/yttrium_dart.podspec

@@ -14,7 +14,7 @@ Reown is the onchain UX platform that provides toolkits built on top of the Wall
   s.author           = { 'Reown' => '[email protected]' }
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
-  s.vendored_libraries = 'libyttrium_lib_universal.dylib'
+  s.vendored_libraries = 'libyttrium_universal.dylib'
   s.dependency 'Flutter'
   s.platform = :ios, '12.0'
 

crates/yttrium_dart/lib/generated/frb_generated.dart

@@ -74,7 +74,7 @@ class YttriumDart extends BaseEntrypoint<YttriumDartApi, YttriumDartApiImpl,
 
   static const kDefaultExternalLibraryLoaderConfig =
       ExternalLibraryLoaderConfig(
-    stem: 'yttrium_lib',
+    stem: 'yttrium',
     ioDirectory: '../yttrium/target/release/',
     webPrefix: 'pkg/',
   );

crates/yttrium_dart/lib/yttrium_dart.dart

@@ -28,9 +28,9 @@ class YttriumDart implements IYttriumClient {
     try {
       // Locate the native library file
       final yttrium = Platform.isAndroid
-          ? ExternalLibrary.open('libyttrium_lib.so')
+          ? ExternalLibrary.open('libyttrium.so')
           : (Platform.isIOS || Platform.isMacOS)
-              ? ExternalLibrary.open('libyttrium_lib_universal.dylib')
+              ? ExternalLibrary.open('libyttrium_universal.dylib')
               : throw 'Yttrium not yet supported on ${Platform.localeName}';
       // Initialize the Rust library
       await frb.YttriumDart.init(externalLibrary: yttrium);