@rusaint/react-native 0.13.0 → 0.13.2

package/android/CMakeLists.txt

@@ -40,11 +40,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 
 cmake_path(
   SET MY_RUST_LIB
-  ${CMAKE_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/librusaint_ffi.a
+  ${CMAKE_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/librusaint_ffi.so
   NORMALIZE
 )
-add_library(my_rust_lib STATIC IMPORTED)
-set_target_properties(my_rust_lib PROPERTIES IMPORTED_LOCATION ${MY_RUST_LIB})
+add_library(my_rust_lib SHARED IMPORTED)
+set_target_properties(my_rust_lib PROPERTIES IMPORTED_LOCATION ${MY_RUST_LIB} IMPORTED_NO_SONAME ON)
 
 # Add ReactAndroid libraries, being careful to account for different versions.
 find_package(ReactAndroid REQUIRED CONFIG)

package/android/build.gradle

@@ -79,7 +79,7 @@ android {
       }
     }
     ndk {
-      abiFilters "arm64-v8a", "armeabi-v7a", "x86", "x86_64"
+      abiFilters "arm64-v8a", "armeabi-v7a"
     }
   }
 

package/build/RusaintReactNative.xcframework/Info.plist

@@ -8,7 +8,7 @@
 			<key>BinaryPath</key>
 			<string>librusaint_ffi.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64-simulator</string>
 			<key>LibraryPath</key>
 			<string>librusaint_ffi.a</string>
 			<key>SupportedArchitectures</key>
@@ -17,12 +17,14 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>librusaint_ffi.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>librusaint_ffi.a</string>
 			<key>SupportedArchitectures</key>
@@ -31,8 +33,6 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/build/RusaintReactNative.xcframework/_CodeSignature/CodeResources

@@ -6,11 +6,11 @@
 	<dict>
 		<key>ios-arm64-simulator/librusaint_ffi.a</key>
 		<data>
-		CRTTHgcW4dDq9a/FjS7ogRM21JA=
+		flUIGQaDdT7jwEl7QJ6AXOlX7KI=
 		</data>
 		<key>ios-arm64/librusaint_ffi.a</key>
 		<data>
-		jVrayJupjiY7d7mh4Xb+c+COW/s=
+		SXZ4u5N5aQxpq3IynnAe2vGAkIA=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -19,22 +19,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			CRTTHgcW4dDq9a/FjS7ogRM21JA=
+			flUIGQaDdT7jwEl7QJ6AXOlX7KI=
 			</data>
 			<key>hash2</key>
 			<data>
-			IMOZqYP7u91B5tCcee8o773fNIAbF0GegzhLIQgFu9g=
+			9C+uYYxs7EfKsVJR7g5RMuN6/hf0ifOJw3oA22Geoug=
 			</data>
 		</dict>
 		<key>ios-arm64/librusaint_ffi.a</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			jVrayJupjiY7d7mh4Xb+c+COW/s=
+			SXZ4u5N5aQxpq3IynnAe2vGAkIA=
 			</data>
 			<key>hash2</key>
 			<data>
-			MhpP35Y+OdJllMZMH224v60w+RMIo1nr1riuwx7fpP8=
+			zZba0QKxK59ReL+IQjBjytozSuepFNJkTjmxHU3Hl9o=
 			</data>
 		</dict>
 	</dict>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rusaint/react-native",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "description": "React native implementation of the rusaint, scraper library for SSU u-saint",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
@@ -39,11 +39,10 @@
     "!**/.*"
   ],
   "scripts": {
-    "ubrn:ios": "ubrn build ios     --config ubrn.config.yaml --and-generate && (cd example/ios && pod install)",
+    "ubrn:ios": "ubrn build ios --config ubrn.config.yaml --and-generate && (cd example/ios && pod install)",
     "ubrn:android": "ubrn build android --config ubrn.config.yaml --and-generate",
-    "ubrn:checkout": "ubrn checkout      --config ubrn.config.yaml",
     "ubrn:release-build": "ubrn build ios --config ubrn.config.yaml --and-generate --release && ubrn build android --config ubrn.config.yaml --and-generate --release",
-    "ubrn:clean": "rm -Rf cpp/ android/src/main/java ios/ src/Native* src/generated/ src/index.ts*",
+    "ubrn:clean": "rm -rfv cpp/ android/CMakeLists.txt android/src/main/java android/*.cpp ios/ src/Native* src/index.*ts* src/generated/",
     "example": "yarn workspace @rusaint/react-native-example",
     "test": "jest",
     "typecheck": "tsc",

package/RusaintReactNative.podspec

@@ -1,44 +0,0 @@
-# Generated by uniffi-bindgen-react-native
-require "json"
-
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-
-Pod::Spec.new do |s|
-  s.name         = "RusaintReactNative"
-  s.version      = package["version"]
-  s.summary      = package["description"]
-  s.homepage     = package["homepage"]
-  s.license      = package["license"]
-  s.authors      = package["author"]
-
-  s.platforms    = { :ios => min_ios_version_supported }
-  s.source       = { :git => "https://github.com/EATSTEAK/rusaint.git", :tag => "#{s.version}" }
-
-  s.source_files = "ios/**/*.{h,m,mm,swift}", "ios/generated/**/*.{h,m,mm}", "cpp/**/*.{hpp,cpp,c,h}", "cpp/generated/**/*.{hpp,cpp,c,h}"
-  s.vendored_frameworks = "build/RusaintReactNative.xcframework"
-  s.dependency    "uniffi-bindgen-react-native", "0.29.3-1"
-
-  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
-  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
-  if respond_to?(:install_modules_dependencies, true)
-    install_modules_dependencies(s)
-  else
-    s.dependency "React-Core"
-
-    # Don't install the dependencies when we run `pod install` in the old architecture.
-    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-      s.pod_target_xcconfig    = {
-          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-      }
-      s.dependency "React-Codegen"
-      s.dependency "RCT-Folly"
-      s.dependency "RCTRequired"
-      s.dependency "RCTTypeSafety"
-      s.dependency "ReactCommon/turbomodule/core"
-    end
-  end
-end