From c028028446dc6904d1c19be949fc7ff4dd74a4a3 Mon Sep 17 00:00:00 2001 From: Roman Makeev Date: Fri, 24 Jan 2025 15:28:07 +0300 Subject: [PATCH 1/3] Fix ci for desktop app --- .../connection/sample/desktop/build.gradle.kts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/components/bridge/connection/sample/desktop/build.gradle.kts b/components/bridge/connection/sample/desktop/build.gradle.kts index 6d42495f3a..355ca16555 100644 --- a/components/bridge/connection/sample/desktop/build.gradle.kts +++ b/components/bridge/connection/sample/desktop/build.gradle.kts @@ -34,6 +34,21 @@ compose.desktop { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) packageName = "Flipper App" packageVersion = project.VERSION_NAME + .let { "1.1" } + .split(".") + .let { semVers -> + // minimum major version for desktop is 1 + val major = semVers.getOrNull(0) + ?.toIntOrNull() + ?.coerceAtLeast(1) + ?: 1 + val minor = semVers.getOrNull(1) ?: 0 + // If generated on CI - getting autogenerated last number first + val patch = semVers.getOrNull(3) + ?: semVers.getOrNull(2) + ?: 0 + "${major}.${minor}.${patch}" + } } } } From f947da43172590c533b44b89219c2a6df5c9a985 Mon Sep 17 00:00:00 2001 From: Roman Makeev Date: Fri, 24 Jan 2025 15:28:28 +0300 Subject: [PATCH 2/3] update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d91c4778b5..824f0f15e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ # 1.8.2 - In Progress - [Feature] Migrate app onto new BLE api +- [Fix] Fix CI for desktop sample app # 1.8.1 From 69da826dffd44a67f232582c6f8a1d74b1582f1e Mon Sep 17 00:00:00 2001 From: Roman Makeev Date: Fri, 24 Jan 2025 15:30:05 +0300 Subject: [PATCH 3/3] return version --- components/bridge/connection/sample/desktop/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/components/bridge/connection/sample/desktop/build.gradle.kts b/components/bridge/connection/sample/desktop/build.gradle.kts index 355ca16555..d63c9d1844 100644 --- a/components/bridge/connection/sample/desktop/build.gradle.kts +++ b/components/bridge/connection/sample/desktop/build.gradle.kts @@ -34,7 +34,6 @@ compose.desktop { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) packageName = "Flipper App" packageVersion = project.VERSION_NAME - .let { "1.1" } .split(".") .let { semVers -> // minimum major version for desktop is 1