Merge pull request #12 from superwall/develop

0.1.14

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cel-eval"
-version = "0.1.13"
+version = "0.1.14"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.htmlž
@@ -32,6 +32,9 @@ path = "uniffi-bindgen.rs"
 [profile.release]
 opt-level = "z"  # Optimize for size.
 lto = "fat"
+debug=false
+incremental = false
+overflow-checks = false
 codegen-units = 1
 panic = "abort"
 strip = true

build_ios.sh

@@ -1,10 +1,74 @@
 #!/bin/bash
-set -e
 
+# Function to set up xcconfig environment variables
+setup_xcconfig_env() {
+    # Common settings
+    export ONLY_ACTIVE_ARCH="YES"
+    export DEFINES_MODULE="YES"
+    export VERSIONING_SYSTEM="apple-generic"
+    export TARGETED_DEVICE_FAMILY="1,2"
+    export IPHONEOS_DEPLOYMENT_TARGET="12"
+    export DYLIB_COMPATIBILITY_VERSION="1"
+    export DYLIB_CURRENT_VERSION="1"
+    export DYLIB_INSTALL_NAME_BASE="@rpath"
+    export LD_RUNPATH_SEARCH_PATHS="@executable_path/Frameworks @loader_path/Frameworks"
+    export SWIFT_VERSION="5.0"
+    export ENABLE_BITCODE="NO"
+
+    # Release-specific settings
+    export SWIFT_OPTIMIZATION_LEVEL="-O"
+    export SWIFT_ACTIVE_COMPILATION_CONDITIONS=""
+    export SWIFT_COMPILATION_MODE="wholemodule"
+    export ENABLE_TESTABILITY="NO"
+    export GCC_OPTIMIZATION_LEVEL="s"
+    export GCC_PREPROCESSOR_DEFINITIONS=""
+
+    # Common compiler settings
+    export GCC_DYNAMIC_NO_PIC="NO"
+    export GCC_NO_COMMON_BLOCKS="YES"
+    export GCC_C_LANGUAGE_STANDARD="gnu11"
+    export CLANG_CXX_LANGUAGE_STANDARD="gnu++14"
+    export CLANG_CXX_LIBRARY="libc++"
+    export CLANG_ENABLE_OBJC_ARC="YES"
+    export CLANG_ENABLE_OBJC_WEAK="YES"
+    export ENABLE_STRICT_OBJC_MSGSEND="YES"
+
+    # Warning flags
+    export CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING="YES"
+    export CLANG_WARN_EMPTY_BODY="YES"
+    export CLANG_WARN_BOOL_CONVERSION="YES"
+    export CLANG_WARN_CONSTANT_CONVERSION="YES"
+    export GCC_WARN_64_TO_32_BIT_CONVERSION="YES"
+    export CLANG_WARN_ENUM_CONVERSION="YES"
+    export CLANG_WARN_INT_CONVERSION="YES"
+    export CLANG_WARN_NON_LITERAL_NULL_CONVERSION="YES"
+    export CLANG_WARN_INFINITE_RECURSION="YES"
+    export GCC_WARN_ABOUT_RETURN_TYPE="YES"
+    export CLANG_WARN_STRICT_PROTOTYPES="YES"
+    export CLANG_WARN_COMMA="YES"
+    export GCC_WARN_UNINITIALIZED_AUTOS="YES"
+    export CLANG_WARN_UNREACHABLE_CODE="YES"
+    export GCC_WARN_UNUSED_FUNCTION="YES"
+    export GCC_WARN_UNUSED_VARIABLE="YES"
+    export CLANG_WARN_RANGE_LOOP_ANALYSIS="YES"
+    export CLANG_WARN_SUSPICIOUS_MOVE="YES"
+    export CLANG_WARN__DUPLICATE_METHOD_MATCH="YES"
+    export CLANG_WARN_OBJC_LITERAL_CONVERSION="YES"
+    export CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS="YES"
+    export GCC_WARN_UNDECLARED_SELECTOR="YES"
+    export CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF="YES"
+}
+
+# Set up xcconfig environment
+setup_xcconfig_env
+
+# Set base RUSTFLAGS
+export RUSTFLAGS="-C opt-level=3 -C debuginfo=0 -C strip=symbols"
+
+set -e
 echo "Building the rust library for binding generation"
 cargo build --lib
 
-
 echo "Generating Swift bindings in .target/ios/"
 # Generate bindings
 cargo run --features=uniffi/cli \
@@ -22,13 +86,12 @@ for TARGET in \
         x86_64-apple-darwin \
         x86_64-apple-ios \
         x86_64-apple-ios-macabi
-
 do
     rustup target add $TARGET
+    echo "Building for $TARGET"
     cargo build --target=$TARGET --lib --release
 done
 
-
 # Rename *.modulemap to module.modulemap
 mv ./target/ios/celFFI.modulemap ./target/ios/module.modulemap
 
@@ -56,36 +119,38 @@ cp -R ./target/ios/* ./target/xcframeworks/headers/macos/
 # iOS Simulator (combined arm64 and x86_64)
 echo "Preparing iOS Simulator library (universal binary)"
 mkdir -p ./target/xcframeworks/ios-simulator
-lipo -create ./target/aarch64-apple-ios-sim/release/libcel_eval.dylib \
-    ./target/x86_64-apple-ios/release/libcel_eval.dylib \
-    -output ./target/xcframeworks/ios-simulator/libcel.dylib
+lipo -create ./target/aarch64-apple-ios-sim/release/libcel_eval.a \
+    ./target/x86_64-apple-ios/release/libcel_eval.a \
+    -output ./target/xcframeworks/ios-simulator/libcel.a
+strip -x ./target/xcframeworks/ios-simulator/libcel.a
 
 # iOS Device (arm64)
 echo "Preparing iOS Device (arm64) library"
 mkdir -p ./target/xcframeworks/ios-device
-cp ./target/aarch64-apple-ios/release/libcel_eval.dylib ./target/xcframeworks/ios-device/libcel.dylib
+cp ./target/aarch64-apple-ios/release/libcel_eval.a ./target/xcframeworks/ios-device/libcel.a
+strip -x ./target/xcframeworks/ios-device/libcel.a
 
 # macOS (combined arm64 and x86_64)
 echo "Preparing macOS library (universal binary)"
 mkdir -p ./target/xcframeworks/macos
-lipo -create ./target/aarch64-apple-darwin/release/libcel_eval.dylib \
-    ./target/x86_64-apple-darwin/release/libcel_eval.dylib \
-    -output ./target/xcframeworks/macos/libcel.dylib
+lipo -create ./target/aarch64-apple-darwin/release/libcel_eval.a \
+    ./target/x86_64-apple-darwin/release/libcel_eval.a \
+    -output ./target/xcframeworks/macos/libcel.a
+strip -x ./target/xcframeworks/macos/libcel.a
 
 # Mac Catalyst (combined arm64 and x86_64)
 echo "Preparing Mac Catalyst library (universal binary)"
 mkdir -p ./target/xcframeworks/catalyst
-lipo -create ./target/aarch64-apple-ios-macabi/release/libcel_eval.dylib \
-    ./target/x86_64-apple-ios-macabi/release/libcel_eval.dylib \
-    -output ./target/xcframeworks/catalyst/libcel.dylib
-
+lipo -create ./target/aarch64-apple-ios-macabi/release/libcel_eval.a \
+    ./target/x86_64-apple-ios-macabi/release/libcel_eval.a \
+    -output ./target/xcframeworks/catalyst/libcel.a
+strip -x ./target/xcframeworks/catalyst/libcel.a
 echo "Building XCFramework"
 xcodebuild -create-xcframework \
-    -library ./target/xcframeworks/ios-simulator/libcel.dylib -headers ./target/xcframeworks/headers/ios-simulator \
-    -library ./target/xcframeworks/ios-device/libcel.dylib -headers ./target/xcframeworks/headers/ios-device \
-    -library ./target/xcframeworks/macos/libcel.dylib -headers ./target/xcframeworks/headers/macos \
-    -library ./target/xcframeworks/catalyst/libcel.dylib -headers ./target/xcframeworks/headers/catalyst \
+    -library ./target/xcframeworks/ios-simulator/libcel.a -headers ./target/xcframeworks/headers/ios-simulator \
+    -library ./target/xcframeworks/ios-device/libcel.a -headers ./target/xcframeworks/headers/ios-device \
+    -library ./target/xcframeworks/macos/libcel.a -headers ./target/xcframeworks/headers/macos \
+    -library ./target/xcframeworks/catalyst/libcel.a -headers ./target/xcframeworks/headers/catalyst \
     -output ./target/xcframeworks/libcel.xcframework
 
-echo "XCFramework built at ./target/xcframeworks/libcel.xcframework"
-
+echo "XCFramework built at ./target/xcframeworks/libcel.xcframework"