diff --git a/vidaia/android/app/build.gradle b/vidaia/android/app/build.gradle index 4b7b705..11f85b8 100644 --- a/vidaia/android/app/build.gradle +++ b/vidaia/android/app/build.gradle @@ -43,16 +43,13 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "ch.saynode.vidaia" - minSdkVersion 21 - targetSdkVersion flutter.targetSdkVersion + minSdkVersion 18 + targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - multiDexEnabled true - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - manifestPlaceholders = [ - 'appAuthRedirectScheme': 'ch.saynode.vidaia' - ] + manifestPlaceholders += [appAuthRedirectScheme: 'ch.saynode.vidaia'] } buildTypes { diff --git a/vidaia/pubspec.lock b/vidaia/pubspec.lock index eb48cd6..1ada2b8 100644 --- a/vidaia/pubspec.lock +++ b/vidaia/pubspec.lock @@ -203,7 +203,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" contained_tab_bar_view: dependency: "direct main" description: @@ -266,7 +266,7 @@ packages: name: easy_localization url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1-dev" easy_logger: dependency: transitive description: @@ -280,7 +280,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" ffi: dependency: transitive description: @@ -496,7 +496,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" json_annotation: dependency: transitive description: @@ -545,7 +545,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -594,7 +594,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" path_provider: dependency: transitive description: @@ -851,7 +851,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -893,21 +893,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.19.5" + version: "1.20.2" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.11" thor_devkit_dart: dependency: "direct main" description: @@ -1019,7 +1019,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" vm_service: dependency: transitive description: @@ -1077,5 +1077,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.16.2 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.10.0" diff --git a/vidaia/windows/flutter/generated_plugins.cmake b/vidaia/windows/flutter/generated_plugins.cmake index 96531c5..bd7f7e7 100644 --- a/vidaia/windows/flutter/generated_plugins.cmake +++ b/vidaia/windows/flutter/generated_plugins.cmake @@ -8,6 +8,9 @@ list(APPEND FLUTTER_PLUGIN_LIST url_launcher_windows ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -16,3 +19,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin)