From 77e082e474fb3abd03f2ea4f141323991f110767 Mon Sep 17 00:00:00 2001 From: CryptoFish <13164589+KingGorrin@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:40:40 +0200 Subject: [PATCH 1/3] Update copyright year and file version info (#113) --- LICENSE | 2 +- macos/Runner.xcodeproj/project.pbxproj | 6 +++--- macos/Runner/Configs/AppInfo.xcconfig | 2 +- windows/runner/Runner.rc | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index 5241c29c..8bacc131 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2023 The Zenon developers +Copyright (c) 2024 The Zenon developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 5859d9af..35564b47 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -503,7 +503,7 @@ "$(PROJECT_DIR)", ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = "v0.1.0-alphanet"; + MARKETING_VERSION = "v0.2.0-alphanet"; PRODUCT_BUNDLE_IDENTIFIER = network.zenon.syrius; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; @@ -640,7 +640,7 @@ "$(PROJECT_DIR)", ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = "v0.1.0-alphanet"; + MARKETING_VERSION = "v0.2.0-alphanet"; PRODUCT_BUNDLE_IDENTIFIER = network.zenon.syrius; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -667,7 +667,7 @@ "$(PROJECT_DIR)", ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = "v0.1.0-alphanet"; + MARKETING_VERSION = "v0.2.0-alphanet"; PRODUCT_BUNDLE_IDENTIFIER = network.zenon.syrius; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 4c5a529c..d1d50483 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -11,4 +11,4 @@ PRODUCT_NAME = s y r i u s PRODUCT_BUNDLE_IDENTIFIER = network.zenon.syrius // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2023 Zenon Network. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2024 Zenon Network. All rights reserved. diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index bb7996d9..5ae26f28 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -63,13 +63,13 @@ IDI_APP_ICON ICON "resources\\app_icon.ico" #ifdef FLUTTER_BUILD_NUMBER #define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER #else -#define VERSION_AS_NUMBER 0,1,0 +#define VERSION_AS_NUMBER 0,2,0 #endif #ifdef FLUTTER_BUILD_NAME #define VERSION_AS_STRING #FLUTTER_BUILD_NAME #else -#define VERSION_AS_STRING "v0.1.0-alphanet" +#define VERSION_AS_STRING "v0.2.0-alphanet" #endif VS_VERSION_INFO VERSIONINFO @@ -93,7 +93,7 @@ BEGIN VALUE "FileDescription", "s y r i u s (" VERSION_AS_STRING ")" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "syrius" "\0" - VALUE "LegalCopyright", "(C) 2023 Zenon Network" "\0" + VALUE "LegalCopyright", "(C) 2024 Zenon Network" "\0" VALUE "OriginalFilename", "syrius.exe" "\0" VALUE "ProductName", "syrius" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" From 9fa41b42e61ebccf5d44c2093e3fde5f7ad4782e Mon Sep 17 00:00:00 2001 From: CryptoFish <13164589+KingGorrin@users.noreply.github.com> Date: Mon, 8 Apr 2024 21:06:20 +0200 Subject: [PATCH 2/3] Add check for embedded node --- lib/utils/node_utils.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/utils/node_utils.dart b/lib/utils/node_utils.dart index 6f9ad135..d7f9f53c 100644 --- a/lib/utils/node_utils.dart +++ b/lib/utils/node_utils.dart @@ -84,7 +84,9 @@ class NodeUtils { static initWebSocketClient() async { addOnWebSocketConnectedCallback(); - var url = kCurrentNode ?? ''; + var url = kCurrentNode == kEmbeddedNode + ? kLocalhostDefaultNodeUrl + : kCurrentNode ?? ''; bool connected = false; try { connected = await establishConnectionToNode(url); From a719d9ba2bfb161e5a2261ad8f7aad0a42d78e37 Mon Sep 17 00:00:00 2001 From: CryptoFish <13164589+KingGorrin@users.noreply.github.com> Date: Mon, 8 Apr 2024 21:07:41 +0200 Subject: [PATCH 3/3] Bump version --- lib/utils/constants.dart | 2 +- macos/Runner.xcodeproj/project.pbxproj | 6 +++--- windows/runner/Runner.rc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart index 8aff387f..8d4094ac 100644 --- a/lib/utils/constants.dart +++ b/lib/utils/constants.dart @@ -28,7 +28,7 @@ const SizedBox kSpacingBetweenActionButtons = SizedBox( const Size kAcceleratorProgressBarSize = Size(300.0, 10.0); // Wallet version -const String kWalletVersion = '0.2.0'; +const String kWalletVersion = '0.2.1'; // Boxes constants const String kFavoriteTokensBox = 'favourite_tokens_box'; diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 35564b47..6e58d62e 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -503,7 +503,7 @@ "$(PROJECT_DIR)", ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = "v0.2.0-alphanet"; + MARKETING_VERSION = "v0.2.1-alphanet"; PRODUCT_BUNDLE_IDENTIFIER = network.zenon.syrius; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; @@ -640,7 +640,7 @@ "$(PROJECT_DIR)", ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = "v0.2.0-alphanet"; + MARKETING_VERSION = "v0.2.1-alphanet"; PRODUCT_BUNDLE_IDENTIFIER = network.zenon.syrius; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -667,7 +667,7 @@ "$(PROJECT_DIR)", ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = "v0.2.0-alphanet"; + MARKETING_VERSION = "v0.2.1-alphanet"; PRODUCT_BUNDLE_IDENTIFIER = network.zenon.syrius; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 5ae26f28..e9a8f39a 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -63,13 +63,13 @@ IDI_APP_ICON ICON "resources\\app_icon.ico" #ifdef FLUTTER_BUILD_NUMBER #define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER #else -#define VERSION_AS_NUMBER 0,2,0 +#define VERSION_AS_NUMBER 0,2,1 #endif #ifdef FLUTTER_BUILD_NAME #define VERSION_AS_STRING #FLUTTER_BUILD_NAME #else -#define VERSION_AS_STRING "v0.2.0-alphanet" +#define VERSION_AS_STRING "v0.2.1-alphanet" #endif VS_VERSION_INFO VERSIONINFO