From 5068aaea4760477fe6c2fd01c70c2edd6dcc6b2f Mon Sep 17 00:00:00 2001 From: Kyle Scheuing Date: Sat, 30 Sep 2023 05:17:32 -0400 Subject: [PATCH] build: v1.7.0 --- CHANGELOG.md | 4 +++- Cargo.lock | 10 +++++----- android/Cargo.toml | 2 +- android/app/build.gradle.kts | 4 ++-- cli/Cargo.toml | 2 +- gui/Cargo.toml | 2 +- gui/resources/com.oppzippy.OpenSCQ30.metainfo.xml | 8 ++++++++ lib/Cargo.toml | 2 +- packaging/appimage/AppImageBuilder.yml | 2 +- packaging/windows/setup.iss | 2 +- web/package-lock.json | 4 ++-- web/package.json | 2 +- web/wasm/Cargo.toml | 2 +- 13 files changed, 28 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba48e971..9225ea5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## v1.7.0 ### GUI @@ -17,6 +17,8 @@ #### Fixes - Fix settings not used by the connected device showing in quick presets +- Fix screen rotation causing disconnect +- Refresh device list when granting bluetooth permission ## v1.6.0 diff --git a/Cargo.lock b/Cargo.lock index ef291986..1cedc15b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1376,7 +1376,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openscq30_android" -version = "1.6.0" +version = "1.7.0" dependencies = [ "android_logger", "anyhow", @@ -1395,7 +1395,7 @@ dependencies = [ [[package]] name = "openscq30_cli" -version = "1.6.0" +version = "1.7.0" dependencies = [ "assert_cmd", "clap", @@ -1410,7 +1410,7 @@ dependencies = [ [[package]] name = "openscq30_gui" -version = "1.6.0" +version = "1.7.0" dependencies = [ "anyhow", "async-trait", @@ -1439,7 +1439,7 @@ dependencies = [ [[package]] name = "openscq30_lib" -version = "1.6.0" +version = "1.7.0" dependencies = [ "async-trait", "bitflags 2.4.0", @@ -1466,7 +1466,7 @@ dependencies = [ [[package]] name = "openscq30_web_wasm" -version = "1.6.0" +version = "1.7.0" dependencies = [ "async-trait", "console_error_panic_hook", diff --git a/android/Cargo.toml b/android/Cargo.toml index 98a9391f..2b6dbc9c 100644 --- a/android/Cargo.toml +++ b/android/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openscq30_android" -version = "1.6.0" +version = "1.7.0" edition = "2021" [dependencies] diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 61a4ab89..f10dd979 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -39,8 +39,8 @@ android { applicationId = "com.oppzippy.openscq30" minSdk = 26 targetSdk = 34 - versionCode = 11 - versionName = "1.6.0" + versionCode = 12 + versionName = "1.7.0" testInstrumentationRunner = "com.oppzippy.openscq30.HiltTestRunner" vectorDrawables { diff --git a/cli/Cargo.toml b/cli/Cargo.toml index feac5f2f..909cd21f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openscq30_cli" -version = "1.6.0" +version = "1.7.0" edition = "2021" [features] diff --git a/gui/Cargo.toml b/gui/Cargo.toml index 5d651ecf..027e8c6d 100644 --- a/gui/Cargo.toml +++ b/gui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openscq30_gui" -version = "1.6.0" +version = "1.7.0" edition = "2021" [features] diff --git a/gui/resources/com.oppzippy.OpenSCQ30.metainfo.xml b/gui/resources/com.oppzippy.OpenSCQ30.metainfo.xml index 701d2639..831b1694 100644 --- a/gui/resources/com.oppzippy.OpenSCQ30.metainfo.xml +++ b/gui/resources/com.oppzippy.OpenSCQ30.metainfo.xml @@ -33,6 +33,14 @@ com.oppzippy.OpenSCQ30.desktop + + +

Fixes

+
    +
  • Bluetooth initialization when launching the application will no longer block the window from showing
    • +
+ +

Features

diff --git a/lib/Cargo.toml b/lib/Cargo.toml index ec0bc1b1..9ead80d0 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openscq30_lib" -version = "1.6.0" +version = "1.7.0" edition = "2021" [features] diff --git a/packaging/appimage/AppImageBuilder.yml b/packaging/appimage/AppImageBuilder.yml index f58d9a7d..a6ddd2e0 100644 --- a/packaging/appimage/AppImageBuilder.yml +++ b/packaging/appimage/AppImageBuilder.yml @@ -11,7 +11,7 @@ AppDir: id: com.oppzippy.OpenSCQ30 name: openscq30_gui icon: com.oppzippy.OpenSCQ30 - version: 1.6.0 + version: 1.7.0 exec: usr/bin/openscq30_gui exec_args: $@ diff --git a/packaging/windows/setup.iss b/packaging/windows/setup.iss index ff8e2791..97c6900f 100644 --- a/packaging/windows/setup.iss +++ b/packaging/windows/setup.iss @@ -1,6 +1,6 @@ #define AppName "OpenSCQ30" #define AppExeName "openscq30_gui.exe" -#define AppVersion "1.6.0" +#define AppVersion "1.7.0" [Setup] AppName={#AppName} diff --git a/web/package-lock.json b/web/package-lock.json index 90fe49b2..c88b62ec 100755 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "openscq30-web-react", - "version": "1.6.0", + "version": "1.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "openscq30-web-react", - "version": "1.6.0", + "version": "1.7.0", "dependencies": { "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", diff --git a/web/package.json b/web/package.json index 87d48033..c931a5fc 100755 --- a/web/package.json +++ b/web/package.json @@ -1,7 +1,7 @@ { "name": "openscq30-web-react", "private": true, - "version": "1.6.0", + "version": "1.7.0", "type": "module", "scripts": { "dev": "vite", diff --git a/web/wasm/Cargo.toml b/web/wasm/Cargo.toml index bd06ddfe..59cba353 100644 --- a/web/wasm/Cargo.toml +++ b/web/wasm/Cargo.toml @@ -3,7 +3,7 @@ name = "openscq30_web_wasm" description = "Packet parsing and such for OpenSCQ30 web" repository = "https://github.com/Oppzippy/OpenSCQ30/tree/master/web/wasm" license = "GPL-3.0-or-later" -version = "1.6.0" +version = "1.7.0" edition = "2021" [lib]