diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52b2a36c..c2cfa97b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: uses: subosito/flutter-action@v2 with: channel: 'stable' - flutter-version: '3.24.0' + flutter-version: '3.24.1' - uses: actions/setup-java@v4 with: distribution: 'zulu' diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 479ca7c3..ce509d48 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -690,7 +690,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -700,7 +700,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -826,7 +826,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -836,7 +836,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -854,7 +854,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -864,7 +864,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -885,7 +885,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -898,7 +898,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -924,7 +924,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -937,7 +937,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -960,7 +960,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -973,7 +973,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -996,7 +996,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1008,7 +1008,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -1037,7 +1037,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1049,7 +1049,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -1075,7 +1075,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1087,7 +1087,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/core/route.dart b/lib/core/route.dart index 70aa511c..42edd093 100644 --- a/lib/core/route.dart +++ b/lib/core/route.dart @@ -23,7 +23,6 @@ import 'package:server_box/view/page/storage/local.dart'; import 'package:server_box/data/model/server/snippet.dart'; import 'package:server_box/view/page/editor.dart'; import 'package:server_box/view/page/process.dart'; -import 'package:server_box/view/page/server/edit.dart'; import 'package:server_box/view/page/server/tab.dart'; import 'package:server_box/view/page/setting/entry.dart'; import 'package:server_box/view/page/setting/seq/srv_detail_seq.dart'; @@ -66,13 +65,6 @@ class AppRoutes { return AppRoutes(ServerPage(key: key), 'server_tab'); } - static AppRoutes serverEdit({Key? key, Spi? spi}) { - return AppRoutes( - ServerEditPage(spi: spi), - 'server_${spi == null ? 'add' : 'edit'}', - ); - } - static AppRoutes keyEdit({Key? key, PrivateKeyInfo? pki}) { return AppRoutes( PrivateKeyEditPage(pki: pki), diff --git a/lib/core/utils/server.dart b/lib/core/utils/server.dart index 02524c73..eda02866 100644 --- a/lib/core/utils/server.dart +++ b/lib/core/utils/server.dart @@ -93,8 +93,8 @@ Future genClient( spi.port, timeout: timeout, ); - } catch (e, s) { - Loggers.app.warning('genClient', e, s); + } catch (e) { + Loggers.app.warning('genClient', e); if (spi.alterUrl == null) rethrow; try { final res = spi.fromStringUrl(); @@ -104,8 +104,8 @@ Future genClient( res.$3, timeout: timeout, ); - } catch (e, s) { - Loggers.app.warning('genClient alterUrl', e, s); + } catch (e) { + Loggers.app.warning('genClient alterUrl', e); rethrow; } } diff --git a/lib/data/model/server/server_private_info.dart b/lib/data/model/server/server_private_info.dart index 2b18f794..3268b1da 100644 --- a/lib/data/model/server/server_private_info.dart +++ b/lib/data/model/server/server_private_info.dart @@ -107,13 +107,13 @@ extension Spix on Spi { throw SSHErr(type: SSHErrType.connect, message: 'alterUrl no @'); } final usr = splited[0]; - final splited2 = splited[1].split(':'); - if (splited2.length != 2) { + final idx = splited[1].lastIndexOf(':'); + if (idx == -1) { throw SSHErr(type: SSHErrType.connect, message: 'alterUrl no :'); } - final ip_ = splited2[0]; - final port_ = int.tryParse(splited2[1]) ?? 22; - if (port <= 0 || port > 65535) { + final ip_ = splited[1].substring(0, idx); + final port_ = int.tryParse(splited[1].substring(idx + 1)); + if (port_ == null || port_ <= 0 || port_ > 65535) { throw SSHErr(type: SSHErrType.connect, message: 'alterUrl port error'); } return (ip_, usr, port_); diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 41c40123..c38d7a3d 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -3,6 +3,6 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 1070; + static const int build = 1076; static const int script = 58; } diff --git a/lib/view/page/server/detail/view.dart b/lib/view/page/server/detail/view.dart index 772b8b82..8a6053ce 100644 --- a/lib/view/page/server/detail/view.dart +++ b/lib/view/page/server/detail/view.dart @@ -17,6 +17,7 @@ import 'package:server_box/data/model/server/sensors.dart'; import 'package:server_box/data/model/server/server_private_info.dart'; import 'package:server_box/data/model/server/system.dart'; import 'package:server_box/data/res/store.dart'; +import 'package:server_box/view/page/server/edit.dart'; import 'package:server_box/view/widget/server_func_btns.dart'; import 'package:server_box/core/route.dart'; @@ -125,7 +126,7 @@ class _ServerDetailPageState extends State IconButton( icon: const Icon(Icons.edit), onPressed: () async { - final delete = await AppRoutes.serverEdit(spi: si.spi).go(context); + final delete = await ServerEditPage.route.go(context, args: si.spi); if (delete == true) { context.pop(); } diff --git a/lib/view/page/server/edit.dart b/lib/view/page/server/edit.dart index a0cbb336..7f0676c5 100644 --- a/lib/view/page/server/edit.dart +++ b/lib/view/page/server/edit.dart @@ -15,15 +15,21 @@ import 'package:server_box/data/model/server/server_private_info.dart'; import 'package:server_box/data/provider/private_key.dart'; class ServerEditPage extends StatefulWidget { - const ServerEditPage({super.key, this.spi}); + final Spi? args; - final Spi? spi; + const ServerEditPage({super.key, this.args}); + + static const route = AppRoute( + page: ServerEditPage.new, + path: '/server_edit', + ); @override State createState() => _ServerEditPageState(); } class _ServerEditPageState extends State with AfterLayoutMixin { + late final spi = widget.args; final _nameController = TextEditingController(); final _ipController = TextEditingController(); final _altUrlController = TextEditingController(); @@ -47,6 +53,7 @@ class _ServerEditPageState extends State with AfterLayoutMixin { late FocusScopeNode _focusScope; + /// -1: non selected, null: password, others: index of private key final _keyIdx = ValueNotifier(null); final _autoConnect = ValueNotifier(true); final _jumpServer = nvn(); @@ -88,7 +95,7 @@ class _ServerEditPageState extends State with AfterLayoutMixin { @override Widget build(BuildContext context) { final actions = []; - if (widget.spi != null) actions.add(_buildDelBtn()); + if (spi != null) actions.add(_buildDelBtn()); return GestureDetector( onTap: () => _focusScope.unfocus(), @@ -277,7 +284,7 @@ class _ServerEditPageState extends State with AfterLayoutMixin { onTap: () async { final res = await KvEditor.route.go( context, - args: KvEditorArgs(data: widget.spi?.envs ?? {}), + KvEditorArgs(data: spi?.envs ?? {}), ); if (res == null) return; _env.value = res; @@ -409,7 +416,7 @@ class _ServerEditPageState extends State with AfterLayoutMixin { onTap: () async { final res = await KvEditor.route.go( context, - args: KvEditorArgs(data: _customCmds.value), + KvEditorArgs(data: _customCmds.value), ); if (res == null) return; _customCmds.value = res; @@ -477,7 +484,7 @@ class _ServerEditPageState extends State with AfterLayoutMixin { final srvs = ServerProvider.servers.values .map((e) => e.value) .where((e) => e.spi.jumpId == null) - .where((e) => e.spi.id != widget.spi?.id) + .where((e) => e.spi.id != spi?.id) .toList(); final choice = _jumpServer.listenVal( (val) { @@ -602,10 +609,10 @@ class _ServerEditPageState extends State with AfterLayoutMixin { envs: _env.value.isEmpty ? null : _env.value, ); - if (widget.spi == null) { + if (this.spi == null) { ServerProvider.addServer(spi); } else { - ServerProvider.updateServer(widget.spi!, spi); + ServerProvider.updateServer(this.spi!, spi); } context.pop(); @@ -613,9 +620,8 @@ class _ServerEditPageState extends State with AfterLayoutMixin { @override void afterFirstLayout(BuildContext context) { - final spi = widget.spi; if (spi != null) { - _initWithSpi(spi); + _initWithSpi(spi!); } } @@ -628,7 +634,7 @@ class _ServerEditPageState extends State with AfterLayoutMixin { _passwordController.text = spi.pwd ?? ''; } else { _keyIdx.value = PrivateKeyProvider.pkis.value.indexWhere( - (e) => e.id == widget.spi!.keyId, + (e) => e.id == spi.keyId, ); } @@ -705,15 +711,13 @@ class _ServerEditPageState extends State with AfterLayoutMixin { onPressed: () { context.showRoundDialog( title: libL10n.attention, - child: StatefulBuilder(builder: (ctx, setState) { - return Text(libL10n.askContinue( - '${libL10n.delete} ${l10n.server}(${widget.spi!.name})', - )); - }), + child: Text(libL10n.askContinue( + '${libL10n.delete} ${l10n.server}(${spi!.name})', + )), actions: Btn.ok( onTap: () async { context.pop(); - ServerProvider.delServer(widget.spi!.id); + ServerProvider.delServer(spi!.id); context.pop(true); }, red: true, diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 35684171..ff8d457b 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -9,6 +9,7 @@ import 'package:server_box/core/extension/ssh_client.dart'; import 'package:server_box/data/model/app/shell_func.dart'; import 'package:server_box/data/model/server/try_limiter.dart'; import 'package:server_box/data/res/store.dart'; +import 'package:server_box/view/page/server/edit.dart'; import 'package:server_box/view/widget/percent_circle.dart'; import 'package:server_box/core/route.dart'; @@ -107,7 +108,7 @@ class _ServerPageState extends State controller: _scrollController, child: FloatingActionButton( heroTag: 'addServer', - onPressed: () => AppRoutes.serverEdit().go(context), + onPressed: () => ServerEditPage.route.go(context), tooltip: libL10n.add, child: const Icon(Icons.add), ), @@ -259,7 +260,7 @@ class _ServerPageState extends State if (srv.canViewDetails) { AppRoutes.serverDetail(spi: srv.spi).go(context); } else { - AppRoutes.serverEdit(spi: srv.spi).go(context); + ServerEditPage.route.go(context, args: srv.spi); } }, onLongPress: () { @@ -270,7 +271,7 @@ class _ServerPageState extends State flip: !cardStatus.value.flip, ); } else { - AppRoutes.serverEdit(spi: srv.spi).go(context); + ServerEditPage.route.go(context, args: srv.spi); } }, child: Padding( @@ -384,7 +385,7 @@ class _ServerPageState extends State textStyle: textStyle, ), Btn.column( - onTap: () => AppRoutes.serverEdit(spi: srv.spi).go(context), + onTap: () => ServerEditPage.route.go(context, args: srv.spi), icon: const Icon(Icons.edit, color: Colors.grey), text: libL10n.edit, textStyle: textStyle, diff --git a/lib/view/page/setting/platform/android.dart b/lib/view/page/setting/platform/android.dart index dba98205..2ce809be 100644 --- a/lib/view/page/setting/platform/android.dart +++ b/lib/view/page/setting/platform/android.dart @@ -64,7 +64,7 @@ class _AndroidSettingsPageState extends State { } final result = await KvEditor.route.go( context, - args: KvEditorArgs(data: data, prefix: 'widget_'), + KvEditorArgs(data: data, prefix: 'widget_'), ); if (result != null) { _saveWidgetSP(result, data); diff --git a/lib/view/page/setting/platform/ios.dart b/lib/view/page/setting/platform/ios.dart index 38c7da21..a632108f 100644 --- a/lib/view/page/setting/platform/ios.dart +++ b/lib/view/page/setting/platform/ios.dart @@ -111,7 +111,7 @@ class _IOSSettingsPageState extends State { final urls = Map.from(map['urls'] as Map? ?? {}); final result = await KvEditor.route.go( context, - args: KvEditorArgs(data: urls), + KvEditorArgs(data: urls), ); if (result == null) return; diff --git a/lib/view/page/ssh/tab.dart b/lib/view/page/ssh/tab.dart index 4f5f0a8a..39bea960 100644 --- a/lib/view/page/ssh/tab.dart +++ b/lib/view/page/ssh/tab.dart @@ -3,9 +3,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:icons_plus/icons_plus.dart'; import 'package:server_box/core/extension/context/locale.dart'; -import 'package:server_box/core/route.dart'; import 'package:server_box/data/model/server/server_private_info.dart'; import 'package:server_box/data/provider/server.dart'; +import 'package:server_box/view/page/server/edit.dart'; import 'package:server_box/view/page/ssh/page.dart'; class SSHTabPage extends StatefulWidget { @@ -48,7 +48,7 @@ class _SSHTabPageState extends State if (idx != 0) return const SizedBox(); return FloatingActionButton( heroTag: 'sshAddServer', - onPressed: () => AppRoutes.serverEdit().go(context), + onPressed: () => ServerEditPage.route.go(context), tooltip: libL10n.add, child: const Icon(Icons.add), ); diff --git a/lib/view/page/systemd.dart b/lib/view/page/systemd.dart index bf850ff1..4be4af07 100644 --- a/lib/view/page/systemd.dart +++ b/lib/view/page/systemd.dart @@ -21,7 +21,7 @@ final class SystemdPage extends StatefulWidget { required this.args, }); - static const route = AppRoute( + static const route = AppRouteArg( page: SystemdPage.new, path: '/systemd', ); diff --git a/lib/view/widget/server_func_btns.dart b/lib/view/widget/server_func_btns.dart index 4e9747df..27bda211 100644 --- a/lib/view/widget/server_func_btns.dart +++ b/lib/view/widget/server_func_btns.dart @@ -165,10 +165,7 @@ void _onTapMoreBtns( ); break; case ServerFuncBtn.systemd: - SystemdPage.route.go( - context, - args: SystemdPageArgs(spi: spi), - ); + SystemdPage.route.go(context, SystemdPageArgs(spi: spi)); break; } } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 76844bff..5482e9b6 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -471,7 +471,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -481,7 +481,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -608,7 +608,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -618,7 +618,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -638,7 +638,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1070; + CURRENT_PROJECT_VERSION = 1076; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; @@ -649,7 +649,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.1070; + MARKETING_VERSION = 1.0.1076; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/pubspec.lock b/pubspec.lock index 3461df57..05927ae5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -421,8 +421,8 @@ packages: dependency: "direct dev" description: path: "." - ref: "v1.0.42" - resolved-ref: "2cae3388a66581169638c3b3f5fc73dd7b5b4bfd" + ref: "v1.0.43" + resolved-ref: df503ed1598f4fc6a3d3904491d54a1738d4be98 url: "https://github.com/lppcg/fl_build.git" source: git version: "1.0.0" @@ -438,8 +438,8 @@ packages: dependency: "direct main" description: path: "." - ref: "v1.0.143" - resolved-ref: "241ab972985a97abcba032cba96229bdff61a759" + ref: "v1.0.145" + resolved-ref: "9f37be2b15c9d87887d704599f8fcc17263b8335" url: "https://github.com/lppcg/fl_lib" source: git version: "0.0.1" @@ -1425,10 +1425,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.4" + version: "14.2.5" wake_on_lan: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index c55c95bf..b2b86944 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: server_box description: server status & toolbox app. publish_to: 'none' -version: 1.0.1070+1070 +version: 1.0.1076+1076 environment: sdk: ">=3.0.0" @@ -60,7 +60,7 @@ dependencies: fl_lib: git: url: https://github.com/lppcg/fl_lib - ref: v1.0.143 + ref: v1.0.145 dependency_overrides: # dartssh2: @@ -70,7 +70,7 @@ dependency_overrides: # fl_lib: # path: ../fl_lib # fl_build: - # path: ../fl_build + # path: ../fl_build dev_dependencies: flutter_native_splash: ^2.1.6 @@ -83,7 +83,7 @@ dev_dependencies: fl_build: git: url: https://github.com/lppcg/fl_build.git - ref: v1.0.42 + ref: v1.0.43 flutter: generate: true