diff --git a/.github/workflows/example_build.yml b/.github/workflows/example_build.yml new file mode 100644 index 0000000000..1932af1fb8 --- /dev/null +++ b/.github/workflows/example_build.yml @@ -0,0 +1,121 @@ +name: example build + +on: + push: + branches: [main] + pull_request: + branches: [main] + workflow_dispatch: + +env: + nodeVersion: "16" + cmakeVersion: "3.22.x" + flutterVersion: "2.5.3" + +jobs: + build_android-app_in_macos: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + # Set up the bridge compilation environment + - uses: actions/setup-node@v2 + with: + node-version: ${{ env.nodeVersion }} + - uses: jwlawson/actions-setup-cmake@v1.11 + with: + cmake-version: ${{ env.cmakeVersion }} + - run: npm i + - run: npm run build:bridge:android:release + + # Install Flutter SDK + - uses: subosito/flutter-action@v1 + with: + flutter-version: ${{ env.flutterVersion }} + - run: flutter doctor -v + + - name: android app build + run: | + cd kraken/ + flutter pub get + cd example/ + flutter build apk --release + + build_ios-app_in_macos: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: ${{ env.nodeVersion }} + - uses: jwlawson/actions-setup-cmake@v1.11 + with: + cmake-version: ${{ env.cmakeVersion }} + - run: npm i + - run: npm run build:bridge:ios:release + + - uses: subosito/flutter-action@v1 + with: + flutter-version: ${{ env.flutterVersion }} + - run: flutter doctor -v + + - name: ios app build + run: | + cd kraken/ + flutter pub get + cd example/ + flutter build ios --release --no-codesign + + build_macos-app_in_macos: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: ${{ env.nodeVersion }} + - uses: jwlawson/actions-setup-cmake@v1.11 + with: + cmake-version: ${{ env.cmakeVersion }} + - run: npm i + - run: npm run build:bridge:macos:release + + - uses: subosito/flutter-action@v1 + with: + flutter-version: ${{ env.flutterVersion }} + - run: flutter config --enable-macos-desktop + - run: flutter doctor -v + + - name: macos app build + run: | + cd kraken/ + flutter pub get + cd example/ + flutter build macos --release + + build_linux-app_in_ubuntu: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: ${{ env.nodeVersion }} + - uses: jwlawson/actions-setup-cmake@v1.11 + with: + cmake-version: ${{ env.cmakeVersion }} + + - run: npm i + - run: npm run build:bridge:linux:release + + - uses: subosito/flutter-action@v1 + with: + flutter-version: ${{ env.flutterVersion }} + - run: flutter config --enable-linux-desktop + - run: | + sudo apt-get update + sudo apt-get install ninja-build pkg-config libgtk-3-dev -y + - run: flutter doctor -v + - name: linux app build + run: | + cd kraken/ + flutter pub get + cd example/ + flutter build linux --release diff --git a/bridge/CMakeLists.txt b/bridge/CMakeLists.txt index a8b0b4e745..edbc676993 100644 --- a/bridge/CMakeLists.txt +++ b/bridge/CMakeLists.txt @@ -65,6 +65,9 @@ set(QUICKJS_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/quickjs/quickjs-opcode.h ) +if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + add_compile_options(-fPIC) +endif() if (ENABLE_ASAN) add_compile_options(-fsanitize=address -fno-omit-frame-pointer -O1) diff --git a/kraken/android/build.gradle b/kraken/android/build.gradle index e94546279a..6cd648cb3c 100644 --- a/kraken/android/build.gradle +++ b/kraken/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:4.1.0' } } diff --git a/kraken/android/gradle/wrapper/gradle-wrapper.properties b/kraken/android/gradle/wrapper/gradle-wrapper.properties index 01a286e96a..3c9d0852bf 100644 --- a/kraken/android/gradle/wrapper/gradle-wrapper.properties +++ b/kraken/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/kraken/example/android/build.gradle b/kraken/example/android/build.gradle index e0d7ae2c11..c9e3db0a0f 100644 --- a/kraken/example/android/build.gradle +++ b/kraken/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:4.1.0' } } diff --git a/kraken/example/android/gradle/wrapper/gradle-wrapper.properties b/kraken/example/android/gradle/wrapper/gradle-wrapper.properties index 296b146b73..bc6a58afdd 100644 --- a/kraken/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/kraken/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/kraken/example/linux/.gitignore b/kraken/example/linux/.gitignore new file mode 100644 index 0000000000..d3896c9844 --- /dev/null +++ b/kraken/example/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/kraken/example/linux/CMakeLists.txt b/kraken/example/linux/CMakeLists.txt new file mode 100644 index 0000000000..f4ebd7bbba --- /dev/null +++ b/kraken/example/linux/CMakeLists.txt @@ -0,0 +1,116 @@ +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +set(BINARY_NAME "kraken_example") +set(APPLICATION_ID "com.example.kraken") + +cmake_policy(SET CMP0063 NEW) + +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Configure build options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") + +# Flutter library and tool build rules. +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Application build +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) +apply_standard_settings(${BINARY_NAME}) +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) +add_dependencies(${BINARY_NAME} flutter_assemble) +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/kraken/example/linux/flutter/CMakeLists.txt b/kraken/example/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000000..33fd5801e7 --- /dev/null +++ b/kraken/example/linux/flutter/CMakeLists.txt @@ -0,0 +1,87 @@ +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/kraken/example/linux/flutter/generated_plugin_registrant.cc b/kraken/example/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000000..5a480ef7cb --- /dev/null +++ b/kraken/example/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,13 @@ +// +// Generated file. Do not edit. +// + +#include "generated_plugin_registrant.h" + +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) kraken_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "KrakenPlugin"); + kraken_plugin_register_with_registrar(kraken_registrar); +} diff --git a/kraken/example/linux/flutter/generated_plugin_registrant.h b/kraken/example/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000000..9bf7478940 --- /dev/null +++ b/kraken/example/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,13 @@ +// +// Generated file. Do not edit. +// + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/kraken/example/linux/flutter/generated_plugins.cmake b/kraken/example/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000000..480356185b --- /dev/null +++ b/kraken/example/linux/flutter/generated_plugins.cmake @@ -0,0 +1,16 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + kraken +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) diff --git a/kraken/example/linux/main.cc b/kraken/example/linux/main.cc new file mode 100644 index 0000000000..e7c5c54370 --- /dev/null +++ b/kraken/example/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/kraken/example/linux/my_application.cc b/kraken/example/linux/my_application.cc new file mode 100644 index 0000000000..60034bd386 --- /dev/null +++ b/kraken/example/linux/my_application.cc @@ -0,0 +1,105 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen *screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "kraken_example"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } + else { + gtk_window_set_title(window, "kraken_example"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar ***arguments, int *exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject *object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/kraken/example/linux/my_application.h b/kraken/example/linux/my_application.h new file mode 100644 index 0000000000..72271d5e41 --- /dev/null +++ b/kraken/example/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/kraken/example/macos/Flutter/GeneratedPluginRegistrant.swift b/kraken/example/macos/Flutter/GeneratedPluginRegistrant.swift index 65844a0f73..1bbbd3596c 100644 --- a/kraken/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/kraken/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,12 +7,10 @@ import Foundation import connectivity_macos import kraken -import kraken_websocket import shared_preferences_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) KrakenPlugin.register(with: registry.registrar(forPlugin: "KrakenPlugin")) - KrakenWebsocketPlugin.register(with: registry.registrar(forPlugin: "KrakenWebsocketPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) } diff --git a/kraken/example/pubspec.yaml b/kraken/example/pubspec.yaml index abe1a28eca..49dabd6ce3 100644 --- a/kraken/example/pubspec.yaml +++ b/kraken/example/pubspec.yaml @@ -11,8 +11,8 @@ environment: dependencies: flutter: sdk: flutter - kraken: ^0.7.2 - kraken_websocket: ^1.0.5 + kraken: ^0.10.0 + kraken_websocket: ^2.0.0-rc.0 # When depending on this package from a real application, # you should remove the following overrides. diff --git a/kraken/linux/CMakeLists.txt b/kraken/linux/CMakeLists.txt new file mode 100644 index 0000000000..d872cd2c6b --- /dev/null +++ b/kraken/linux/CMakeLists.txt @@ -0,0 +1,44 @@ +cmake_minimum_required(VERSION 3.10) +set(PROJECT_NAME "kraken") +project(${PROJECT_NAME} LANGUAGES CXX) + +# This value is used when generating builds using this plugin, so it must +# not be changed +set(PLUGIN_NAME "kraken_plugin") + +add_library(${PLUGIN_NAME} SHARED + "kraken_plugin.cc" + ) + +add_library(kraken SHARED IMPORTED) +set_target_properties(kraken PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/libkraken.so") +add_library(quickjs SHARED IMPORTED) +set_target_properties(quickjs PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/libquickjs.so") + +apply_standard_settings(${PLUGIN_NAME}) +set_target_properties(${PLUGIN_NAME} PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) +target_include_directories(${PLUGIN_NAME} INTERFACE + "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(${PLUGIN_NAME} PRIVATE flutter) +target_link_libraries(${PLUGIN_NAME} PRIVATE PkgConfig::GTK) + +execute_process( + COMMAND bash "-c" "readlink -f ${CMAKE_CURRENT_SOURCE_DIR}/libkraken.so" + OUTPUT_VARIABLE KRAKEN_LIB_PATH +) +string(REGEX REPLACE "\n$" "" KRAKEN_LIB_PATH "${KRAKEN_LIB_PATH}") + +execute_process( + COMMAND bash "-c" "readlink -f ${CMAKE_CURRENT_SOURCE_DIR}/libquickjs.so" + OUTPUT_VARIABLE QUICKJS_LIB_PATH +) +string(REGEX REPLACE "\n$" "" QUICKJS_LIB_PATH "${QUICKJS_LIB_PATH}") + +# List of absolute paths to libraries that should be bundled with the plugin +set(kraken_bundled_libraries + ${QUICKJS_LIB_PATH} + ${KRAKEN_LIB_PATH} + PARENT_SCOPE + ) diff --git a/kraken/linux/include/kraken/kraken_plugin.h b/kraken/linux/include/kraken/kraken_plugin.h new file mode 100644 index 0000000000..cf5eb7450b --- /dev/null +++ b/kraken/linux/include/kraken/kraken_plugin.h @@ -0,0 +1,26 @@ +#ifndef FLUTTER_PLUGIN_KRAKEN_PLUGIN_H_ +#define FLUTTER_PLUGIN_KRAKEN_PLUGIN_H_ + +#include + +G_BEGIN_DECLS + +#ifdef FLUTTER_PLUGIN_IMPL +#define FLUTTER_PLUGIN_EXPORT __attribute__((visibility("default"))) +#else +#define FLUTTER_PLUGIN_EXPORT +#endif + +typedef struct _KrakenPlugin KrakenPlugin; +typedef struct { + GObjectClass parent_class; +} KrakenPluginClass; + +FLUTTER_PLUGIN_EXPORT GType kraken_plugin_get_type(); + +FLUTTER_PLUGIN_EXPORT void kraken_plugin_register_with_registrar( + FlPluginRegistrar* registrar); + +G_END_DECLS + +#endif // FLUTTER_PLUGIN_KRAKEN_PLUGIN_H_ diff --git a/kraken/linux/kraken_plugin.cc b/kraken/linux/kraken_plugin.cc new file mode 100644 index 0000000000..c8afba4f3f --- /dev/null +++ b/kraken/linux/kraken_plugin.cc @@ -0,0 +1,70 @@ +#include "include/kraken/kraken_plugin.h" + +#include +#include +#include + +#include + +#define KRAKEN_PLUGIN(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), kraken_plugin_get_type(), \ + KrakenPlugin)) + +struct _KrakenPlugin { + GObject parent_instance; +}; + +G_DEFINE_TYPE(KrakenPlugin, kraken_plugin, g_object_get_type()) + +// Called when a method call is received from Flutter. +static void kraken_plugin_handle_method_call( + KrakenPlugin* self, + FlMethodCall* method_call) { + g_autoptr(FlMethodResponse) response = nullptr; + + const gchar* method = fl_method_call_get_name(method_call); + + if (strcmp(method, "getPlatformVersion") == 0) { + struct utsname uname_data = {}; + uname(&uname_data); + g_autofree gchar *version = g_strdup_printf("Linux %s", uname_data.version); + g_autoptr(FlValue) result = fl_value_new_string(version); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(result)); + } else { + response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new()); + } + + fl_method_call_respond(method_call, response, nullptr); +} + +static void kraken_plugin_dispose(GObject* object) { + G_OBJECT_CLASS(kraken_plugin_parent_class)->dispose(object); +} + +static void kraken_plugin_class_init(KrakenPluginClass* klass) { + G_OBJECT_CLASS(klass)->dispose = kraken_plugin_dispose; +} + +static void kraken_plugin_init(KrakenPlugin* self) {} + +static void method_call_cb(FlMethodChannel* channel, FlMethodCall* method_call, + gpointer user_data) { + KrakenPlugin* plugin = KRAKEN_PLUGIN(user_data); + kraken_plugin_handle_method_call(plugin, method_call); +} + +void kraken_plugin_register_with_registrar(FlPluginRegistrar* registrar) { + KrakenPlugin* plugin = KRAKEN_PLUGIN( + g_object_new(kraken_plugin_get_type(), nullptr)); + + g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); + g_autoptr(FlMethodChannel) channel = + fl_method_channel_new(fl_plugin_registrar_get_messenger(registrar), + "kraken", + FL_METHOD_CODEC(codec)); + fl_method_channel_set_method_call_handler(channel, method_call_cb, + g_object_ref(plugin), + g_object_unref); + + g_object_unref(plugin); +} diff --git a/kraken/linux/libkraken.so b/kraken/linux/libkraken.so new file mode 120000 index 0000000000..2f17e2cc27 --- /dev/null +++ b/kraken/linux/libkraken.so @@ -0,0 +1 @@ +../../bridge/build/linux/lib/libkraken.so \ No newline at end of file diff --git a/kraken/linux/libquickjs.so b/kraken/linux/libquickjs.so new file mode 120000 index 0000000000..04336e15f6 --- /dev/null +++ b/kraken/linux/libquickjs.so @@ -0,0 +1 @@ +../../bridge/build/linux/lib/libquickjs.so \ No newline at end of file diff --git a/kraken/pubspec.yaml b/kraken/pubspec.yaml index e03a4a1801..9ae43b1cb5 100644 --- a/kraken/pubspec.yaml +++ b/kraken/pubspec.yaml @@ -44,3 +44,5 @@ flutter: pluginClass: KrakenPlugin macos: pluginClass: KrakenPlugin + linux: + pluginClass: KrakenPlugin diff --git a/package.json b/package.json index 108258a6e9..2ded3ecea0 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,9 @@ "build:bridge:macos:profile": "ENABLE_PROFILE=true npm run build:bridge:macos:release", "build:bridge:android": "node scripts/build_android_so", "build:bridge:android:release": "KRAKEN_BUILD=Release node scripts/build_android_so", - "build:bridge:linux_arm64": "node scripts/build_linux", - "build:bridge:linux_arm64:release": "KRAKEN_BUILD=Release node scripts/build_linux", - "build:bridge:linux_arm64:profile": "ENABLE_PROFILE=true node scripts/build_linux", + "build:bridge:linux": "node scripts/build_linux", + "build:bridge:linux:release": "KRAKEN_BUILD=Release node scripts/build_linux", + "build:bridge:linux:profile": "ENABLE_PROFILE=true node scripts/build_linux", "build:bridge:android:profile": "ENABLE_PROFILE=true npm run build:bridge:android:release", "build:bridge:ios": "node scripts/build_ios_framework", "build:bridge:ios:release": "KRAKEN_BUILD=Release node scripts/build_ios_framework", diff --git a/scripts/build_linux.js b/scripts/build_linux.js index ccd8c82652..88e8064997 100644 --- a/scripts/build_linux.js +++ b/scripts/build_linux.js @@ -9,9 +9,7 @@ const chalk = require('chalk'); series( 'clean', 'compile-polyfill', - parallel( - 'build-linux-arm64-kraken-lib' - ), + 'build-linux-kraken-lib' )((err) => { if (err) { console.log(err); diff --git a/scripts/tasks.js b/scripts/tasks.js index 4dbb9503c4..b01af642dc 100644 --- a/scripts/tasks.js +++ b/scripts/tasks.js @@ -575,33 +575,30 @@ task('build-ios-frameworks', (done) => { done(); }); -task('build-linux-arm64-kraken-lib', (done) => { - - const archs = ['arm64']; +task('build-linux-kraken-lib', (done) => { const buildType = buildMode == 'Release' ? 'Release' : 'Relwithdebinfo'; const cmakeGeneratorTemplate = platform == 'win32' ? 'Ninja' : 'Unix Makefiles'; - archs.forEach(arch => { - const soBinaryDirectory = path.join(paths.bridge, `build/linux/lib/${arch}`); - const bridgeCmakeDir = path.join(paths.bridge, 'cmake-build-linux-' + arch); - // generate project - execSync(`cmake -DCMAKE_BUILD_TYPE=${buildType} \ - ${isProfile ? '-DENABLE_PROFILE=TRUE \\' : '\\'} - -G "${cmakeGeneratorTemplate}" \ - -B ${paths.bridge}/cmake-build-linux-${arch} -S ${paths.bridge}`, - { - cwd: paths.bridge, - stdio: 'inherit', - env: { - ...process.env, - KRAKEN_JS_ENGINE: targetJSEngine, - LIBRARY_OUTPUT_DIR: soBinaryDirectory - } - }); - - // build - execSync(`cmake --build ${bridgeCmakeDir} --target kraken -- -j 12`, { - stdio: 'inherit' + + const soBinaryDirectory = path.join(paths.bridge, `build/linux/lib/`); + const bridgeCmakeDir = path.join(paths.bridge, 'cmake-build-linux'); + // generate project + execSync(`cmake -DCMAKE_BUILD_TYPE=${buildType} \ + ${isProfile ? '-DENABLE_PROFILE=TRUE \\' : '\\'} + -G "${cmakeGeneratorTemplate}" \ + -B ${paths.bridge}/cmake-build-linux -S ${paths.bridge}`, + { + cwd: paths.bridge, + stdio: 'inherit', + env: { + ...process.env, + KRAKEN_JS_ENGINE: targetJSEngine, + LIBRARY_OUTPUT_DIR: soBinaryDirectory + } }); + + // build + execSync(`cmake --build ${bridgeCmakeDir} --target kraken -- -j 12`, { + stdio: 'inherit' }); done();