From 40c7b3a13b0bccd667b570131d71b9607e96b033 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Fri, 10 Jan 2025 16:03:57 +0000 Subject: [PATCH] cmake: we now use flutter engine from our 3rdparty No longer needed to have env variables pointing to a local flutter which needed to exist somewhere else. download_engine.sh now detects which flutter version you need and downloads it. --- .devcontainer/Dockerfile | 63 -------------------- .devcontainer/devcontainer.json | 39 ------------- .github/docker/Dockerfile | 71 ----------------------- .github/docker/compose.yml | 5 -- .github/workflows/build.yml | 36 +++++++----- .gitignore | 1 + 3rdparty/flutter | 2 +- CMakeLists.txt | 71 +++++++++-------------- README.md | 16 +++-- build_example.sh | 3 +- download_engine.sh | 26 +++++++-- engine_binaries/README.md | 1 + examples/default_counter_app/pubspec.lock | 30 +++++----- src/3rdparty/flutter/glfw_shell.h | 2 +- src/Embedder.cpp | 1 - src/Embedder.h | 2 +- src/FlutterWindow.h | 2 +- 17 files changed, 100 insertions(+), 271 deletions(-) delete mode 100644 .devcontainer/Dockerfile delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 .github/docker/Dockerfile delete mode 100644 .github/docker/compose.yml create mode 100644 engine_binaries/README.md diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index b60c39a..0000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -# This file is part of qt-flutter-embedder. -# -# SPDX-FileCopyrightText: 2024 Klarälvdalens Datakonsult AB, a KDAB Group -# company Author: Sérgio Martins -# SPDX-License-Identifier: GPL-3.0-only Contact KDAB at for -# commercial licensing options. - -# Docker container for building the engine and testing qt-flutter-embedder -# in CI - -# docker build --build-arg GITHUB_RUNNER_TOKEN=$GITHUB_RUNNER_TOKEN -t qt-flutter-embedder . -# docker run -it qt-flutter-embedder /home/ubuntu/actions-runner/run.sh - -FROM ubuntu:24.10 -MAINTAINER Sergio Martins (sergio.martins@kdab.com) - -ARG GITHUB_RUNNER_TOKEN - -ENV TZ=Europe/Berlin -ENV LC_CTYPE=C.UTF-8 -# ENV LD_LIBRARY_PATH=/Qt5/lib/:/Qt6/lib/ -ENV PATH=$PATH:/home/ubuntu/depot_tools/:/home/ubuntu/flutter/bin/ -ENV DISPLAY=:0 -ENV FLUTTER_ENGINE_FOLDER=/home/ubuntu/engine/src/flutter - -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - -RUN apt update -qq && apt install build-essential software-properties-common lld git cmake ninja-build vim curl wget gdebi-core libdbus-glib-1-2 \ - mesa-common-dev libglu1-mesa-dev libglib2.0-dev libfontconfig \ - libxkbcommon-dev mesa-utils libgl1-mesa-dev libglu1-mesa-dev \ - libxkbcommon-x11-0 libssl-dev openssl unzip clang libgtk-3-dev \ - qt6-base-dev time qt6-base-private-dev xvfb \ - -y - -# Install GitHub command-line interface (gh) -# Instructions copied from https://github.com/cli/cli/blob/trunk/docs/install_linux.md -RUN mkdir -p -m 755 /etc/apt/keyrings \ - && curl -s https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \ - && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ - && apt-get update \ - && apt-get install gh -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -USER ubuntu - -WORKDIR /home/ubuntu - -RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git -RUN git clone https://github.com/flutter/flutter.git --branch 3.24.0 - -# precache linux stuff (flutter precache downloads too much stuffs) -RUN cd /tmp && flutter create foo && cd foo && flutter build linux -RUN rm -rf /tmp/foo/ - -RUN mkdir /home/ubuntu/engine/ && cd /home/ubuntu/engine/ && fetch flutter && \ -cd /home/ubuntu/engine/src/flutter && \ -git remote add sergio https://github.com/iamsergio/engine.git && \ -git fetch sergio && \ -git checkout sergio/main && gclient sync -D - -RUN cd $FLUTTER_ENGINE_FOLDER && ./build.sh && cp ./shell/platform/embedder/embedder.h ./shell/platform/embedder/flutter_embedder.h diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index a18563a..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "qt-embedder", - "build": { - "dockerfile": "Dockerfile" - }, - "runArgs": [ - "--cap-add=SYS_PTRACE", - "--security-opt", - "seccomp=unconfined", - "--ulimit", - "nofile=1024:4096", - "--env", - "QT_X11_NO_MITSHM=1", - "--volume", - "/tmp/.X11-unix:/tmp/.X11-unix", - "-device=/dev/dri:/dev/dri" - ], - "workspaceMount": "source=${localWorkspaceFolder}/,target=/qt-embedder/,type=bind", - "workspaceFolder": "/qt-embedder", - "customizations": { - "vscode": { - "extensions": [ - "vadimcn.vscode-lldb", - "llvm-vs-code-extensions.vscode-clangd", - "mhutchie.git-graph", - "Gruntfuggly.todo-tree", - "ms-vscode.cmake-tools" - ], - "settings": { - "terminal.integrated.shell.linux": "/bin/bash", - "workbench.colorTheme": "Visual Studio Light" - } - } - }, - "mounts": [ - "source=${localEnv:HOME}/Qt/6.6.0/gcc_64/,target=/Qt6/,type=bind" - ], - "remoteUser": "ubuntu" -} diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile deleted file mode 100644 index 3d323be..0000000 --- a/.github/docker/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -# This file is part of qt-flutter-embedder. -# -# SPDX-FileCopyrightText: 2024 Klarälvdalens Datakonsult AB, a KDAB Group -# company Author: Sérgio Martins -# SPDX-License-Identifier: GPL-3.0-only Contact KDAB at for -# commercial licensing options. - -# Docker container for building the engine and testing qt-flutter-embedder -# in CI - -# docker build --build-arg GITHUB_RUNNER_TOKEN=$GITHUB_RUNNER_TOKEN -t qt-flutter-embedder . -# docker run -it qt-flutter-embedder /home/ubuntu/actions-runner/run.sh - -FROM ubuntu:24.10 -MAINTAINER Sergio Martins (sergio.martins@kdab.com) - -ARG GITHUB_RUNNER_TOKEN - -ENV TZ=Europe/Berlin -ENV LC_CTYPE=C.UTF-8 -# ENV LD_LIBRARY_PATH=/Qt5/lib/:/Qt6/lib/ -ENV PATH=$PATH:/home/ubuntu/depot_tools/:/home/ubuntu/flutter/bin/ -ENV DISPLAY=:0 -ENV FLUTTER_ENGINE_FOLDER=/home/ubuntu/engine/src/flutter - -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - -RUN apt update -qq && apt install build-essential software-properties-common lld git cmake ninja-build vim curl wget gdebi-core libdbus-glib-1-2 \ - mesa-common-dev libglu1-mesa-dev libglib2.0-dev libfontconfig \ - libxkbcommon-dev mesa-utils libgl1-mesa-dev libglu1-mesa-dev \ - libxkbcommon-x11-0 libssl-dev openssl unzip clang libgtk-3-dev \ - qt6-base-dev time qt6-base-private-dev xvfb \ - -y - -# Install GitHub command-line interface (gh) -# Instructions copied from https://github.com/cli/cli/blob/trunk/docs/install_linux.md -RUN mkdir -p -m 755 /etc/apt/keyrings \ - && curl -s https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \ - && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ - && apt-get update \ - && apt-get install gh -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -USER ubuntu - -WORKDIR /home/ubuntu - -RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git -RUN git clone https://github.com/flutter/flutter.git --branch 3.24.0 - -# precache linux stuff (flutter precache downloads too much stuffs) -RUN cd /tmp && flutter create foo && cd foo && flutter build linux -RUN rm -rf /tmp/foo/ - -RUN mkdir /home/ubuntu/engine/ && cd /home/ubuntu/engine/ && fetch flutter && \ -cd /home/ubuntu/engine/src/flutter && \ -git remote add sergio https://github.com/iamsergio/engine.git && \ -git fetch sergio && \ -git checkout sergio/main && gclient sync -D - -RUN cd $FLUTTER_ENGINE_FOLDER && ./build.sh && cp ./shell/platform/embedder/embedder.h ./shell/platform/embedder/flutter_embedder.h - -# Install GitHub Actions runner - -RUN mkdir actions-runner && cd actions-runner && \ - curl -o actions-runner-linux-x64-2.321.0.tar.gz -L https://github.com/actions/runner/releases/download/v2.321.0/actions-runner-linux-x64-2.321.0.tar.gz && \ - echo "ba46ba7ce3a4d7236b16fbe44419fb453bc08f866b24f04d549ec89f1722a29e actions-runner-linux-x64-2.321.0.tar.gz" | shasum -a 256 -c && \ - tar xzf ./actions-runner-linux-x64-2.321.0.tar.gz && \ - ./config.sh --url https://github.com/KDABLabs/qt-flutter-embedder --token $GITHUB_RUNNER_TOKEN diff --git a/.github/docker/compose.yml b/.github/docker/compose.yml deleted file mode 100644 index f609c63..0000000 --- a/.github/docker/compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -services: - github-runner: - image: qt-flutter-embedder - command: /home/ubuntu/actions-runner/run.sh - restart: always diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43c53f7..9b81f2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,30 +14,38 @@ jobs: fail-fast: true matrix: os: - - self-hosted - # - windows-latest - # - macos-latest + - ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - name: Install Qt + uses: jurplel/install-qt-action@v4 with: - fetch-depth: 0 - - - name: Install ninja-build tool (must be after Qt due PATH changes) - if: ${{ runner.os == 'Windows' }} - uses: turtlesec-no/get-ninja@main - - - name: Make sure MSVC is found when Ninja generator is in use - if: ${{ runner.os == 'Windows' }} - uses: ilammy/msvc-dev-cmd@v1 + version: 6.6.0 + cache: true - name: Checkout qt-embedder uses: actions/checkout@v4 + with: + submodules: true + + - name: Install clang + run: sudo apt-get update && sudo apt-get install -y clang ninja-build libgtk-3-dev unzip libssl-dev lld curl wget gdebi-core libdbus-glib-1-2 + + - name: Setup Flutter + uses: subosito/flutter-action@v2 + with: + channel: stable + cache: true + + - name: Download flutter engine + run: sh download_engine.sh + env: + GH_TOKEN: ${{ github.token }} - name: Configure project run: cmake -S . -B ./build-dev --preset dev - - name: Build Project ${{ matrix.preset.build_preset_arg }} + - name: Build Project run: cmake --build ./build-dev - name: Build example diff --git a/.gitignore b/.gitignore index b97305b..fe1a5da 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ compile_commands.json .cache/ /examples/default_counter_app/linux/flutter/generated_plugins.cmake /examples/default_counter_app/windows/flutter/generated_plugins.cmake +libflutter_engine.so diff --git a/3rdparty/flutter b/3rdparty/flutter index b8800d8..cb4b5ff 160000 --- a/3rdparty/flutter +++ b/3rdparty/flutter @@ -1 +1 @@ -Subproject commit b8800d88be4866db1b15f8b954ab2573bba9960f +Subproject commit cb4b5fff73850b2e42bd4de7cb9a4310a78ac40d diff --git a/CMakeLists.txt b/CMakeLists.txt index 6068c5d..2a8cb13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,42 +18,29 @@ set(CMAKE_INCLUDE_CURRENT_DIRS ON) find_package(Qt6 6.6 NO_MODULE REQUIRED COMPONENTS Widgets OpenGL) -if(NOT DEFINED ENV{FLUTTER_ENGINE_FOLDER}) - message(FATAL_ERROR "Point env var FLUTTER_ENGINE_FOLDER to engine folder") -endif() - if(MSVC) + # Windows is not tested, this probably doesn't work set(FLUTTER_ENGINE_LIBRARY flutter_engine.lib) else() - if(EXISTS "$ENV{FLUTTER_ENGINE_FOLDER}/rel/") - if(QT_EMBEDDER_AOT) - set(FLUTTER_ENGINE_LIBRARY - rel/libflutter_engine.${CMAKE_SHARED_LIBRARY_SUFFIX}) - else() - set(FLUTTER_ENGINE_LIBRARY - dbg_unopt/libflutter_engine.${CMAKE_SHARED_LIBRARY_SUFFIX}) - endif() - set(FLUTTER_ENGINE_INCLUDE_DIR $ENV{FLUTTER_ENGINE_FOLDER}) + if(QT_EMBEDDER_AOT) + set(FLUTTER_ENGINE_LIBRARY + ${CMAKE_SOURCE_DIR}/engine_binaries/rel/libflutter_engine${CMAKE_SHARED_LIBRARY_SUFFIX} + ) else() - if(APPLE) - set(BUILD_FOLDER_NAME host_debug_unopt_arm64) - else() - set(BUILD_FOLDER_NAME host_debug_unopt) - endif() - set(FLUTTER_ENGINE_LIBRARY - ../out/${BUILD_FOLDER_NAME}/libflutter_engine${CMAKE_SHARED_LIBRARY_SUFFIX} + ${CMAKE_SOURCE_DIR}/engine_binaries/dbg_unopt/libflutter_engine${CMAKE_SHARED_LIBRARY_SUFFIX} ) - set(FLUTTER_ENGINE_INCLUDE_DIR - $ENV{FLUTTER_ENGINE_FOLDER}/../out/${BUILD_FOLDER_NAME}) endif() endif() -message( - "FLUTTER_ENGINE_LIBRARY=$ENV{FLUTTER_ENGINE_FOLDER}/${FLUTTER_ENGINE_LIBRARY}" -) +message("FLUTTER_ENGINE_LIBRARY=${FLUTTER_ENGINE_LIBRARY}}") -include_directories(${FLUTTER_ENGINE_INCLUDE_DIR}) +if(NOT EXISTS ${FLUTTER_ENGINE_LIBRARY}) + message( + FATAL_ERROR + "Could not find ${FLUTTER_ENGINE_LIBRARY}. Did you run dowload_engine.sh ?" + ) +endif() if(ENABLE_ASAN) add_compile_options(-fsanitize=address -fsanitize=undefined) @@ -62,31 +49,27 @@ endif() add_library( flutter_common_client_wrapper STATIC - $ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/common/client_wrapper/plugin_registrar.cc - $ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/common/client_wrapper/core_implementations.cc - $ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/common/client_wrapper/standard_codec.cc - $ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/common/client_wrapper/engine_method_result.cc - $ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/common/client_wrapper/engine_method_result.cc - $ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/common/incoming_message_dispatcher.cc -) + 3rdparty/flutter/shell/platform/common/client_wrapper/plugin_registrar.cc + 3rdparty/flutter/shell/platform/common/client_wrapper/core_implementations.cc + 3rdparty/flutter/shell/platform/common/client_wrapper/standard_codec.cc + 3rdparty/flutter/shell/platform/common/client_wrapper/engine_method_result.cc + 3rdparty/flutter/shell/platform/common/client_wrapper/engine_method_result.cc + 3rdparty/flutter/shell/platform/common/incoming_message_dispatcher.cc) target_include_directories( flutter_common_client_wrapper - PUBLIC - "$ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/common/public" - $ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/embedder/ - $ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/common - $ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/common/client_wrapper - $ENV{FLUTTER_ENGINE_FOLDER}/shell/platform/common/client_wrapper/include/ - "$ENV{FLUTTER_ENGINE_FOLDER}/..") + PUBLIC 3rdparty/flutter/shell/platform/common/public + 3rdparty/flutter/shell/platform/embedder/ + 3rdparty/flutter/shell/platform/common + 3rdparty/flutter/shell/platform/common/client_wrapper + 3rdparty/flutter/shell/platform/common/client_wrapper/include/ + 3rdparty/flutter/..) add_executable(qtembedder main.cpp src/Embedder.cpp src/FlutterWindow.cpp src/3rdparty/flutter/glfw_shell.cpp) -target_link_libraries( - qtembedder Qt6::Widgets Qt6::OpenGL Qt6::GuiPrivate - $ENV{FLUTTER_ENGINE_FOLDER}/${FLUTTER_ENGINE_LIBRARY} - flutter_common_client_wrapper) +target_link_libraries(qtembedder Qt6::Widgets Qt6::OpenGL Qt6::GuiPrivate + ${FLUTTER_ENGINE_LIBRARY} flutter_common_client_wrapper) if(NOT APPLE) target_link_libraries(qtembedder EGL) diff --git a/README.md b/README.md index caf86c4..5e753cd 100644 --- a/README.md +++ b/README.md @@ -24,15 +24,13 @@ Can be used to launch a 100% flutter app or to integrate flutter into an existin ## Instructions -Install `ms-vscode-remote.remote-containers` extension in vscode and open the `.devcontainer`. - -Build the embedder. - -Build the example by running `build_example.sh`. - -Run the example: -`./build-dev/qtembedder -m -e examples/default_counter_app` - +```bash +git submodule update --init +cmake --preset=dev +cmake --build build-dev +build_example.sh +build-dev/qtembedder -m -e examples/default_counter_app +``` ## Licensing diff --git a/build_example.sh b/build_example.sh index 1f7be3e..cf7f957 100755 --- a/build_example.sh +++ b/build_example.sh @@ -13,5 +13,4 @@ else fi cd examples/default_counter_app && flutter pub get && \ -echo "FLUTTER_HOST=${FLUTTER_HOST} ; FLUTTER_ENGINE_FOLDER=${FLUTTER_ENGINE_FOLDER} ; FLUTTER_ARCH=${FLUTTER_ARCH}" -flutter build ${FLUTTER_HOST} --debug --local-engine-src-path=$FLUTTER_ENGINE_FOLDER/.. --local-engine=host_debug_unopt${FLUTTER_ARCH} --local-engine-host=host_debug_unopt${FLUTTER_ARCH} +flutter build ${FLUTTER_HOST} --debug diff --git a/download_engine.sh b/download_engine.sh index f3e541a..8a2ced7 100755 --- a/download_engine.sh +++ b/download_engine.sh @@ -1,9 +1,27 @@ #!/bin/bash -ENGINE_VERSION=3.24.0 +set -e -RELEASE_TAG=`gh release list --repo ardera/flutter-ci | grep $ENGINE_VERSION | awk '{print $2}'` +ENGINE_VERSION=`flutter --version | grep -oP '^Flutter \K[^\s]+'` + +echo "Fetching engine version ${ENGINE_VERSION}..." + +# Get 2nd to last field, which is the release tag +RELEASE_TAG=`gh release list --repo ardera/flutter-ci | grep $ENGINE_VERSION | awk '{print $(NF-1)}'` + +echo "Release tag is ${RELEASE_TAG}" + +mkdir -p engine_binaries/rel +mkdir -p engine_binaries/dbg_unopt + +gh release download $RELEASE_TAG -p engine-x64-generic-debug_unopt.tar.xz --repo ardera/flutter-ci +gh release download $RELEASE_TAG -p engine-x64-generic-release.tar.xz --repo ardera/flutter-ci + +tar xvf engine-x64-generic-debug_unopt.tar.xz +mv libflutter_engine.so engine_binaries/dbg_unopt + +tar xvf engine-x64-generic-release.tar.xz +mv libflutter_engine.so engine_binaries/rel -gh release download $RELEASE_TAG -p engine-x64-generic-debug_unopt.tar.xz --repo ardera/flutter-ci || exit 1 -tar xvf engine-x64-generic-debug_unopt.tar.xz || exit 1 rm engine-x64-generic-debug_unopt.tar.xz +rm engine-x64-generic-release.tar.xz diff --git a/engine_binaries/README.md b/engine_binaries/README.md new file mode 100644 index 0000000..291fff3 --- /dev/null +++ b/engine_binaries/README.md @@ -0,0 +1 @@ +Run download_engine.sh to put the binaries here diff --git a/examples/default_counter_app/pubspec.lock b/examples/default_counter_app/pubspec.lock index af2ac16..6cf3646 100644 --- a/examples/default_counter_app/pubspec.lock +++ b/examples/default_counter_app/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" cupertino_icons: dependency: "direct main" description: @@ -79,18 +79,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -143,7 +143,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -172,10 +172,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" term_glyph: dependency: transitive description: @@ -188,10 +188,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" vector_math: dependency: transitive description: @@ -204,10 +204,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.4" + version: "14.3.0" sdks: dart: ">=3.5.0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/src/3rdparty/flutter/glfw_shell.h b/src/3rdparty/flutter/glfw_shell.h index 76abe1a..6c2463f 100644 --- a/src/3rdparty/flutter/glfw_shell.h +++ b/src/3rdparty/flutter/glfw_shell.h @@ -5,7 +5,7 @@ #pragma once #include "incoming_message_dispatcher.h" -#include "flutter_embedder.h" +#include "embedder.h" #include #include diff --git a/src/Embedder.cpp b/src/Embedder.cpp index 2991e5c..12d3932 100644 --- a/src/Embedder.cpp +++ b/src/Embedder.cpp @@ -11,7 +11,6 @@ #include "Embedder.h" #include "FlutterWindow.h" -#include "flutter_embedder.h" #include #include diff --git a/src/Embedder.h b/src/Embedder.h index 24db4d5..c99cf8b 100644 --- a/src/Embedder.h +++ b/src/Embedder.h @@ -13,7 +13,7 @@ #include -#include +#include #include "3rdparty/flutter/glfw_shell.h" class QOpenGLContext; diff --git a/src/FlutterWindow.h b/src/FlutterWindow.h index 62c500d..5b9b820 100644 --- a/src/FlutterWindow.h +++ b/src/FlutterWindow.h @@ -13,7 +13,7 @@ #include -#include +#include class QOpenGLContext;