From 1f29fde5d2063548dc1776b243f041ce3cab6918 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Fri, 8 Sep 2023 18:17:57 +0800 Subject: [PATCH] fix: macOS app zip struct --- ios/Podfile.lock | 4 ++-- ios/Runner.xcodeproj/project.pbxproj | 24 ++++++++++++------------ lib/data/provider/server.dart | 8 +++++--- lib/data/res/build_data.dart | 6 +++--- macos/Runner.xcodeproj/project.pbxproj | 12 ++++++------ make.dart | 19 +++++++++++-------- 6 files changed, 39 insertions(+), 34 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d7b66e28..42c3c6bf 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - countly_flutter (23.6.0): + - countly_flutter (23.8.0): - Flutter - file_picker (0.0.1): - Flutter @@ -56,7 +56,7 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - countly_flutter: 4eeee607183664b871589250a0bd049cfd2697eb + countly_flutter: f153e5547d4f3cdf24be11f6ed4df32c9a421fa3 file_picker: 1d63c4949e05e386da864365f8c13e1e64787675 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 7bf6f415..8e353e60 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -470,7 +470,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 535; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -478,7 +478,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.529; + MARKETING_VERSION = 1.0.535; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -602,7 +602,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 535; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -610,7 +610,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.529; + MARKETING_VERSION = 1.0.535; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -628,7 +628,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 535; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -636,7 +636,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.529; + MARKETING_VERSION = 1.0.535; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -657,7 +657,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 535; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -670,7 +670,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.529; + MARKETING_VERSION = 1.0.535; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -696,7 +696,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 535; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -709,7 +709,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.529; + MARKETING_VERSION = 1.0.535; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -732,7 +732,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 535; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -745,7 +745,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.529; + MARKETING_VERSION = 1.0.535; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/lib/data/provider/server.dart b/lib/data/provider/server.dart index db1ab498..1d7dee47 100644 --- a/lib/data/provider/server.dart +++ b/lib/data/provider/server.dart @@ -245,13 +245,15 @@ class ServerProvider extends ChangeNotifier { _limiter.inc(sid); s.status.failedInfo = e.toString(); _setServerState(s, ServerState.failed); - _logger.warning('Connect to $sid failed', e); + + /// In order to keep privacy, print [spi.name] instead of [spi.id] + _logger.warning('Connect to ${spi.name} failed', e); return; } final time2 = DateTime.now(); final spentTime = time2.difference(time1).inMilliseconds; - _logger.info('Connected to $sid in $spentTime ms.'); + _logger.info('Connected to ${spi.name} in $spentTime ms.'); _setServerState(s, ServerState.connected); @@ -267,7 +269,7 @@ class ServerProvider extends ChangeNotifier { _limiter.inc(sid); s.status.failedInfo = e.toString(); _setServerState(s, ServerState.failed); - _logger.warning('Write script to $sid failed', e); + _logger.warning('Write script to ${spi.name} failed', e); return; } } diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 5633cb0f..119947a8 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,8 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 529; + static const int build = 535; static const String engine = "3.13.2"; - static const String buildAt = "2023-09-06 21:16:27.707712"; - static const int modifications = 4; + static const String buildAt = "2023-09-07 21:19:54.084724"; + static const int modifications = 0; } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 745128af..7507fc6b 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -474,9 +474,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 535; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.529; + MARKETING_VERSION = 1.0.535; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -489,9 +489,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 535; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.529; + MARKETING_VERSION = 1.0.535; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -504,9 +504,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 535; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.529; + MARKETING_VERSION = 1.0.535; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/make.dart b/make.dart index f2d760dd..d1b2a3b6 100755 --- a/make.dart +++ b/make.dart @@ -169,17 +169,20 @@ Future scpMacOS2CDN() async { macOSArchievePath, 'release', ]); - final zipPath = '$releaseDir/$build.app.zip'; + final zipName = '$build.app.zip'; // Zip the .app - await Process.run('zip', [ - '-r', - zipPath, - macOSArchievePath, - ]); + await Process.run( + 'zip', + [ + '-r', + zipName, + 'server_box.app', + ], + workingDirectory: releaseDir); final result = await Process.run( 'scp', [ - zipPath, + '$releaseDir/$zipName', 'hk:/var/www/res/serverbox/$build.app.zip', ], runInShell: true, @@ -188,7 +191,7 @@ Future scpMacOS2CDN() async { print(result.stderr); exit(1); } - print('Upload macOS $zipPath finished.'); + print('Upload macOS $zipName finished.'); } Future scpLinux2CDN() async {