Merge pull request #1 from openwebf/feat/flutter-3

Author: andycall

.github/workflows/code_linter.yml

@@ -46,8 +46,8 @@ jobs:
         inplace: True
     - uses: EndBug/add-and-commit@v4
       with:
-        author_name: openkraken-bot
-        author_email: [email protected].com
+        author_name: openwebf-bot
+        author_email: openwebf@openwebf.com
         message: 'Committing clang-format changes'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/example_build.yml

@@ -10,7 +10,7 @@ on:
 env:
   nodeVersion: "16"
   cmakeVersion: "3.22.x"
-  flutterVersion: "2.8.1"
+  flutterVersion: "3.0.4"
 
 jobs:
   build_android-app_in_macos:
@@ -35,7 +35,7 @@ jobs:
 
       - name: android app build
         run: |
-          cd kraken/
+          cd webf/
           flutter pub get
           cd example/
           flutter build apk --release
@@ -60,7 +60,7 @@ jobs:
 
       - name: ios app build
         run: |
-          cd kraken/
+          cd webf/
           flutter pub get
           cd example/
           flutter build ios --release --no-codesign
@@ -86,7 +86,7 @@ jobs:
 
       - name: macos app build
         run: |
-          cd kraken/
+          cd webf/
           flutter pub get
           cd example/
           flutter build macos --release
@@ -115,7 +115,7 @@ jobs:
       - run: flutter doctor -v
       - name: linux app build
         run: |
-          cd kraken/
+          cd webf/
           flutter pub get
           cd example/
           flutter build linux --release

.github/workflows/integration_test_flutter.yml

@@ -5,12 +5,12 @@ on: [workflow_dispatch, pull_request]
 env:
   nodeVersion: "16"
   cmakeVersion: "3.22.x"
-  flutterVersion: "2.8.1"
+  flutterVersion: "3.0.4"
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   setup:
-    runs-on: macos-latest
+    runs-on: macos-12
     outputs:
       matrix: ${{ steps.matrix.outputs.value }}
     steps:
@@ -20,7 +20,7 @@ jobs:
           JSON=$(node -e "console.log(JSON.stringify(require('./integration_tests/spec_group.json').map(j=>j.name)))")
           echo "::set-output name=value::$(echo $JSON)"
   build_bridge:
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
@@ -35,8 +35,34 @@ jobs:
       with:
         name: macos_bridge_binary
         path: bridge/build/macos/
+
+  bridge_unit_test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: ${{ env.nodeVersion }}
+    - uses: jwlawson/[email protected]
+      with:
+        cmake-version: ${{ env.cmakeVersion }}
+    - run: npm i
+    - run: ENABLE_ASAN=true npm run build:bridge:linux
+    - run: node scripts/run_bridge_unit_test.js
+
+  webf_unit_test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: subosito/flutter-action@v2
+      with:
+        flutter-version: ${{ env.flutterVersion }}
+    - run: flutter config --enable-macos-desktop
+    - run: flutter doctor -v
+    - run: cd webf && flutter test
+
   integration_test:
-    runs-on: macos-latest
+    runs-on: macos-12
     needs: [ setup, build_bridge ]
     strategy:
       fail-fast: false
@@ -69,7 +95,7 @@ jobs:
       if: steps.test.outcome != 'success'
       run: exit 1
   plugin_test:
-    runs-on: macos-latest
+    runs-on: macos-12
     needs: [ build_bridge ]
     steps:
     - uses: actions/checkout@v2

.github/workflows/publish_to_dart_dev.yml

@@ -1,4 +1,4 @@
-name: Publish Kraken To pub.dev
+name: Publish WebF To pub.dev
 
 on:
   release:
@@ -66,7 +66,7 @@ jobs:
         name: ios_binary
         path: bridge/build/ios/
   build_android_binary:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
@@ -99,8 +99,6 @@ jobs:
         flutter-version: ${{ env.flutterVersion }}
     - name: NPM INSTALL
       run: npm install
-    - name: Set up nightly version
-      run: node scripts/set_up_nightly_release.js
     - uses: actions/download-artifact@v2
       with:
         name: linux_binary
@@ -118,13 +116,13 @@ jobs:
         name: android_binary
         path: bridge/build/android/
     - name: Prepare distribute binaries
-      run: node scripts/pre_publish_kraken.js
+      run: node scripts/pre_publish_webf.js
     - name: Publish
       uses: k-paxian/dart-package-publisher@master
       with:
         credentialJson: ${{ secrets.CREDENTIAL_JSON }}
         force: true
         flutter: true
         skipTests: true
-        relativePath: ./kraken
+        relativePath: ./webf
 

.github/workflows/publish_to_dart_dev_nightly.yml

@@ -1,4 +1,4 @@
-name: Publish Kraken To pub.dev Nightly
+name: Publish WebF To pub.dev Nightly
 
 on:
   schedule:

.github/workflows/sync_to_release.yml

@@ -49,8 +49,8 @@ execute_process(
 )
 string(REGEX REPLACE "\n$" "" DART_SDK "${DART_SDK}")
 
-list(APPEND KRAKEN_PUBLIC_HEADERS
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/kraken_bridge.h
+list(APPEND WEBF_PUBLIC_HEADERS
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/webf_bridge.h
 )
 
 set(QUICKJS_PUBLIC_HEADERS
@@ -81,9 +81,9 @@ if (DEFINED PLATFORM)
 endif()
 
 list(APPEND BRIDGE_SOURCE
-  kraken_bridge.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/kraken_bridge.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/kraken_foundation.h
+        webf_bridge.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/webf_bridge.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/webf_foundation.h
   ${CMAKE_CURRENT_SOURCE_DIR}/include/dart_methods.h
   foundation/logging.cc
   foundation/logging.h
@@ -152,7 +152,7 @@ list(APPEND BRIDGE_INCLUDE
 set(BINDING_DIR ${CMAKE_CURRENT_LIST_DIR}/bindings)
 
 if ($ENV{WEBF_JS_ENGINE} MATCHES "quickjs")
-  add_compile_options(-DKRAKEN_QUICK_JS_ENGINE=1)
+  add_compile_options(-DWEBF_QUICK_JS_ENGINE=1)
 
   execute_process(
     COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/third_party/quickjs/VERSION
@@ -296,7 +296,7 @@ if ($ENV{WEBF_JS_ENGINE} MATCHES "quickjs")
 endif ()
 
 list(APPEND PUBLIC_HEADER
-  include/kraken_bridge.h
+  include/webf_bridge.h
   )
 
 add_library(webf SHARED ${BRIDGE_SOURCE})
@@ -335,7 +335,7 @@ if ($ENV{WEBF_JS_ENGINE} MATCHES "quickjs")
   endif ()
 endif ()
 
-### KrakenStatic
+### webfStatic
 target_include_directories(webf_static PRIVATE
   ${BRIDGE_INCLUDE}
   ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ./include)
@@ -389,7 +389,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "iOS")
     MACOSX_FRAMEWORK_IDENTIFIER com.openwebf.webf-bridge
     MACOSX_FRAMEWORK_BUNDLE_VERSION 1.0
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING 1.0
-    PUBLIC_HEADER ${KRAKEN_PUBLIC_HEADERS}
+    PUBLIC_HEADER ${WEBF_PUBLIC_HEADERS}
     )
 
   # If quickjs is static, there will be no quickjs.framework any more.

bridge/CMakeLists.txt

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021-present The Kraken authors. All rights reserved.
+ * Copyright (C) 2019-2022 The Kraken authors. All rights reserved.
+ * Copyright (C) 2022-present The WebF authors. All rights reserved.
  */
 
 #include "blob.h"
 #include "dart_methods.h"
 
-namespace kraken::binding::qjs {
+namespace webf::binding::qjs {
 
 std::once_flag kBlobInitOnceFlag;
 
@@ -277,4 +278,4 @@ int32_t BlobInstance::size() {
 uint8_t* BlobInstance::bytes() {
   return _data.data();
 }
-}  // namespace kraken::binding::qjs
+}  // namespace webf::binding::qjs

bridge/bindings/qjs/bom/blob.cc

@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2021-present The Kraken authors. All rights reserved.
+ * Copyright (C) 2019-2022 The Kraken authors. All rights reserved.
+ * Copyright (C) 2022-present The WebF authors. All rights reserved.
  */
 
-#ifndef KRAKENBRIDGE_BLOB_H
-#define KRAKENBRIDGE_BLOB_H
+#ifndef BRIDGE_BLOB_H
+#define BRIDGE_BLOB_H
 
 #include "bindings/qjs/host_class.h"
 
-namespace kraken::binding::qjs {
+namespace webf::binding::qjs {
 
 class BlobBuilder;
 class BlobInstance;
@@ -73,6 +74,6 @@ class BlobBuilder {
   std::vector<uint8_t> _data;
 };
 
-}  // namespace kraken::binding::qjs
+}  // namespace webf::binding::qjs
 
-#endif  // KRAKENBRIDGE_BLOB_H
+#endif  // BRIDGE_BLOB_H

bridge/bindings/qjs/bom/blob.h

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021-present The Kraken authors. All rights reserved.
+ * Copyright (C) 2019-2022 The Kraken authors. All rights reserved.
+ * Copyright (C) 2022-present The WebF authors. All rights reserved.
  */
 
 #include "console.h"
 #include "foundation/logging.h"
 
-namespace kraken::binding::qjs {
+namespace webf::binding::qjs {
 
 JSValue print(JSContext* ctx, JSValueConst this_val, int argc, JSValueConst* argv) {
   std::stringstream stream;
@@ -31,7 +32,7 @@ JSValue print(JSContext* ctx, JSValueConst this_val, int argc, JSValueConst* arg
 }
 
 void bindConsole(ExecutionContext* context) {
-  QJS_GLOBAL_BINDING_FUNCTION(context, print, "__kraken_print__", 2);
+  QJS_GLOBAL_BINDING_FUNCTION(context, print, "__webf_print__", 2);
 }
 
-}  // namespace kraken::binding::qjs
+}  // namespace webf::binding::qjs