From 474c2e7fad6872fdacfdf3c954aa11c338859d91 Mon Sep 17 00:00:00 2001 From: wcedla Date: Tue, 9 Apr 2024 13:08:57 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20"!107=20=E9=B8=BF=E8=92=99=E5=8C=96?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BE=9D=E8=B5=96=E6=96=B9=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5f7643916a6536b91891f71e1b5c9dd9442ef056. --- packages/camera/camera/pubspec.yaml | 4 +++- packages/camera/camera_ohos/example/pubspec.yaml | 8 ++++++-- .../file_selector/file_selector/pubspec.yaml | 4 +++- packages/image_picker/image_picker/pubspec.yaml | 4 +++- packages/local_auth/local_auth/pubspec.yaml | 4 +++- .../path_provider/path_provider/pubspec.yaml | 4 +++- .../shared_preferences/pubspec.yaml | 4 +++- packages/url_launcher/url_launcher/pubspec.yaml | 4 +++- packages/video_player/video_player/pubspec.yaml | 4 +++- .../webview_flutter/pubspec.yaml | 16 ++++++++++++---- .../webview_flutter_android/example/pubspec.yaml | 4 +++- .../webview_flutter_android/pubspec.yaml | 4 +++- .../webview_flutter_ohos/pubspec.yaml | 4 +++- .../example/pubspec.yaml | 4 +++- .../webview_flutter_wkwebview/pubspec.yaml | 4 +++- .../webview_flutter/webview_flutter/pubspec.yaml | 4 +++- .../webview_flutter_ohos/example/pubspec.yaml | 4 +++- 17 files changed, 63 insertions(+), 21 deletions(-) diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml index 9ec0804ed..ff2926a10 100644 --- a/packages/camera/camera/pubspec.yaml +++ b/packages/camera/camera/pubspec.yaml @@ -28,7 +28,9 @@ dependencies: camera_platform_interface: ^2.5.0 camera_web: ^0.3.1 camera_ohos: - path: "../camera_ohos" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/camera/camera_ohos" flutter: sdk: flutter flutter_plugin_android_lifecycle: ^2.0.2 diff --git a/packages/camera/camera_ohos/example/pubspec.yaml b/packages/camera/camera_ohos/example/pubspec.yaml index f5067089f..b3f790acc 100644 --- a/packages/camera/camera_ohos/example/pubspec.yaml +++ b/packages/camera/camera_ohos/example/pubspec.yaml @@ -31,10 +31,14 @@ dependencies: flutter: sdk: flutter path_provider: - path: "../../../path_provider/path_provider" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/path_provider/path_provider" quiver: ^3.0.0 video_player: - path: "../../../video_player/video_player" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/video_player/video_player" dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/file_selector/file_selector/pubspec.yaml b/packages/file_selector/file_selector/pubspec.yaml index b8f700665..9ff4492ef 100644 --- a/packages/file_selector/file_selector/pubspec.yaml +++ b/packages/file_selector/file_selector/pubspec.yaml @@ -36,7 +36,9 @@ dependencies: file_selector_web: ^0.9.1 file_selector_windows: ^0.9.3 file_selector_ohos: - path: "../file_selector_ohos" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/file_selector/file_selector_ohos" flutter: sdk: flutter diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml index 415d9c206..45b466784 100755 --- a/packages/image_picker/image_picker/pubspec.yaml +++ b/packages/image_picker/image_picker/pubspec.yaml @@ -38,7 +38,9 @@ dependencies: image_picker_platform_interface: ^2.8.0 image_picker_windows: ^0.2.1 image_picker_ohos: - path: ../image_picker_ohos + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/image_picker/image_picker_ohos" dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/local_auth/local_auth/pubspec.yaml b/packages/local_auth/local_auth/pubspec.yaml index cb791bdf6..94570e5e5 100644 --- a/packages/local_auth/local_auth/pubspec.yaml +++ b/packages/local_auth/local_auth/pubspec.yaml @@ -29,7 +29,9 @@ dependencies: local_auth_platform_interface: ^1.0.1 local_auth_windows: ^1.0.0 local_auth_ohos: - path: "../local_auth_ohos" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/local_auth/local_auth_ohos" dev_dependencies: flutter_driver: diff --git a/packages/path_provider/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml index 7491d2e0c..505074126 100644 --- a/packages/path_provider/path_provider/pubspec.yaml +++ b/packages/path_provider/path_provider/pubspec.yaml @@ -33,7 +33,9 @@ dependencies: path_provider_platform_interface: ^2.1.0 path_provider_windows: ^2.2.0 path_provider_ohos: - path: ../path_provider_ohos + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/path_provider/path_provider_ohos" dev_dependencies: diff --git a/packages/shared_preferences/shared_preferences/pubspec.yaml b/packages/shared_preferences/shared_preferences/pubspec.yaml index 7bcb066b8..f44f2e532 100644 --- a/packages/shared_preferences/shared_preferences/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences/pubspec.yaml @@ -37,7 +37,9 @@ dependencies: shared_preferences_web: ^2.1.0 shared_preferences_windows: ^2.2.0 shared_preferences_ohos: - path: "../shared_preferences_ohos" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/shared_preferences/shared_preferences_ohos" dev_dependencies: flutter_test: diff --git a/packages/url_launcher/url_launcher/pubspec.yaml b/packages/url_launcher/url_launcher/pubspec.yaml index f69b7419e..bb7718bed 100644 --- a/packages/url_launcher/url_launcher/pubspec.yaml +++ b/packages/url_launcher/url_launcher/pubspec.yaml @@ -40,7 +40,9 @@ dependencies: url_launcher_web: ^2.0.0 url_launcher_windows: ">=2.0.0 <4.0.0" url_launcher_ohos: - path: "../url_launcher_ohos" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/url_launcher/url_launcher_ohos" dev_dependencies: flutter_test: diff --git a/packages/video_player/video_player/pubspec.yaml b/packages/video_player/video_player/pubspec.yaml index 32f1d941b..6af1a5d94 100644 --- a/packages/video_player/video_player/pubspec.yaml +++ b/packages/video_player/video_player/pubspec.yaml @@ -30,7 +30,9 @@ dependencies: video_player_platform_interface: ">=6.1.0 <7.0.0" video_player_web: ^2.0.0 video_player_ohos: - path: "../video_player_ohos" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/video_player/video_player_ohos" dev_dependencies: flutter_test: diff --git a/packages/webview_flutter-v4.4.4/webview_flutter/pubspec.yaml b/packages/webview_flutter-v4.4.4/webview_flutter/pubspec.yaml index 2838a2d47..1d33a6053 100644 --- a/packages/webview_flutter-v4.4.4/webview_flutter/pubspec.yaml +++ b/packages/webview_flutter-v4.4.4/webview_flutter/pubspec.yaml @@ -35,13 +35,21 @@ dependencies: flutter: sdk: flutter webview_flutter_android: - path: "../webview_flutter_android" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/webview_flutter-v4.4.4/webview_flutter_android" webview_flutter_platform_interface: - path: "../webview_flutter_platform_interface" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/webview_flutter_platform_interface-v2.10.0/webview_flutter_platform_interface" webview_flutter_wkwebview: - path: "../webview_flutter_wkwebview" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/webview_flutter-v4.4.4/webview_flutter_wkwebview" webview_flutter_ohos: - path: "../webview_flutter_ohos" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/webview_flutter-v4.4.4/webview_flutter_ohos" dev_dependencies: build_runner: ^2.1.5 diff --git a/packages/webview_flutter-v4.4.4/webview_flutter_android/example/pubspec.yaml b/packages/webview_flutter-v4.4.4/webview_flutter_android/example/pubspec.yaml index bf90f056f..c864bc475 100644 --- a/packages/webview_flutter-v4.4.4/webview_flutter_android/example/pubspec.yaml +++ b/packages/webview_flutter-v4.4.4/webview_flutter_android/example/pubspec.yaml @@ -31,7 +31,9 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ webview_flutter_platform_interface: - path: "../../webview_flutter_platform_interface" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/webview_flutter_platform_interface-v2.10.0/webview_flutter_platform_interface" dev_dependencies: espresso: ^0.2.0 diff --git a/packages/webview_flutter-v4.4.4/webview_flutter_android/pubspec.yaml b/packages/webview_flutter-v4.4.4/webview_flutter_android/pubspec.yaml index 8854b33ec..ba13e409d 100644 --- a/packages/webview_flutter-v4.4.4/webview_flutter_android/pubspec.yaml +++ b/packages/webview_flutter-v4.4.4/webview_flutter_android/pubspec.yaml @@ -34,7 +34,9 @@ dependencies: flutter: sdk: flutter webview_flutter_platform_interface: - path: "../webview_flutter_platform_interface" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/webview_flutter_platform_interface-v2.10.0/webview_flutter_platform_interface" dev_dependencies: build_runner: ^2.1.4 diff --git a/packages/webview_flutter-v4.4.4/webview_flutter_ohos/pubspec.yaml b/packages/webview_flutter-v4.4.4/webview_flutter_ohos/pubspec.yaml index f79da14c8..c61697bce 100644 --- a/packages/webview_flutter-v4.4.4/webview_flutter_ohos/pubspec.yaml +++ b/packages/webview_flutter-v4.4.4/webview_flutter_ohos/pubspec.yaml @@ -34,7 +34,9 @@ dependencies: flutter: sdk: flutter webview_flutter_platform_interface: - path: "../webview_flutter_platform_interface" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/webview_flutter_platform_interface-v2.10.0/webview_flutter_platform_interface" dev_dependencies: build_runner: ^2.1.4 diff --git a/packages/webview_flutter-v4.4.4/webview_flutter_wkwebview/example/pubspec.yaml b/packages/webview_flutter-v4.4.4/webview_flutter_wkwebview/example/pubspec.yaml index b3c03cdb9..9d8497597 100644 --- a/packages/webview_flutter-v4.4.4/webview_flutter_wkwebview/example/pubspec.yaml +++ b/packages/webview_flutter-v4.4.4/webview_flutter_wkwebview/example/pubspec.yaml @@ -24,7 +24,9 @@ dependencies: sdk: flutter path_provider: ^2.0.6 webview_flutter_platform_interface: - path: "../../webview_flutter_platform_interface" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/webview_flutter_platform_interface-v2.10.0/webview_flutter_platform_interface" webview_flutter_wkwebview: # When depending on this package from a real application you should use: # webview_flutter: ^x.y.z diff --git a/packages/webview_flutter-v4.4.4/webview_flutter_wkwebview/pubspec.yaml b/packages/webview_flutter-v4.4.4/webview_flutter_wkwebview/pubspec.yaml index 3cf5bd3a3..a96a44a07 100644 --- a/packages/webview_flutter-v4.4.4/webview_flutter_wkwebview/pubspec.yaml +++ b/packages/webview_flutter-v4.4.4/webview_flutter_wkwebview/pubspec.yaml @@ -34,7 +34,9 @@ dependencies: sdk: flutter path: ^1.8.0 webview_flutter_platform_interface: - path: "../webview_flutter_platform_interface" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/webview_flutter_platform_interface-v2.10.0/webview_flutter_platform_interface" dev_dependencies: build_runner: ^2.1.5 diff --git a/packages/webview_flutter/webview_flutter/pubspec.yaml b/packages/webview_flutter/webview_flutter/pubspec.yaml index ab5ee695c..1d5cbc77d 100644 --- a/packages/webview_flutter/webview_flutter/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter/pubspec.yaml @@ -25,7 +25,9 @@ dependencies: webview_flutter_platform_interface: ^2.3.0 webview_flutter_wkwebview: ^3.0.0 webview_flutter_ohos: - path: "../webview_flutter_ohos" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/webview_flutter/webview_flutter_ohos" dev_dependencies: build_runner: ^2.1.5 diff --git a/packages/webview_flutter/webview_flutter_ohos/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_ohos/example/pubspec.yaml index 47be40cb7..a93ab6ba3 100644 --- a/packages/webview_flutter/webview_flutter_ohos/example/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter_ohos/example/pubspec.yaml @@ -23,7 +23,9 @@ dependencies: flutter: sdk: flutter path_provider: - ptah: "../../../path_provider/path_provider" + git: + url: "https://gitee.com/openharmony-sig/flutter_packages.git" + path: "packages/path_provider/path_provider" path_provider_platform_interface: ^2.0.0 webview_flutter_ohos: # When depending on this package from a real application you should use: -- Gitee