From f31131428c16fa8cd95275457d981155f4a9538e Mon Sep 17 00:00:00 2001
From: Kyle Scheuing <kyle@kylescheuing.com>
Date: Mon, 8 Jan 2024 23:39:13 -0500
Subject: [PATCH] build: v1.10.2

---
 CHANGELOG.md                                      |  9 +++++++++
 Cargo.lock                                        | 14 +++++++-------
 Cargo.toml                                        |  2 +-
 android/app/build.gradle.kts                      |  4 ++--
 gui/resources/com.oppzippy.OpenSCQ30.metainfo.xml |  5 +++++
 packaging/appimage/AppImageBuilder.yml            |  2 +-
 packaging/windows/setup.iss                       |  2 +-
 web/package-lock.json                             |  4 ++--
 web/package.json                                  |  2 +-
 9 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67ef6304..63cf4276 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## v1.10.2
+
+### Android
+
+#### Fixes
+
+-   Various resource leaks when failing to connect to a device
+-   Edge case where events occur in unexpected order while connecting, causing it to hang
+
 ## v1.10.1
 
 ### General
diff --git a/Cargo.lock b/Cargo.lock
index 3076a867..8c7eff06 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1490,7 +1490,7 @@ checksum = "6c548d5c78976f6955d72d0ced18c48ca07030f7a1d4024529fedd7c1c01b29c"
 
 [[package]]
 name = "openscq30_android"
-version = "1.10.1"
+version = "1.10.2"
 dependencies = [
  "android_logger",
  "anyhow",
@@ -1509,7 +1509,7 @@ dependencies = [
 
 [[package]]
 name = "openscq30_cli"
-version = "1.10.1"
+version = "1.10.2"
 dependencies = [
  "assert_cmd",
  "clap",
@@ -1525,7 +1525,7 @@ dependencies = [
 
 [[package]]
 name = "openscq30_gui"
-version = "1.10.1"
+version = "1.10.2"
 dependencies = [
  "anyhow",
  "dirs",
@@ -1554,7 +1554,7 @@ dependencies = [
 
 [[package]]
 name = "openscq30_lib"
-version = "1.10.1"
+version = "1.10.2"
 dependencies = [
  "bitflags 2.4.1",
  "btleplug",
@@ -1580,7 +1580,7 @@ dependencies = [
 
 [[package]]
 name = "openscq30_lib_protobuf"
-version = "1.10.1"
+version = "1.10.2"
 dependencies = [
  "bytes",
  "openscq30_lib",
@@ -1590,7 +1590,7 @@ dependencies = [
 
 [[package]]
 name = "openscq30_web_wasm"
-version = "1.10.1"
+version = "1.10.2"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -2453,7 +2453,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi-bindgen"
-version = "1.10.1"
+version = "1.10.2"
 dependencies = [
  "uniffi",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index c1ff102d..57ec024d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "1.10.1"
+version = "1.10.2"
 license = "GPL-3.0-or-later"
 
 [profile.release]
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 3c42ab33..95c2d00b 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -41,8 +41,8 @@ android {
         applicationId = "com.oppzippy.openscq30"
         minSdk = 26
         targetSdk = 34
-        versionCode = 17
-        versionName = "1.10.1"
+        versionCode = 18
+        versionName = "1.10.2"
 
         testInstrumentationRunner = "com.oppzippy.openscq30.HiltTestRunner"
         vectorDrawables {
diff --git a/gui/resources/com.oppzippy.OpenSCQ30.metainfo.xml b/gui/resources/com.oppzippy.OpenSCQ30.metainfo.xml
index 4e4c05bc..fe81d3de 100644
--- a/gui/resources/com.oppzippy.OpenSCQ30.metainfo.xml
+++ b/gui/resources/com.oppzippy.OpenSCQ30.metainfo.xml
@@ -41,6 +41,11 @@
         <id>com.oppzippy.OpenSCQ30.desktop</id>
     </provides>
     <releases>
+        <release version="1.10.2" date="2024-01-09">
+            <description>
+ 
+            </description>
+        </release>
         <release version="1.10.1" date="2024-01-03">
             <description>
                 <p>Fixes</p>
diff --git a/packaging/appimage/AppImageBuilder.yml b/packaging/appimage/AppImageBuilder.yml
index c5664066..63b82bdf 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.10.1
+    version: 1.10.2
     exec: usr/bin/openscq30_gui
     exec_args: $@
 
diff --git a/packaging/windows/setup.iss b/packaging/windows/setup.iss
index 05ba00f9..e09508bf 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.10.1"
+#define AppVersion "1.10.2"
 
 [Setup]
 AppName={#AppName}
diff --git a/web/package-lock.json b/web/package-lock.json
index 9e370119..6b89cf20 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "openscq30-web-react",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "openscq30-web-react",
-      "version": "1.10.1",
+      "version": "1.10.2",
       "dependencies": {
         "@emotion/react": "^11.10.6",
         "@emotion/styled": "^11.10.6",
diff --git a/web/package.json b/web/package.json
index 04d2e6a4..4819b5f3 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "openscq30-web-react",
   "private": true,
-  "version": "1.10.1",
+  "version": "1.10.2",
   "type": "module",
   "scripts": {
     "dev": "vite",