Merge remote-tracking branch 'origin/main' into feat/linux_support

openkraken · Jan 12, 2022 · 2b6e213 · 2b6e213
2 parents 4802977 + 1545d0a
commit 2b6e213
Show file tree

Hide file tree

Showing 876 changed files with 101,037 additions and 11,970 deletions.
diff --git a/.github/wip.yml b/.github/wip.yml
@@ -0,0 +1,8 @@
+locations:
+  - title
+  - label_name
+  - commit_subject
+terms:
+  - wip
+  - ⛔
+  - 🚧
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -5,7 +5,7 @@ on: [workflow_dispatch, pull_request]
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   benchmark:
-    runs-on: [self-hosted, benchmark]
+    runs-on: [self-hosted, benchmark, flutter_2.5.3]
     timeout-minutes: 30
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/bridge_compile_test.yml b/.github/workflows/bridge_compile_test.yml
@@ -0,0 +1,45 @@
+name: Bridge Compile Test
+
+on: [push]
+
+jobs:
+  build_for_android:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: nttld/setup-ndk@v1
+      id: setup-ndk
+      with:
+        ndk-version: r21e
+    - name: npm install
+      run: npm install
+    - name: compile for android
+      run: npm run build:bridge:android:release
+      env:
+        ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
+
+  build_for_ios:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: nttld/setup-ndk@v1
+      id: setup-ndk
+      with:
+        ndk-version: r21e
+    - name: npm install
+      run: npm install
+    - name: compile for ios
+      run: npm run build:bridge:ios:release
+
+  build_for_macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: nttld/setup-ndk@v1
+      id: setup-ndk
+      with:
+        ndk-version: r21e
+    - name: npm install
+      run: npm install
+    - name: compile for macos
+      run: npm run build:bridge:macos:release
diff --git a/.github/workflows/code_linter.yml b/.github/workflows/code_linter.yml
@@ -3,6 +3,15 @@ name: Run Code Linter
 on: [push]
 
 jobs:
+  check_merge_conflict:
+    runs-on: ubuntu-latest
+    name: Find merge conflicts
+    steps:
+      # Checkout the source code so we have some files to look at.
+      - uses: actions/checkout@v2
+      # Run the actual merge conflict finder
+      - name: Merge Conflict finder
+        uses: olivernybroe/action-conflict-finder@v3.0
   reformat-bridge:
     runs-on: ubuntu-latest
 

diff --git a/...kflows/integration_test_flutter_2.2.0.yml → ...ub/workflows/integration_test_flutter.yml b/...kflows/integration_test_flutter_2.2.0.yml → ...ub/workflows/integration_test_flutter.yml
@@ -1,11 +1,11 @@
-name: Integration Test with Flutter 2.2.0
+name: Integration Test
 
 on: [workflow_dispatch, pull_request]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  integration_test:
-    runs-on: [self-hosted, flutter_2.2.0]
+  integration_test_f_253:
+    runs-on: [self-hosted, flutter_2.5.3]
     steps:
     - uses: actions/checkout@v2
     - name: Run Test
@@ -18,3 +18,4 @@ jobs:
     - name: Check on failures
       if: steps.test.outcome != 'success'
       run: exit 1
+
diff --git a/...b/workflows/plugin_test_flutter_2.2.0.yml → .github/workflows/plugin_test_flutter.yml b/...b/workflows/plugin_test_flutter_2.2.0.yml → .github/workflows/plugin_test_flutter.yml
@@ -1,11 +1,11 @@
-name: Plugin Test with Flutter 2.2.0
+name: Plugin Test
 
 on: [workflow_dispatch, pull_request]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  integration_test:
-    runs-on: [self-hosted, flutter_2.2.0]
+  plugin_test_f_253:
+    runs-on: [self-hosted, flutter_2.5.3]
     steps:
     - uses: actions/checkout@v2
     - name: Run Plugin Test

diff --git a/.github/workflows/sync_to_release.yml b/.github/workflows/sync_to_release.yml
@@ -0,0 +1,22 @@
+name: Sync main code to release branch
+
+on:
+  push:
+    branches:
+      - main
+
+# Sync main code to release/flutter-2.2.x branch.
+jobs:
+  flutter_2_2_x:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: 'release/flutter-2.2.x'
+    - name: Opening pull request
+      uses: tretuna/sync-branches@1.2.0
+      with:
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        FROM_BRANCH: 'main'
+        TO_BRANCH: 'release/flutter-2.2.x'
diff --git a/.gitignore b/.gitignore
@@ -66,3 +66,4 @@ Podfile.lock
 
 temp
 coverage
+pubspec.lock
diff --git a/README.md b/README.md
@@ -42,7 +42,8 @@ Only flutter stable released version are fully tested.
 | Kraken  | Flutter |
 | ------------- | ------------- |
 | >= 0.7.0 < 0.8.0 | 1.22.0 ~ 1.22.6 |
-| >= 0.8.0 < 0.10.0  | 2.2.0 ~ 2.2.3  |
+| >= 0.8.0 < 0.10.0  | 2.2.0 ~ 2.2.3 |
+| >= 0.10.0 < 0.12.0 | 2.5.0 ~ 2.5.3 |
 
 
 ## 👏 Contributing
@@ -102,3 +103,7 @@ By contributing to Kraken, you agree that your contributions will be licensed un
     ```shell
     $ npm test
     ```
+
+
+
+
diff --git a/bridge/CMakeLists.txt b/bridge/CMakeLists.txt
@@ -99,6 +99,7 @@ list(APPEND BRIDGE_SOURCE
   foundation/task_queue.cc
   foundation/task_queue.h
   foundation/ui_command_buffer.cc
+  foundation/ui_command_buffer.h
   foundation/ui_command_callback_queue.cc
   foundation/closure.h
   dart_methods.cc
@@ -173,16 +174,22 @@ if ($ENV{KRAKEN_JS_ENGINE} MATCHES "quickjs")
     ${CMAKE_CURRENT_SOURCE_DIR}/third_party/quickjs/quickjs-atom.h
     ${CMAKE_CURRENT_SOURCE_DIR}/third_party/quickjs/quickjs-opcode.h
     )
-  add_library(quickjs SHARED ${QUICK_JS_SOURCE})
+  if(${STATIC_QUICKJS})
+    add_library(quickjs STATIC ${QUICK_JS_SOURCE})
+  else()
+    add_library(quickjs SHARED ${QUICK_JS_SOURCE})
+  endif()
 
   list(APPEND BRIDGE_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
   list(APPEND BRIDGE_LINK_LIBS quickjs)
 
   list(APPEND BRIDGE_SOURCE
-    bridge_qjs.cc
-    bridge_qjs.h
-    bindings/qjs/js_context.cc
-    bindings/qjs/js_context.h
+    page.cc
+    page.h
+    bindings/qjs/garbage_collected.h
+    bindings/qjs/executing_context.cc
+    bindings/qjs/executing_context.h
+    bindings/qjs/heap_hashmap.h
     bindings/qjs/native_value.cc
     bindings/qjs/native_value.h
     bindings/qjs/host_object.h
@@ -200,6 +207,14 @@ if ($ENV{KRAKEN_JS_ENGINE} MATCHES "quickjs")
     bindings/qjs/bom/screen.h
     bindings/qjs/bom/timer.cc
     bindings/qjs/bom/timer.h
+    bindings/qjs/bom/dom_timer_coordinator.cc
+    bindings/qjs/bom/dom_timer_coordinator.h
+    bindings/qjs/dom/frame_request_callback_collection.cc
+    bindings/qjs/dom/frame_request_callback_collection.h
+    bindings/qjs/dom/event_listener_map.cc
+    bindings/qjs/dom/event_listener_map.h
+    bindings/qjs/dom/script_animation_controller.cc
+    bindings/qjs/dom/script_animation_controller.h
     bindings/qjs/dom/event_target.cc
     bindings/qjs/dom/event_target.h
     bindings/qjs/dom/event.cc
@@ -359,11 +374,14 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "iOS")
     PUBLIC_HEADER ${KRAKEN_PUBLIC_HEADERS}
     )
 
-  set_target_properties(quickjs PROPERTIES
-    OUTPUT_NAME quickjs
-    FRAMEWORK TRUE
-    FRAMEWORK_VERSION C
-    MACOSX_FRAMEWORK_IDENTIFIER com.openkraken.quickjs
-    PUBLIC_HEADER ${QUICKJS_PUBLIC_HEADERS}
-    )
+  # If quickjs is static, there will be no quickjs.framework any more.
+  if(NOT DEFINED STATIC_QUICKJS)
+    set_target_properties(quickjs PROPERTIES
+      OUTPUT_NAME quickjs
+      FRAMEWORK TRUE
+      FRAMEWORK_VERSION C
+      MACOSX_FRAMEWORK_IDENTIFIER com.openkraken.quickjs
+      PUBLIC_HEADER ${QUICKJS_PUBLIC_HEADERS}
+      )
+  endif()
 endif ()