diff --git a/packages/auto_updater/CHANGELOG.md b/packages/auto_updater/CHANGELOG.md index 96b768b..77e3db5 100644 --- a/packages/auto_updater/CHANGELOG.md +++ b/packages/auto_updater/CHANGELOG.md @@ -2,6 +2,7 @@ * feat: Convert to federated plugin * feat: Add `UpdaterListener` to listen for update events +* chore: [windows] Upgrade to `WinSparkle-0.8.1` ## 0.1.7 diff --git a/packages/auto_updater/bin/generate_keys.dart b/packages/auto_updater/bin/generate_keys.dart index 8a216ba..166ffbc 100644 --- a/packages/auto_updater/bin/generate_keys.dart +++ b/packages/auto_updater/bin/generate_keys.dart @@ -16,9 +16,9 @@ Future main(List arguments) async { 'flutter', 'ephemeral', '.plugin_symlinks', - 'auto_updater', + 'auto_updater_windows', 'windows', - 'WinSparkle-0.8.0', + 'WinSparkle-0.8.1', 'bin', 'generate_keys.bat', ], diff --git a/packages/auto_updater/bin/sign_update.dart b/packages/auto_updater/bin/sign_update.dart index af95aa5..e427660 100644 --- a/packages/auto_updater/bin/sign_update.dart +++ b/packages/auto_updater/bin/sign_update.dart @@ -21,9 +21,9 @@ SignUpdateResult signUpdate(List args) { 'flutter', 'ephemeral', '.plugin_symlinks', - 'auto_updater', + 'auto_updater_windows', 'windows', - 'WinSparkle-0.8.0', + 'WinSparkle-0.8.1', 'bin', 'sign_update.bat', ], diff --git a/packages/auto_updater/example/pubspec.yaml b/packages/auto_updater/example/pubspec.yaml index 9b42304..29a0811 100644 --- a/packages/auto_updater/example/pubspec.yaml +++ b/packages/auto_updater/example/pubspec.yaml @@ -1,6 +1,6 @@ name: auto_updater_example description: Demonstrates how to use the auto_updater plugin. -version: 1.1.0+2 +version: 1.0.0+1 publish_to: "none" environment: diff --git a/packages/auto_updater/example/windows/packaging/exe/make_config.yaml b/packages/auto_updater/example/windows/packaging/exe/make_config.yaml index 83fa2b3..9c8f38c 100644 --- a/packages/auto_updater/example/windows/packaging/exe/make_config.yaml +++ b/packages/auto_updater/example/windows/packaging/exe/make_config.yaml @@ -2,3 +2,5 @@ app_id: 1D7A5470-942F-4649-8B69-122888AB0BA5 display_name: auto_updater_example publisher: LeanFlutter publisher_url: https://github.com/leanflutter/auto_updater +locales: + - en diff --git a/packages/auto_updater/lib/src/auto_updater.dart b/packages/auto_updater/lib/src/auto_updater.dart index f3d6631..4f4bb2c 100644 --- a/packages/auto_updater/lib/src/auto_updater.dart +++ b/packages/auto_updater/lib/src/auto_updater.dart @@ -18,7 +18,6 @@ class AutoUpdater { final List _listeners = []; void _handleSparkleEvents(event) { - print(event); UpdaterError? updaterError; Appcast? appcast; AppcastItem? appcastItem; diff --git a/packages/auto_updater_windows/windows/.gitignore b/packages/auto_updater_windows/windows/.gitignore index 23a73d6..60ef81e 100644 --- a/packages/auto_updater_windows/windows/.gitignore +++ b/packages/auto_updater_windows/windows/.gitignore @@ -16,4 +16,4 @@ x86/ # but keep track of directories ending in .cache !*.[Cc]ache/ -!WinSparkle-0.8.0/x64 \ No newline at end of file +!WinSparkle-0.8.1/x64 \ No newline at end of file diff --git a/packages/auto_updater_windows/windows/CMakeLists.txt b/packages/auto_updater_windows/windows/CMakeLists.txt index 1ecc48d..ae2c1fc 100644 --- a/packages/auto_updater_windows/windows/CMakeLists.txt +++ b/packages/auto_updater_windows/windows/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_policy(VERSION 3.14...3.25) set(PLUGIN_NAME "auto_updater_windows_plugin") # WinSparkle -set(WIN_SPARKLE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/WinSparkle-0.8.0") +set(WIN_SPARKLE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/WinSparkle-0.8.1") set(WIN_SPARKLE_BINARIES "${WIN_SPARKLE_DIR}/x64/Release/WinSparkle.dll") set(WIN_SPARKLE_LIBRARIES "${WIN_SPARKLE_DIR}/x64/Release/WinSparkle.lib") diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/x64/Release/WinSparkle.dll b/packages/auto_updater_windows/windows/WinSparkle-0.8.0/x64/Release/WinSparkle.dll deleted file mode 100644 index 62ecc34..0000000 Binary files a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/x64/Release/WinSparkle.dll and /dev/null differ diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.1/ARM64/Release/WinSparkle.dll b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/ARM64/Release/WinSparkle.dll new file mode 100644 index 0000000..2f333c6 Binary files /dev/null and b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/ARM64/Release/WinSparkle.dll differ diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.1/ARM64/Release/WinSparkle.lib b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/ARM64/Release/WinSparkle.lib new file mode 100644 index 0000000..17ca122 Binary files /dev/null and b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/ARM64/Release/WinSparkle.lib differ diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.1/ARM64/Release/WinSparkle.pdb b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/ARM64/Release/WinSparkle.pdb new file mode 100644 index 0000000..35b29cc Binary files /dev/null and b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/ARM64/Release/WinSparkle.pdb differ diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/AUTHORS b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/AUTHORS similarity index 100% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/AUTHORS rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/AUTHORS diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/COPYING b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/COPYING similarity index 100% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/COPYING rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/COPYING diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/COPYING.expat b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/COPYING.expat similarity index 100% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/COPYING.expat rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/COPYING.expat diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/NEWS b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/NEWS similarity index 96% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/NEWS rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/NEWS index d8947c1..c0cbb12 100644 --- a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/NEWS +++ b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/NEWS @@ -1,3 +1,9 @@ +Version 0.8.1 +------------- + +- Fixed release notes not shown if is malformed + and has whitespace around the URL. + Version 0.8.0 ------------- diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/README.md b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/README.md similarity index 96% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/README.md rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/README.md index ae526f2..8a61785 100644 --- a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/README.md +++ b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/README.md @@ -42,7 +42,7 @@ submodules. Check the sources out and initialize the submodules: - $ git clone git://github.com/vslavik/winsparkle.git + $ git clone https://github.com/vslavik/winsparkle.git $ cd winsparkle $ git submodule init $ git submodule update @@ -91,7 +91,7 @@ When your update is ready (e.g. `Updater.exe`), sign it and include signature to your appcast file: - Sign: `bin\sign_update.bat Updater.exe dsa_priv.pem` - - Add standard output of previos command as `sparkle:dsaSignature` attribute + - Add standard output of previous command as `sparkle:dsaSignature` attribute of `enclosure` node of your appcast file. Alternatively `sparkle:dsaSignature` can be a child node of `enclosure`. @@ -114,7 +114,7 @@ https://github.com/vslavik/winsparkle WinSparkle uses submodules for some dependencies, so you have to initialize them after checking the tree out: - $ git clone git://github.com/vslavik/winsparkle.git + $ git clone https://github.com/vslavik/winsparkle.git $ cd winsparkle $ git submodule init $ git submodule update diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.1/Release/WinSparkle.dll b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/Release/WinSparkle.dll new file mode 100644 index 0000000..9b928e3 Binary files /dev/null and b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/Release/WinSparkle.dll differ diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.1/Release/WinSparkle.lib b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/Release/WinSparkle.lib new file mode 100644 index 0000000..ad0a6b4 Binary files /dev/null and b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/Release/WinSparkle.lib differ diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.1/Release/WinSparkle.pdb b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/Release/WinSparkle.pdb new file mode 100644 index 0000000..64804d5 Binary files /dev/null and b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/Release/WinSparkle.pdb differ diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/bin/generate_keys.bat b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/bin/generate_keys.bat similarity index 100% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/bin/generate_keys.bat rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/bin/generate_keys.bat diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/bin/sign_update.bat b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/bin/sign_update.bat similarity index 100% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/bin/sign_update.bat rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/bin/sign_update.bat diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/include/winsparkle-version.h b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/include/winsparkle-version.h similarity index 98% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/include/winsparkle-version.h rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/include/winsparkle-version.h index 22ace05..1fa1ef5 100644 --- a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/include/winsparkle-version.h +++ b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/include/winsparkle-version.h @@ -32,7 +32,7 @@ #define WIN_SPARKLE_VERSION_MAJOR 0 #define WIN_SPARKLE_VERSION_MINOR 8 -#define WIN_SPARKLE_VERSION_MICRO 0 +#define WIN_SPARKLE_VERSION_MICRO 1 /** Checks if WinSparkle version is at least @a major.@a minor.@a micro. diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/include/winsparkle.h b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/include/winsparkle.h similarity index 100% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/include/winsparkle.h rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/include/winsparkle.h diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.1/x64/Release/WinSparkle.dll b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/x64/Release/WinSparkle.dll new file mode 100644 index 0000000..d77a210 Binary files /dev/null and b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/x64/Release/WinSparkle.dll differ diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/x64/Release/WinSparkle.lib b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/x64/Release/WinSparkle.lib similarity index 94% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/x64/Release/WinSparkle.lib rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/x64/Release/WinSparkle.lib index 94a75bf..99bcf25 100644 Binary files a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/x64/Release/WinSparkle.lib and b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/x64/Release/WinSparkle.lib differ diff --git a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/x64/Release/WinSparkle.pdb b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/x64/Release/WinSparkle.pdb similarity index 58% rename from packages/auto_updater_windows/windows/WinSparkle-0.8.0/x64/Release/WinSparkle.pdb rename to packages/auto_updater_windows/windows/WinSparkle-0.8.1/x64/Release/WinSparkle.pdb index 0199c49..17c48c2 100644 Binary files a/packages/auto_updater_windows/windows/WinSparkle-0.8.0/x64/Release/WinSparkle.pdb and b/packages/auto_updater_windows/windows/WinSparkle-0.8.1/x64/Release/WinSparkle.pdb differ diff --git a/packages/auto_updater_windows/windows/auto_updater.cpp b/packages/auto_updater_windows/windows/auto_updater.cpp index d167bb4..37eb7c8 100644 --- a/packages/auto_updater_windows/windows/auto_updater.cpp +++ b/packages/auto_updater_windows/windows/auto_updater.cpp @@ -1,4 +1,4 @@ -#include "WinSparkle-0.8.0/include/winsparkle.h" +#include "WinSparkle-0.8.1/include/winsparkle.h" #include #include @@ -82,6 +82,7 @@ void AutoUpdater::CheckForUpdates() { void AutoUpdater::CheckForUpdatesWithoutUI() { win_sparkle_check_update_without_ui(); + OnWinSparkleEvent("checking-for-update"); } void AutoUpdater::SetScheduledCheckInterval(int interval) { diff --git a/packages/auto_updater_windows/windows/auto_updater_windows_plugin.cpp b/packages/auto_updater_windows/windows/auto_updater_windows_plugin.cpp index f6db83d..593eec3 100644 --- a/packages/auto_updater_windows/windows/auto_updater_windows_plugin.cpp +++ b/packages/auto_updater_windows/windows/auto_updater_windows_plugin.cpp @@ -29,8 +29,7 @@ void AutoUpdaterWindowsPlugin::RegisterWithRegistrar( }); auto event_channel = std::make_unique>( - registrar->messenger(), - "dev.leanflutter.plugins/auto_updater_event", + registrar->messenger(), "dev.leanflutter.plugins/auto_updater_event", &flutter::StandardMethodCodec::GetInstance()); auto streamHandler = std::make_unique>( [plugin_pointer = plugin.get()]( @@ -39,8 +38,7 @@ void AutoUpdaterWindowsPlugin::RegisterWithRegistrar( -> std::unique_ptr> { return plugin_pointer->OnListen(arguments, std::move(events)); }, - [plugin_pointer = plugin.get()](const flutter::EncodableValue* - arguments) + [plugin_pointer = plugin.get()](const flutter::EncodableValue* arguments) -> std::unique_ptr> { return plugin_pointer->OnCancel(arguments); });