From d68a543800f0420d7a76444fd3088f6b642dbf59 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Tue, 29 Aug 2023 17:50:25 -0500 Subject: [PATCH] fix ios --- dev-setup/setup_macos.sh | 3 ++- veilid-core/run_tests.sh | 2 +- .../veilidcore-tests.xcodeproj/project.pbxproj | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dev-setup/setup_macos.sh b/dev-setup/setup_macos.sh index 3f37caec..f2c07d4e 100755 --- a/dev-setup/setup_macos.sh +++ b/dev-setup/setup_macos.sh @@ -129,7 +129,7 @@ sudo -H -u $BREW_USER brew install capnp cmake wabt llvm protobuf openjdk@11 jq $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager build-tools\;33.0.1 ndk\;25.1.8937393 cmake\;3.22.1 platform-tools platforms\;android-33 # install targets -rustup target add aarch64-apple-darwin aarch64-apple-ios x86_64-apple-darwin x86_64-apple-ios wasm32-unknown-unknown aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android +rustup target add aarch64-apple-darwin aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-darwin x86_64-apple-ios wasm32-unknown-unknown aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android # install cargo packages cargo install wasm-bindgen-cli wasm-pack @@ -137,4 +137,5 @@ cargo install wasm-bindgen-cli wasm-pack # install pip packages pip3 install --upgrade bumpversion +echo Installing cocoapods. This may take a while. sudo gem install cocoapods diff --git a/veilid-core/run_tests.sh b/veilid-core/run_tests.sh index f0e5af9f..82a2f2f8 100755 --- a/veilid-core/run_tests.sh +++ b/veilid-core/run_tests.sh @@ -3,7 +3,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" pushd $SCRIPTDIR 2>/dev/null if [[ "$1" == "wasm" ]]; then - WASM_BINDGEN_TEST_TIMEOUT=120 wasm-pack test --firefox --headless --features=rt-wasm-bindgen + WASM_BINDGEN_TEST_TIMEOUT=120 wasm-pack test --firefox --headless --no-default-features --features=default-wasm elif [[ "$1" == "ios" ]]; then SYMROOT=/tmp/testout APPNAME=veilidcore-tests diff --git a/veilid-core/src/tests/ios/veilidcore-tests/veilidcore-tests.xcodeproj/project.pbxproj b/veilid-core/src/tests/ios/veilidcore-tests/veilidcore-tests.xcodeproj/project.pbxproj index 2b35a5b9..4a270e1f 100644 --- a/veilid-core/src/tests/ios/veilidcore-tests/veilidcore-tests.xcodeproj/project.pbxproj +++ b/veilid-core/src/tests/ios/veilidcore-tests/veilidcore-tests.xcodeproj/project.pbxproj @@ -167,7 +167,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "../../../../../scripts/ios_build.sh veilid_core --features veilid_core_ios_tests,rt-tokio\n"; + shellScript = "../../../../../scripts/ios_build.sh veilid_core --features veilid_core_ios_tests\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -332,7 +332,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ZJPQSFX5MW; + DEVELOPMENT_TEAM = XP5LBLT7M7; INFOPLIST_FILE = "veilidcore-tests/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.3; LD_RUNPATH_SEARCH_PATHS = ( @@ -364,7 +364,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ZJPQSFX5MW; + DEVELOPMENT_TEAM = XP5LBLT7M7; INFOPLIST_FILE = "veilidcore-tests/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.3; LD_RUNPATH_SEARCH_PATHS = (