Merge branch 'master' into develop_nullsafety

.github/dependabot.yml

@@ -0,0 +1,64 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+enable-beta-ecosystems: true
+updates:
+  - package-ecosystem: "pub"
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "09:00"
+      timezone: Asia/Shanghai
+    open-pull-requests-limit: 5
+  - package-ecosystem: "pub"
+    directory: "/kits/flutter_ume_kit_channel_monitor"
+    schedule:
+      interval: weekly
+      time: "09:00"
+      timezone: Asia/Shanghai
+    open-pull-requests-limit: 5
+  - package-ecosystem: "pub"
+    directory: "/kits/flutter_ume_kit_console"
+    schedule:
+      interval: weekly
+      time: "09:00"
+      timezone: Asia/Shanghai
+    open-pull-requests-limit: 5
+  - package-ecosystem: "pub"
+    directory: "/kits/flutter_ume_kit_device"
+    schedule:
+      interval: weekly
+      time: "09:00"
+      timezone: Asia/Shanghai
+    open-pull-requests-limit: 5
+  - package-ecosystem: "pub"
+    directory: "/kits/flutter_ume_kit_dio"
+    schedule:
+      interval: weekly
+      time: "09:00"
+      timezone: Asia/Shanghai
+    open-pull-requests-limit: 5
+  - package-ecosystem: "pub"
+    directory: "/kits/flutter_ume_kit_perf"
+    schedule:
+      interval: weekly
+      time: "09:00"
+      timezone: Asia/Shanghai
+    open-pull-requests-limit: 5
+  - package-ecosystem: "pub"
+    directory: "/kits/flutter_ume_kit_show_code"
+    schedule:
+      interval: weekly
+      time: "09:00"
+      timezone: Asia/Shanghai
+    open-pull-requests-limit: 5
+  - package-ecosystem: "pub"
+    directory: "/kits/flutter_ume_kit_ui"
+    schedule:
+      interval: weekly
+      time: "09:00"
+      timezone: Asia/Shanghai
+    open-pull-requests-limit: 5

.github/workflows/coverage.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-      - develop
-      - develop_nullsafety
     paths:
       - "lib/**"
       - "kits/flutter_ume_kit_console/lib/**"
@@ -21,17 +19,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ env.GITHUB_REF }}
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
-          java-version: "12.x"
+          distribution: "adopt"
+          java-version: "11"
       - name: Flutter action
-        uses: subosito/flutter-action@v1.5.3
+        uses: subosito/flutter-action@v2
         with:
-          flutter-version: "2.2.x"
-          channel: stable
+          channel: "stable"
       - run: |
           flutter pub get
           flutter pub run flutter_coverage_badge --exclude lib/util/flutter_logo.dart

.github/workflows/flutter_drive.yml

@@ -1,47 +1,75 @@
-name: flutter drive
-on: [push, pull_request]
+name: Flutter drive
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   drive_ios:
+    runs-on: macos-latest
     strategy:
       matrix:
-        device:
-        - "iPhone 8"
-        - "iPhone 13 Pro Max"
+        device: ["iPhone 8", "iPhone 13 Pro Max"]
       fail-fast: false
-    runs-on: macOS-latest
     steps:
-    - name: "List all simulators"
-      run: xcrun xctrace list devices
-    - name: "Start Simulator"
-      run: xcrun simctl boot "${{ matrix.device }}"
-    - uses: actions/checkout@v2
-    - uses: subosito/flutter-action@v1.5.3
-      with:
-        channel: 'stable'
-        flutter-version: '2.2.x'
-    - name: "Run Flutter Driver tests"
-      run: "flutter drive --target=test_driver/app.dart"
-      working-directory: example
+      - uses: actions/checkout@v3
+      - name: List all simulators
+        run: xcrun xctrace list devices
+
+      - name: Start Simulator
+        run: xcrun simctl boot "${{ matrix.device }}"
+      - uses: actions/checkout@v2
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2.7.1
+        with:
+          channel: "stable"
+          architecture: x64
+
+      - name: Run Flutter Driver tests
+        run: flutter drive --target=test_driver/app.dart
+        working-directory: example
 
   drive_android:
     runs-on: macos-latest
     strategy:
       matrix:
-        api-level: [21, 29]
+        api-level: [21, 31]
+        arch: ["x86_64"]
         target: [default]
     steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1.5.3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
         with:
-          flutter-version: '2.2.x'
-          channel: 'stable'
+          distribution: "adopt"
+          java-version: "11"
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2.7.1
+        with:
+          channel: "stable"
+
+      - name: Gradle cache
+        uses: gradle/gradle-build-action@v2.3.0
+
+      - name: AVD cache
+        uses: actions/cache@v3
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+
       - name: Run Flutter Driver tests
-        uses: reactivecircus/android-emulator-runner@v2
+        uses: reactiveCircus/android-emulator-runner@v2.25.0
         with:
           api-level: ${{ matrix.api-level }}
-          target: ${{ matrix.target }}
-          arch: x86_64
-          profile: Nexus 6
+          arch: ${{ matrix.arch }}
           script: flutter drive --target=test_driver/app.dart
+          target: ${{ matrix.target }}
           working-directory: ./example

.github/workflows/notify.yml

@@ -18,4 +18,3 @@ jobs:
           content: |
             https://github.com/bytedance/flutter_ume/releases
             from: ${{ github.repository }}
-    

.github/workflows/build_eaxmple.yml → .github/workflows/release_build_example.yml

@@ -1,4 +1,4 @@
-name: build_eaxmple
+name: Release & build example
 
 on:
   push:
@@ -10,15 +10,14 @@ jobs:
     name: release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
-          java-version: "12.x"
-      - name: Flutter action
-        uses: subosito/flutter-action@v1.5.3
+          distribution: "adopt"
+          java-version: "11"
+      - uses: subosito/flutter-action@v2.7.1
         with:
-          flutter-version: '2.2.x'
-          channel: stable
+          channel: "stable"
       - run: flutter pub get
         working-directory: example
       - run: flutter build apk --debug

.github/workflows/test.yml

@@ -1,30 +1,42 @@
-name: test
+name: Flutter Test
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
-  build:
+  test_all_kits:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
         with:
-          java-version: '12.x'
-      - name: Flutter action
-        uses: subosito/flutter-action@v1.5.3
+          distribution: "adopt"
+          java-version: "11"
+      - uses: subosito/flutter-action@v2.7.1
         with:
-          flutter-version: '2.2.x'
-          channel: stable
-      - run: flutter test --enable-vmservice
-      - run: flutter test --enable-vmservice
+          channel: "stable"
+      - name: Run test for UME
+        run: flutter test --enable-vmservice
+      - name: Run test for UME Device kit
+        run: flutter test --enable-vmservice
         working-directory: kits/flutter_ume_kit_device
-      - run: flutter test --enable-vmservice
+      - name: Run test for UME Perf kit
+        run: flutter test --enable-vmservice
         working-directory: kits/flutter_ume_kit_perf
-      - run: flutter test --enable-vmservice
+      - name: Run test for UME Show code kit
+        run: flutter test --enable-vmservice
         working-directory: kits/flutter_ume_kit_show_code
-      - run: flutter test --enable-vmservice
+      - name: Run test for UME UI kit
+        run: flutter test --enable-vmservice
         working-directory: kits/flutter_ume_kit_ui
-      - run: flutter test --enable-vmservice
+      - name: Run test for UME Console kit
+        run: flutter test --enable-vmservice
         working-directory: kits/flutter_ume_kit_console
-      - run: flutter test --enable-vmservice
+      - name: Run test for UME Dio kit
+        run: flutter test --enable-vmservice
         working-directory: kits/flutter_ume_kit_dio

CHANGELOG.md

@@ -2,6 +2,53 @@
 
 [简体中文](./CHANGELOG_cn.md)
 
+## [1.1.2]
+
+* #82 Fix flutter_logo.dart error in Flutter 3.0.5 
+
+## [1.1.1+1]
+
+* Update latest dependencies.
+
+## [1.1.1]
+
+* #66 [fix] toolbar initial position is incorrect
+
+## [1.1.0+3]
+
+* Fix static analyze issues.
+
+## [1.1.0+2]
+
+* Fix static analyze issues.
+
+## [1.1.0]
+
+* #76 Introduce `UMEWidget.closeActivatedPlugin()`. Issue #35
+* #75 Remove overlay entry only when it's been inserted. Issue #65
+* #72 [Android] Migrate the example to the v2 embedding
+
+## [1.0.2+1]
+
+* Dart format.
+
+## [1.0.2]
+
+* Fix error in code static analysis.
+
+## [1.0.1]
+
+* Fix error in pubspec.yaml in example
+
+## [1.0.0]
+
+* Normal version with adaption of Flutter 3.
+* Feature: Anywhere door (Route)
+
+## [1.0.0-dev.0]
+
+* Adapt Flutter 3.
+
 ## [0.3.0+1]
 
 * Fix the version error