🔧 Make pod shell respect configured profile (#86)

AstroxNetwork · Nov 27, 2024 · 360e74c · 360e74c
1 parent f0489ee
commit 360e74c
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ that can be found in the LICENSE file. -->
 
 # Changelog
 
+## 1.0.0-dev.30
+
+- Make pod shell respect configured profile on Darwin.
+- Make `build_pod.sh` executable.
+
 ## 1.0.0-dev.29
 
 - Implements certificate's time and canister ranges checks.

diff --git a/packages/agent_dart/cargokit/build_pod.sh b/packages/agent_dart/cargokit/build_pod.sh
diff --git a/packages/agent_dart/ios/agent_dart.podspec b/packages/agent_dart/ios/agent_dart.podspec
@@ -28,13 +28,17 @@ Pod::Spec.new do |s|
 
   s.script_phase = {
     :name => 'Build Rust library',
-    # First argument is relative path to the `rust` folder, second is name of rust library
-    :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../native/agent_dart agent_dart',
     :execution_position => :before_compile,
     :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
     # Let XCode know that the static library referenced in -force_load below is
     # created by this build step.
     :output_files => ["${BUILT_PRODUCTS_DIR}/libagent_dart.a"],
+    :shell_path => '/bin/bash',
+    :script => <<-SCRIPT
+    [ -f "$HOME/.profile" ] && source "$HOME/.profile"
+    [ -f "$HOME/.bash_profile" ] && source "$HOME/.bash_profile"
+    "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../native/agent_dart agent_dart
+    SCRIPT
   }
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',

diff --git a/packages/agent_dart/macos/agent_dart.podspec b/packages/agent_dart/macos/agent_dart.podspec
@@ -27,13 +27,17 @@ Pod::Spec.new do |s|
 
   s.script_phase = {
     :name => 'Build Rust library',
-    # First argument is relative path to the `rust` folder, second is name of rust library
-    :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../native/agent_dart agent_dart',
     :execution_position => :before_compile,
     :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
     # Let XCode know that the static library referenced in -force_load below is
     # created by this build step.
     :output_files => ["${BUILT_PRODUCTS_DIR}/libagent_dart.a"],
+    :shell_path => '/bin/bash',
+    :script => <<-SCRIPT
+    [ -f "$HOME/.profile" ] && source "$HOME/.profile"
+    [ -f "$HOME/.bash_profile" ] && source "$HOME/.bash_profile"
+    "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../native/agent_dart agent_dart
+    SCRIPT
   }
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',

diff --git a/packages/agent_dart/pubspec.yaml b/packages/agent_dart/pubspec.yaml
@@ -1,5 +1,5 @@
 name: agent_dart
-version: 1.0.0-dev.29
+version: 1.0.0-dev.30
 
 description: |
   An agent library built for Internet Computer,

diff --git a/packages/agent_dart_base/pubspec.yaml b/packages/agent_dart_base/pubspec.yaml
@@ -1,5 +1,5 @@
 name: agent_dart_base
-version: 1.0.0-dev.29
+version: 1.0.0-dev.30
 
 description: The Dart plugin that bridges Rust implementation for agent_dart.
 repository: https://github.com/AstroxNetwork/agent_dart

diff --git a/packages/agent_dart_ffi/pubspec.yaml b/packages/agent_dart_ffi/pubspec.yaml
@@ -1,5 +1,5 @@
 name: agent_dart_ffi
-version: 1.0.0-dev.29
+version: 1.0.0-dev.30
 
 description: The FFI plugin that bridges Rust implementation for agent_dart.
 repository: https://github.com/AstroxNetwork/agent_dart
@@ -9,7 +9,7 @@ environment:
   sdk: '>=3.4.0 <4.0.0'
 
 dependencies:
-  flutter_rust_bridge: '>=2.5.0 <2.6.0'
+  flutter_rust_bridge: '>=2.5.0 <2.5.1'
   freezed_annotation: ^2.2.0
 
 dev_dependencies: