Update dependencies

NickvisionApps · Jul 25, 2024 · 01afe31 · 01afe31
1 parent f12b7f2
commit 01afe31
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -30,7 +30,7 @@ jobs:
         with:
           pkgs: libnick libjpeg-turbo boost-gil
           triplet: x64-windows
-          revision: 90ff15472a7c9f858717667b66403344e73cfb9c
+          revision: 02d93df47bb4c9b062921b26c77a251490127151
           token: ${{ secrets.GITHUB_TOKEN }}
           github-binarycache: true
       - name: "Build"
@@ -39,13 +39,13 @@ jobs:
           cmake -G "Visual Studio 17 2022" ..
           cmake --build . --config Release
       - name: "Create Installer"
-        working-directory: ${{github.workspace}}
+        working-directory: ${{github.workspace}}/inno
         run: |
           choco install wget
           choco install innosetup
           wget https://aka.ms/vs/17/release/vc_redist.x64.exe -O vc_redist.x64.exe
-          wget https://aka.ms/windowsappsdk/1.5/1.5.240607001/windowsappruntimeinstall-x64.exe -O windowsappruntimeinstall-x64.exe
-          iscc inno/setup.iss
+          wget https://aka.ms/windowsappsdk/1.5/1.5.240627000/windowsappruntimeinstall-x64.exe -O windowsappruntimeinstall-x64.exe
+          iscc setup.iss
       - name: Upload
         uses: actions/upload-artifact@v4
         with:

diff --git a/inno/setup.iss b/inno/setup.iss
@@ -3,7 +3,7 @@
 
 #define MyAppName "Nickvision Spotlight"
 #define MyAppShortName "Spotlight"
-#define MyAppVersion "2024.6.4"
+#define MyAppVersion "2024.7.0"
 #define MyAppPublisher "Nickvision"
 #define MyAppURL "https://nickvision.org"
 #define MyAppExeName "org.nickvision.spotlight.winui.exe"
@@ -66,8 +66,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\vc_redist.x64.exe"; DestDir: "{app}\deps"; AfterInstall: SetupVC  
-Source: "..\windowsappruntimeinstall-x64.exe"; DestDir: "{app}\deps"; AfterInstall: SetupWinAppSDK  
+Source: "vc_redist.x64.exe"; DestDir: "{app}\deps"; AfterInstall: SetupVC  
+Source: "windowsappruntimeinstall-x64.exe"; DestDir: "{app}\deps"; AfterInstall: SetupWinAppSDK  
 Source: "..\build\org.nickvision.spotlight.winui\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion 
 Source: "..\build\org.nickvision.spotlight.winui\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: Cleanup
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files

diff --git a/libspotlight/src/controllers/mainwindowcontroller.cpp b/libspotlight/src/controllers/mainwindowcontroller.cpp
@@ -29,10 +29,10 @@ namespace Nickvision::Spotlight::Shared::Controllers
         m_args{ args },
         m_appInfo{ "org.nickvision.spotlight", "Nickvision Spotlight", "Spotlight" },
         m_dataFileManager{ m_appInfo.getName() },
-        m_logger{ UserDirectories::get(UserDirectory::ApplicationLocalData, m_appInfo.getName()) / "log.txt", std::find(m_args.begin(), m_args.end(), "--debug") != m_args.end() ? Logging::LogLevel::Debug : Logging::LogLevel::Info, false },
+        m_logger{ UserDirectories::get(ApplicationUserDirectory::LocalData, m_appInfo.getName()) / "log.txt", Logging::LogLevel::Info, false },
         m_spotlightManager{ m_appInfo.getName(), m_logger }
     {
-        m_appInfo.setVersion({ "2024.6.4" });
+        m_appInfo.setVersion({ "2024.7.0-next" });
         m_appInfo.setShortName(_("Spotlight"));
         m_appInfo.setDescription(_("Find your favorite Windows spotlight images"));
         m_appInfo.setChangelog("- Updated dependencies");

diff --git a/libspotlight/src/models/configuration.cpp b/libspotlight/src/models/configuration.cpp
@@ -33,8 +33,8 @@ namespace Nickvision::Spotlight::Shared::Models
     {
         WindowGeometry geometry;
         const Json::Value json{ m_json["WindowGeometry"] };
-        geometry.setWidth(json.get("Width", 900).asInt64());
-        geometry.setHeight(json.get("Height", 700).asInt64());
+        geometry.setWidth(static_cast<long>(json.get("Width", 900).asInt64()));
+        geometry.setHeight(static_cast<long>(json.get("Height", 700).asInt64()));
         geometry.setIsMaximized(json.get("IsMaximized", false).asBool());
         return geometry;
     }

diff --git a/libspotlight/src/models/spotlightmanager.cpp b/libspotlight/src/models/spotlightmanager.cpp
@@ -26,7 +26,7 @@ namespace Nickvision::Spotlight::Shared::Models
     SpotlightManager::SpotlightManager(const std::string& appName, Logger& logger)
         : m_spotlightLockScreenDir{ UserDirectories::get(UserDirectory::LocalData) / "Packages/Microsoft.Windows.ContentDeliveryManager_cw5n1h2txyewy/LocalState/Assets" },
         m_spotlightDesktopDir{ UserDirectories::get(UserDirectory::LocalData) / "Packages/MicrosoftWindows.Client.CBS_cw5n1h2txyewy/LocalCache/Microsoft/IrisService" },
-        m_dataDir{ UserDirectories::get(UserDirectory::ApplicationConfig, appName) / "Images" },
+        m_dataDir{ UserDirectories::get(ApplicationUserDirectory::Config, appName) / "Images" },
         m_logger{ logger }
     {
         if(!std::filesystem::exists(m_dataDir))

diff --git a/org.nickvision.spotlight.winui/CMakeLists.txt b/org.nickvision.spotlight.winui/CMakeLists.txt
@@ -26,7 +26,7 @@ if(WIN32)
     set_property(SOURCE "App.xaml" PROPERTY VS_XAML_TYPE "ApplicationDefinition")
     set_property(TARGET org.nickvision.spotlight.winui PROPERTY VS_PACKAGE_REFERENCES
         "Microsoft.Windows.CppWinRT_2.0.240405.15"
-        "Microsoft.WindowsAppSDK_1.5.240607001"
+        "Microsoft.WindowsAppSDK_1.5.240627000"
         "Microsoft.Windows.SDK.BuildTools_10.0.26100.1"
         "Microsoft.Windows.ImplementationLibrary_1.0.240122.1")
     target_include_directories(org.nickvision.spotlight.winui PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")

diff --git a/org.nickvision.spotlight.winui/org.nickvision.spotlight.winui.manifest b/org.nickvision.spotlight.winui/org.nickvision.spotlight.winui.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="2024.6.0.0" name="org.nickvision.spotlight.winui"/>
+  <assemblyIdentity version="2024.7.0.0" name="org.nickvision.spotlight.winui"/>
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>

diff --git a/resources/po/spotlight.pot b/resources/po/spotlight.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-02 22:25-0400\n"
+"POT-Creation-Date: 2024-07-25 12:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"