Merge branch 'main' into performance_api

Tencent · Jul 4, 2023 · 851318d · 851318d
2 parents 94135b0 + f261ef0
commit 851318d
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 8 deletions.
diff --git a/.github/workflows/pod_spec_lint.yml b/.github/workflows/pod_spec_lint.yml
@@ -0,0 +1,32 @@
+name: '[pods] pod spec lint'
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'framework/ios/**'
+      - 'framework/examples/ios-demo/**'
+      - 'driver/js/src/**'
+      - 'driver/js/include/**'
+      - 'dom/include/**'
+      - 'dom/src/**'
+      - 'layout/engine/**'
+      - 'modules/ios/**'
+      - 'modules/footstone/**'
+      - 'modules/vfs/ios/**'
+      - 'modules/vfs/native/**'
+      - 'renderer/native/ios/**'
+      - 'devtools/devtools-backend/**'
+
+jobs:
+  pod_spec_lint:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          lfs: true
+      - name: Pod Spec Lint
+        run: |
+          pod spec lint hippy.podspec --allow-warnings --use-libraries --verbose --skip-import-validation
diff --git a/.github/workflows/pod_spec_lint_bypass.yml b/.github/workflows/pod_spec_lint_bypass.yml
@@ -0,0 +1,32 @@
+name: '[pods] pod spec lint'
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - 'framework/ios/**'
+      - 'framework/examples/ios-demo/**'
+      - 'driver/js/src/**'
+      - 'driver/js/include/**'
+      - 'dom/include/**'
+      - 'dom/src/**'
+      - 'layout/engine/**'
+      - 'modules/ios/**'
+      - 'modules/footstone/**'
+      - 'modules/vfs/ios/**'
+      - 'modules/vfs/native/**'
+      - 'renderer/native/ios/**'
+      - 'devtools/devtools-backend/**'
+
+jobs:
+  pod_spec_lint:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          lfs: true
+      - name: Pod_Spec_Lint_Bypass
+        run: |
+          echo "No Pod Spec Lint required"
diff --git a/.github/workflows/voltron_build_tests.yml b/.github/workflows/voltron_build_tests.yml
@@ -91,7 +91,7 @@ jobs:
         working-directory: framework/voltron
 
   voltron_ios_flutter_build:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
@@ -103,3 +103,5 @@ jobs:
         run: flutter pub get
       - name: Build for iOS
         run: flutter build ios --release --no-codesign
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
diff --git a/driver/js/include/driver/vm/js_vm.h b/driver/js/include/driver/vm/js_vm.h
@@ -29,9 +29,9 @@
 
 namespace hippy {
 #ifdef ENABLE_INSPECTOR
-namespace devtools{
+namespace devtools {
 class DevtoolsDataSource;
-};
+}
 #endif
 inline namespace driver {
 inline namespace vm {

diff --git a/framework/voltron/core/src/bridge/ios/VoltronJSCExecutor.mm b/framework/voltron/core/src/bridge/ios/VoltronJSCExecutor.mm
@@ -199,11 +199,11 @@ - (void)setup {
 
             std::shared_ptr<hippy::napi::JSCCtx> context = std::static_pointer_cast<hippy::driver::napi::JSCCtx>(scope->GetContext());
             JSContext *jsContext = [JSContext contextWithJSGlobalContextRef:context->GetCtxRef()];
-//            #if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_16_2
-//                if (@available(iOS 16.4, *)) {
-//                    jsContext.inspectable = true;
-//                }
-//            #endif
+            #if defined(__IPHONE_16_4) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_4
+                if (@available(iOS 16.4, *)) {
+                    jsContext.inspectable = true;
+                }
+            #endif
             auto global_object = context->GetGlobalObject();
             auto user_global_object_key = context->CreateString(kGlobalKey);
             context->SetProperty(global_object, user_global_object_key, global_object);