From d1a0c18299dca46880eab6f78de403133fa587ae Mon Sep 17 00:00:00 2001 From: pranavo72bex Date: Wed, 2 Aug 2023 13:04:10 +0545 Subject: [PATCH 1/5] fix: build issue --- example/linux/flutter/generated_plugin_registrant.cc | 2 ++ example/linux/flutter/generated_plugin_registrant.h | 2 ++ example/linux/flutter/generated_plugins.cmake | 8 ++++++++ example/macos/Flutter/GeneratedPluginRegistrant.swift | 6 +++++- example/pubspec.yaml | 2 +- test/easy_localization_test.dart | 1 + 6 files changed, 19 insertions(+), 2 deletions(-) diff --git a/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc index d38195aa..e71a16d2 100644 --- a/example/linux/flutter/generated_plugin_registrant.cc +++ b/example/linux/flutter/generated_plugin_registrant.cc @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #include "generated_plugin_registrant.h" diff --git a/example/linux/flutter/generated_plugin_registrant.h b/example/linux/flutter/generated_plugin_registrant.h index 9bf74789..e0f0a47b 100644 --- a/example/linux/flutter/generated_plugin_registrant.h +++ b/example/linux/flutter/generated_plugin_registrant.h @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #ifndef GENERATED_PLUGIN_REGISTRANT_ #define GENERATED_PLUGIN_REGISTRANT_ diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake index 51436ae8..2e1de87a 100644 --- a/example/linux/flutter/generated_plugins.cmake +++ b/example/linux/flutter/generated_plugins.cmake @@ -5,6 +5,9 @@ list(APPEND FLUTTER_PLUGIN_LIST ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -13,3 +16,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}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index 287b6a9d..d3df4c25 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,8 +5,12 @@ import FlutterMacOS import Foundation -import shared_preferences_macos +import connectivity_plus_macos +import path_provider_foundation +import shared_preferences_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) } diff --git a/example/pubspec.yaml b/example/pubspec.yaml index d5362f20..bfbb07a7 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -29,7 +29,7 @@ dependencies: #custom loaders easy_localization_loader: - git: https://github.com/aissat/easy_localization_loader.git + dev_dependencies: flutter_test: diff --git a/test/easy_localization_test.dart b/test/easy_localization_test.dart index d6cd2f65..f043a923 100644 --- a/test/easy_localization_test.dart +++ b/test/easy_localization_test.dart @@ -99,6 +99,7 @@ void main() { }, saveLocale: false, assetLoader: const ImmutableJsonAssetLoader(), + nestedKeysDisabled: true, ).loadTranslations(); }); From eb12ae7b6956faa435cfebd57231d75334270e62 Mon Sep 17 00:00:00 2001 From: pranavo72bex Date: Fri, 4 Aug 2023 11:23:31 +0545 Subject: [PATCH 2/5] chore: udate package --- packages/easy_logger/lib/src/logger_printer.dart | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/easy_logger/lib/src/logger_printer.dart b/packages/easy_logger/lib/src/logger_printer.dart index 077882e4..53ae3c5f 100644 --- a/packages/easy_logger/lib/src/logger_printer.dart +++ b/packages/easy_logger/lib/src/logger_printer.dart @@ -46,6 +46,6 @@ EasyLogPrinter easyLogDefaultPrinter = (Object object, if (stackTrace != null) { print(_coloredString('__________________________________')); - print(_coloredString('${stackTrace.toString()}')); + print(_coloredString(stackTrace.toString())); } }; diff --git a/pubspec.yaml b/pubspec.yaml index b3f13dce..abe8b3ed 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter: sdk: flutter shared_preferences: '>=2.0.0 <3.0.0' - intl: '>=0.17.0-0 <=0.17.0' + intl: '>=0.18.0-0 <=0.18.0' args: ^2.3.1 path: ^1.8.1 easy_logger: ^0.0.2 From 828a893911f7917e3008fd4fadd0c8c761dcd61f Mon Sep 17 00:00:00 2001 From: pranavo72bex Date: Wed, 6 Dec 2023 11:54:38 +0545 Subject: [PATCH 3/5] chore: update intl package --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index abe8b3ed..b4a54ed9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter: sdk: flutter shared_preferences: '>=2.0.0 <3.0.0' - intl: '>=0.18.0-0 <=0.18.0' + intl: ^0.18.1 args: ^2.3.1 path: ^1.8.1 easy_logger: ^0.0.2 From e66a43a5e49e267c441090043dce1459d7f917b5 Mon Sep 17 00:00:00 2001 From: pranavo72bex Date: Mon, 30 Sep 2024 11:37:44 +0545 Subject: [PATCH 4/5] chore: update intl package --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index b4a54ed9..dc35d873 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter: sdk: flutter shared_preferences: '>=2.0.0 <3.0.0' - intl: ^0.18.1 + intl: ^0.19.0 args: ^2.3.1 path: ^1.8.1 easy_logger: ^0.0.2 From b509307bc845e7bc70e03c22d938a1b8dfe2471b Mon Sep 17 00:00:00 2001 From: pranavo72bex Date: Mon, 30 Sep 2024 11:38:55 +0545 Subject: [PATCH 5/5] Revert "chore: update intl package" This reverts commit e66a43a5e49e267c441090043dce1459d7f917b5. --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index dc35d873..b4a54ed9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter: sdk: flutter shared_preferences: '>=2.0.0 <3.0.0' - intl: ^0.19.0 + intl: ^0.18.1 args: ^2.3.1 path: ^1.8.1 easy_logger: ^0.0.2