Merge pull request #1298 from openkraken/integrate/flutter-2.8

Integrate support for flutter 2.8.x
openkraken · Apr 7, 2022 · a68f271 · a68f271
2 parents 73b6101 + 90c6ba2
commit a68f271
Show file tree

Hide file tree

Showing 64 changed files with 365 additions and 387 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -5,12 +5,12 @@ on: [workflow_dispatch, pull_request]
 env:
   nodeVersion: "16"
   cmakeVersion: "3.22.x"
-  flutterVersion: "2.5.3"
+  flutterVersion: "2.8.1"
 
 # 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, flutter_2.5.3]
+    runs-on: [self-hosted, benchmark]
     timeout-minutes: 30
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/example_build.yml b/.github/workflows/example_build.yml
@@ -10,7 +10,7 @@ on:
 env:
   nodeVersion: "16"
   cmakeVersion: "3.22.x"
-  flutterVersion: "2.5.3"
+  flutterVersion: "2.8.1"
 
 jobs:
   build_android-app_in_macos:

diff --git a/.github/workflows/integration_test_flutter.yml b/.github/workflows/integration_test_flutter.yml
@@ -5,12 +5,12 @@ on: [workflow_dispatch, pull_request]
 env:
   nodeVersion: "16"
   cmakeVersion: "3.22.x"
-  flutterVersion: "2.5.3"
+  flutterVersion: "2.8.1"
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  integration_test_f_253:
-    runs-on: [self-hosted, flutter_2.5.3]
+  integration_test:
+    runs-on: [self-hosted]
     steps:
     - uses: actions/checkout@v2
     - uses: subosito/flutter-action@v1

diff --git a/.github/workflows/plugin_test_flutter.yml b/.github/workflows/plugin_test_flutter.yml
@@ -5,12 +5,12 @@ on: [workflow_dispatch, pull_request]
 env:
   nodeVersion: "16"
   cmakeVersion: "3.22.x"
-  flutterVersion: "2.5.3"
+  flutterVersion: "2.8.1"
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  plugin_test_f_253:
-    runs-on: [self-hosted, flutter_2.5.3]
+  plugin_test:
+    runs-on: [self-hosted]
     steps:
     - uses: actions/checkout@v2
     - uses: subosito/flutter-action@v1

diff --git a/.github/workflows/sync_to_release.yml b/.github/workflows/sync_to_release.yml
@@ -7,16 +7,16 @@ on:
 
 # Sync main code to release/flutter-2.2.x branch.
 jobs:
-  flutter_2_2_x:
+  flutter_2_5_x:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
     - uses: actions/checkout@v2
       with:
-        ref: 'release/flutter-2.2.x'
+        ref: 'release/flutter-2.5.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'
+        TO_BRANCH: 'release/flutter-2.5.x'
diff --git a/integration_tests/lib/main.dart b/integration_tests/lib/main.dart
@@ -5,14 +5,10 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:kraken/css.dart';
-import 'package:kraken/bridge.dart';
 import 'package:kraken/dom.dart';
 import 'package:kraken/gesture.dart';
 import 'package:kraken/kraken.dart';
-import 'package:kraken/module.dart';
-import 'package:kraken/widget.dart';
 import 'package:ansicolor/ansicolor.dart';
 import 'package:path/path.dart' as path;
 

diff --git a/integration_tests/lib/plugin.dart b/integration_tests/lib/plugin.dart
@@ -5,7 +5,6 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:kraken/bridge.dart';
 import 'package:kraken/css.dart';
 import 'package:kraken/dom.dart';

diff --git a/integration_tests/snapshots/css/css-borders/border-bottom.ts.224244f71.png b/integration_tests/snapshots/css/css-borders/border-bottom.ts.224244f71.png
diff --git a/integration_tests/specs/css/css-flexbox/flex_shrink.ts b/integration_tests/specs/css/css-flexbox/flex_shrink.ts
@@ -825,7 +825,7 @@ describe('flexbox flex-shrink', () => {
     );
 
     document.body.appendChild(container);
-    await snapshot(0.1);
+    await snapshot(0.2);
   });
 
   it('should work with flex item with overflow hidden', async () => {
@@ -904,7 +904,7 @@ describe('flexbox flex-shrink', () => {
                       boxSizing: 'border-box',
                   },
               }, [
-                  
+
               ]),
               createElement(
               'div',
@@ -917,7 +917,7 @@ describe('flexbox flex-shrink', () => {
                       boxSizing: 'border-box',
                   },
               }, [
-                  
+
               ]),
               createElement(
               'div',
@@ -930,7 +930,7 @@ describe('flexbox flex-shrink', () => {
                       boxSizing: 'border-box',
                   },
               }, [
-                  
+
               ]),
               createElement(
               'div',
@@ -943,7 +943,7 @@ describe('flexbox flex-shrink', () => {
                       boxSizing: 'border-box',
                   },
               }, [
-                  
+
               ]),
               createElement(
               'div',
@@ -956,11 +956,11 @@ describe('flexbox flex-shrink', () => {
                       boxSizing: 'border-box',
                   },
               }, [
-                  
+
               ]),
           ])
       ]);
-    
+
     BODY.appendChild(div);
 
     await snapshot();
@@ -998,7 +998,7 @@ describe('flexbox flex-shrink', () => {
                       boxSizing: 'border-box',
                   },
               }, [
-                  
+
               ]),
               createElement(
               'div',
@@ -1011,7 +1011,7 @@ describe('flexbox flex-shrink', () => {
                       boxSizing: 'border-box',
                   },
               }, [
-                  
+
               ]),
               createElement(
               'div',
@@ -1024,7 +1024,7 @@ describe('flexbox flex-shrink', () => {
                       boxSizing: 'border-box',
                   },
               }, [
-                  
+
               ]),
               createElement(
               'div',
@@ -1037,7 +1037,7 @@ describe('flexbox flex-shrink', () => {
                       boxSizing: 'border-box',
                   },
               }, [
-                  
+
               ]),
               createElement(
               'div',
@@ -1050,11 +1050,11 @@ describe('flexbox flex-shrink', () => {
                       boxSizing: 'border-box',
                   },
               }, [
-                  
+
               ]),
           ])
       ]);
-    
+
     BODY.appendChild(div);
 
     await snapshot();

diff --git a/integration_tests/specs/css/css-sizing/block-fit.ts b/integration_tests/specs/css/css-sizing/block-fit.ts
@@ -52,6 +52,6 @@ describe('block-fit', () => {
     );
     BODY.appendChild(parent);
 
-    await snapshot();
+    await snapshot(0.2);
   });
 });
diff --git a/kraken/example/lib/main.dart b/kraken/example/lib/main.dart
@@ -1,5 +1,6 @@
-import 'dart:ui';
-
+/*
+ * Copyright (C) 2022-present The Kraken authors. All rights reserved.
+ */
 import 'package:flutter/material.dart';
 import 'package:kraken/kraken.dart';
 import 'package:kraken/devtools.dart';

diff --git a/kraken/lib/src/bridge/from_native.dart b/kraken/lib/src/bridge/from_native.dart
@@ -9,16 +9,11 @@ import 'dart:ui';
 
 import 'package:ffi/ffi.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/painting.dart';
-import 'package:flutter/services.dart';
 import 'package:kraken/bridge.dart';
 import 'package:kraken/launcher.dart';
 import 'package:kraken/module.dart';
 import 'package:kraken/src/module/performance_timing.dart';
 
-import 'native_types.dart';
-import 'dynamic_library.dart';
-
 // An native struct can be directly convert to javaScript String without any conversion cost.
 class NativeString extends Struct {
   external Pointer<Uint16> string;

diff --git a/kraken/lib/src/bridge/native_value.dart b/kraken/lib/src/bridge/native_value.dart
@@ -1,16 +1,13 @@
 /*
  * Copyright (C) 2021-present The Kraken authors. All rights reserved.
  */
-
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:ffi';
 
 import 'package:ffi/ffi.dart';
 import 'package:kraken/bridge.dart';
 
-import 'from_native.dart';
-
 class NativeValue extends Struct {
   @Double()
   external double float64;

diff --git a/kraken/lib/src/bridge/to_native.dart b/kraken/lib/src/bridge/to_native.dart
@@ -12,11 +12,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:kraken/dom.dart';
 import 'package:kraken/kraken.dart';
-import 'package:kraken/module.dart';
-
-import 'from_native.dart';
-import 'native_types.dart';
-import 'dynamic_library.dart';
 
 // Steps for using dart:ffi to call a C function from Dart:
 // 1. Import dart:ffi.

diff --git a/kraken/lib/src/css/background.dart b/kraken/lib/src/css/background.dart
@@ -3,7 +3,6 @@
  */
 
 import 'dart:math' as math;
-import 'dart:ui';
 
 import 'package:flutter/painting.dart';
 import 'package:flutter/rendering.dart';

diff --git a/kraken/lib/src/css/border.dart b/kraken/lib/src/css/border.dart
@@ -2,9 +2,7 @@
  * Copyright (C) 2019-present The Kraken authors. All rights reserved.
  */
 import 'dart:core';
-import 'dart:ui';
 
-import 'package:flutter/painting.dart';
 import 'package:flutter/rendering.dart';
 import 'package:kraken/css.dart';
 

diff --git a/kraken/lib/src/css/box.dart b/kraken/lib/src/css/box.dart
@@ -3,9 +3,7 @@
  */
 
 import 'dart:core';
-import 'dart:ui';
 
-import 'package:flutter/painting.dart';
 import 'package:flutter/rendering.dart';
 import 'package:kraken/css.dart';
 

diff --git a/kraken/lib/src/css/margin.dart b/kraken/lib/src/css/margin.dart
@@ -2,8 +2,6 @@
  * Copyright (C) 2019-present The Kraken authors. All rights reserved.
  */
 
-import 'dart:ui';
-
 import 'package:flutter/rendering.dart';
 import 'package:kraken/css.dart';
 import 'package:kraken/rendering.dart';

diff --git a/kraken/lib/src/css/overflow.dart b/kraken/lib/src/css/overflow.dart
@@ -3,7 +3,6 @@
  */
 
 import 'package:flutter/animation.dart';
-import 'package:flutter/painting.dart';
 import 'package:flutter/rendering.dart';
 import 'package:kraken/css.dart';
 import 'package:kraken/dom.dart';
@@ -457,7 +456,7 @@ mixin ElementOverflowMixin on ElementBase {
 
   void _scroll(num aim, Axis direction, { bool? withAnimation = false }) {
     KrakenScrollable? scrollable = _getScrollable(direction);
-    if (scrollable != null && aim is num) {
+    if (scrollable != null) {
       double distance = aim.toDouble();
 
       // Apply scroll effect after layout.

diff --git a/kraken/lib/src/css/padding.dart b/kraken/lib/src/css/padding.dart
@@ -1,9 +1,6 @@
 /*
  * Copyright (C) 2019-present The Kraken authors. All rights reserved.
  */
-
-import 'dart:ui';
-
 import 'package:flutter/rendering.dart';
 import 'package:kraken/css.dart';
 import 'package:kraken/rendering.dart';

diff --git a/kraken/lib/src/css/positioned.dart b/kraken/lib/src/css/positioned.dart
@@ -324,8 +324,7 @@ class CSSPositionedLayout {
     if (child.hasSize &&
       !needsRelayout &&
       (childConstraints == child.constraints) &&
-      ((child is RenderBoxModel && !child.needsLayout) ||
-        (child is RenderTextBox && !child.needsLayout))
+      (!child.needsLayout)
     ) {
       isChildNeedsLayout = false;
     }

diff --git a/kraken/lib/src/css/transform.dart b/kraken/lib/src/css/transform.dart
@@ -5,7 +5,6 @@
 import 'package:flutter/rendering.dart';
 import 'package:kraken/css.dart';
 import 'package:kraken/rendering.dart';
-import 'package:vector_math/vector_math_64.dart';
 
 const Offset _DEFAULT_TRANSFORM_OFFSET = Offset.zero;
 const Alignment _DEFAULT_TRANSFORM_ALIGNMENT = Alignment.center;

diff --git a/kraken/lib/src/css/values/color.dart b/kraken/lib/src/css/values/color.dart
@@ -3,7 +3,6 @@
  */
 
 import 'dart:math';
-import 'dart:ui' show Color;
 
 import 'package:quiver/collection.dart';
 import 'package:flutter/material.dart';

diff --git a/kraken/lib/src/devtools/server.dart b/kraken/lib/src/devtools/server.dart
@@ -8,12 +8,9 @@ import 'dart:isolate';
 import 'dart:ffi';
 import 'dart:typed_data';
 
-import 'package:kraken/module.dart';
-import 'package:kraken/bridge.dart';
 import 'package:kraken/kraken.dart';
 import 'package:kraken/devtools.dart';
 import 'package:ffi/ffi.dart';
-import '../bridge/dynamic_library.dart';
 
 const String CONTENT_TYPE = 'Content-Type';
 const String CONTENT_LENGTH = 'Content-Length';

diff --git a/kraken/lib/src/devtools/service.dart b/kraken/lib/src/devtools/service.dart
@@ -9,7 +9,6 @@ import 'dart:typed_data';
 import 'package:ffi/ffi.dart';
 import 'package:kraken/kraken.dart';
 import 'package:kraken/devtools.dart';
-import '../bridge/dynamic_library.dart';
 
 typedef NativePostTaskToInspectorThread = Void Function(Int32 contextId, Pointer<Void> context, Pointer<Void> callback);
 typedef DartPostTaskToInspectorThread = void Function(int contextId, Pointer<Void> context, Pointer<Void> callback);

diff --git a/kraken/lib/src/dom/element.dart b/kraken/lib/src/dom/element.dart
@@ -7,16 +7,13 @@ import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/gestures.dart';
-import 'package:flutter/painting.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:kraken/css.dart';
 import 'package:kraken/dom.dart';
 import 'package:kraken/foundation.dart';
 import 'package:kraken/rendering.dart';
 import 'package:kraken/widget.dart';
-import 'package:meta/meta.dart';
 
 final RegExp _splitRegExp = RegExp(r'\s+');
 const String _ONE_SPACE = ' ';