diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8e353e60..dcf17f8d 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 = 535; + CURRENT_PROJECT_VERSION = 538; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -478,7 +478,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.535; + MARKETING_VERSION = 1.0.538; 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 = 535; + CURRENT_PROJECT_VERSION = 538; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -610,7 +610,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.535; + MARKETING_VERSION = 1.0.538; 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 = 535; + CURRENT_PROJECT_VERSION = 538; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -636,7 +636,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.535; + MARKETING_VERSION = 1.0.538; 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 = 535; + CURRENT_PROJECT_VERSION = 538; 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.535; + MARKETING_VERSION = 1.0.538; 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 = 535; + CURRENT_PROJECT_VERSION = 538; 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.535; + MARKETING_VERSION = 1.0.538; 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 = 535; + CURRENT_PROJECT_VERSION = 538; 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.535; + MARKETING_VERSION = 1.0.538; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/lib/data/model/app/shell_func.dart b/lib/data/model/app/shell_func.dart index 529b2f24..2e1a01b3 100644 --- a/lib/data/model/app/shell_func.dart +++ b/lib/data/model/app/shell_func.dart @@ -5,7 +5,11 @@ import '../server/system.dart'; const _cmdDivider = '\necho $seperator\n\t'; const _serverBoxDir = r'$HOME/.config/server_box'; -const _shellPath = '$_serverBoxDir/mobile_app_v${BuildData.build}.sh'; + +/// Issue #159 +/// Use script commit count as version of shell script. +/// So different version of app can run at the same time. +const _shellPath = '$_serverBoxDir/mobile_v${BuildData.script}.sh'; enum AppShellFuncType { status, diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 119947a8..62a76220 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,8 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 535; + static const int build = 538; static const String engine = "3.13.2"; - static const String buildAt = "2023-09-07 21:19:54.084724"; - static const int modifications = 0; + static const String buildAt = "2023-09-08 19:51:19.470479"; + static const int modifications = 4; + static const int script = 13; } diff --git a/lib/view/page/setting/entry.dart b/lib/view/page/setting/entry.dart index 30c95a91..5c3afade 100644 --- a/lib/view/page/setting/entry.dart +++ b/lib/view/page/setting/entry.dart @@ -319,14 +319,15 @@ class _SettingPageState extends State { child: StatefulBuilder(builder: (context, setState) { final children = [ /// Plugin [dynamic_color] is not supported on iOS - if (!isIOS) ListTile( - title: Text(_s.followSystem), - trailing: buildSwitch( - context, - _setting.useSystemPrimaryColor, - func: (_) => setState(() {}), - ), - ) + if (!isIOS) + ListTile( + title: Text(_s.followSystem), + trailing: buildSwitch( + context, + _setting.useSystemPrimaryColor, + func: (_) => setState(() {}), + ), + ) ]; if (!_setting.useSystemPrimaryColor.fetch()) { children.addAll([ diff --git a/macos/Podfile.lock b/macos/Podfile.lock index eb11fba7..3e99a2b6 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -1,4 +1,6 @@ PODS: + - dynamic_color (0.0.2): + - FlutterMacOS - FlutterMacOS (1.0.0) - macos_window_utils (1.0.0): - FlutterMacOS @@ -14,6 +16,7 @@ PODS: - FlutterMacOS DEPENDENCIES: + - dynamic_color (from `Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - macos_window_utils (from `Flutter/ephemeral/.symlinks/plugins/macos_window_utils/macos`) - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) @@ -22,6 +25,8 @@ DEPENDENCIES: - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) EXTERNAL SOURCES: + dynamic_color: + :path: Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos FlutterMacOS: :path: Flutter/ephemeral macos_window_utils: @@ -36,6 +41,7 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos SPEC CHECKSUMS: + dynamic_color: 2eaa27267de1ca20d879fbd6e01259773fb1670f FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 macos_window_utils: 933f91f64805e2eb91a5bd057cf97cd097276663 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 7507fc6b..76779bfa 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 = 535; + CURRENT_PROJECT_VERSION = 538; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.535; + MARKETING_VERSION = 1.0.538; 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 = 535; + CURRENT_PROJECT_VERSION = 538; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.535; + MARKETING_VERSION = 1.0.538; 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 = 535; + CURRENT_PROJECT_VERSION = 538; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.535; + MARKETING_VERSION = 1.0.538; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/make.dart b/make.dart index d1b2a3b6..5b15f264 100755 --- a/make.dart +++ b/make.dart @@ -32,6 +32,15 @@ Future getGitCommitCount() async { .length; } +Future getScriptCommitCount() async { + final result = await Process.run( + 'git', ['log', '--oneline', 'lib/data/model/app/shell_func.dart']); + return (result.stdout as String) + .split('\n') + .where((line) => line.isNotEmpty) + .length; +} + Future writeStaicConfigFile( Map data, String className, String path) async { final buffer = StringBuffer(); @@ -69,6 +78,7 @@ Future> getBuildData() async { 'engine': await getFlutterVersion(), 'buildAt': DateTime.now().toString(), 'modifications': await getGitModificationCount(), + 'script': await getScriptCommitCount(), }; return data; }