From 167d65a97b039cfbde017c46fa0ca456743edf5c Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Sun, 23 Apr 2023 14:51:46 +0800 Subject: [PATCH] fix: `dio` < 5.0.0 vulnerability --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/core/update.dart | 2 +- lib/data/res/build_data.dart | 6 +++--- lib/data/service/app.dart | 5 +++-- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a07928b1..89be0142 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -359,7 +359,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 270; + CURRENT_PROJECT_VERSION = 274; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -367,7 +367,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.270; + MARKETING_VERSION = 1.0.274; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -490,7 +490,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 270; + CURRENT_PROJECT_VERSION = 274; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -498,7 +498,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.270; + MARKETING_VERSION = 1.0.274; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -515,7 +515,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 270; + CURRENT_PROJECT_VERSION = 274; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -523,7 +523,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.270; + MARKETING_VERSION = 1.0.274; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/core/update.dart b/lib/core/update.dart index 2e1d3f81..ee7c2a34 100644 --- a/lib/core/update.dart +++ b/lib/core/update.dart @@ -3,12 +3,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:logging/logging.dart'; import 'package:r_upgrade/r_upgrade.dart'; -import 'package:toolbox/core/utils/navigator.dart'; import '../data/provider/app.dart'; import '../data/res/build_data.dart'; import '../data/service/app.dart'; import '../locator.dart'; +import 'utils/navigator.dart'; import 'utils/platform.dart'; import 'utils/ui.dart'; diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index bb5cad8e..1a91fbc6 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 = 270; + static const int build = 274; static const String engine = "3.7.11"; - static const String buildAt = "2023-04-19 20:59:00.726374"; - static const int modifications = 2; + static const String buildAt = "2023-04-23 14:25:48.263478"; + static const int modifications = 4; } diff --git a/lib/data/service/app.dart b/lib/data/service/app.dart index b1c97813..09d72023 100644 --- a/lib/data/service/app.dart +++ b/lib/data/service/app.dart @@ -1,6 +1,7 @@ import 'package:dio/dio.dart'; -import 'package:toolbox/data/model/app/update.dart'; -import 'package:toolbox/data/res/url.dart'; + +import '../model/app/update.dart'; +import '../res/url.dart'; class AppService { Future getUpdate() async { diff --git a/pubspec.lock b/pubspec.lock index 39c50844..ed0ed72a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -238,10 +238,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8" + sha256: "0894a098594263fe1caaba3520e3016d8a855caeb010a882273189cca10f11e9" url: "https://pub.dev" source: hosted - version: "4.0.6" + version: "5.1.1" easy_isolate: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 1b659974..bb762147 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: provider: ^6.0.0 get_it: ^7.2.0 hive_flutter: ^1.1.0 - dio: ^4.0.0 + dio: ^5.1.1 after_layout: ^1.1.0 extended_image: ^6.0.3 url_launcher: ^6.1.8