From d638d384580c2566a407423568d121cd6a02755f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=9D=E8=BF=AA?= Date: Tue, 10 Dec 2024 17:55:30 +0800 Subject: [PATCH 01/42] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈宝迪 --- .../test/commands.shard/permeable/build_har_test.dart | 2 +- .../test/commands.shard/permeable/build_hsp_test.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart index 02fb23c83c..faa443cc54 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart @@ -170,7 +170,7 @@ void main() { projectPath, arguments: [ '--target-platform', - 'ohos-x86', + 'ohos-x64', '--tree-shake-icons', '--flavor', 'free', diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart index cbb9e4b0c2..047e42d7ae 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart @@ -169,7 +169,7 @@ void main() { projectPath, arguments: [ '--target-platform', - 'ohos-x86', + 'ohos-x64', '--tree-shake-icons', '--flavor', 'free', -- Gitee From 091b034031caac194e3fc7fc9eba246e7e850bc6 Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Wed, 11 Dec 2024 15:19:40 +0800 Subject: [PATCH 02/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- .../flutter_tools/lib/src/build_system/targets/ohos.dart | 4 ++++ packages/flutter_tools/lib/src/ohos/application_package.dart | 4 ++++ packages/flutter_tools/lib/src/ohos/ohos_builder.dart | 4 ++++ packages/flutter_tools/lib/src/ohos/ohos_device.dart | 4 ++++ .../flutter_tools/lib/src/ohos/ohos_device_discovery.dart | 4 ++++ packages/flutter_tools/lib/src/ohos/ohos_doctor.dart | 4 ++++ packages/flutter_tools/lib/src/ohos/ohos_sdk.dart | 4 ++++ packages/flutter_tools/lib/src/ohos/ohos_workflow.dart | 4 ++++ .../src/main/ets/components/plugin/pluginClass.ets.tmpl | 5 +++++ .../test/general.shard/build_system/targets/ohos_test.dart | 4 ++++ .../test/general.shard/ohos/ohos_device_discovery_test.dart | 4 ++++ .../flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart | 4 ++++ .../test/general.shard/ohos/ohos_workflow_test.dart | 4 ++++ packages/flutter_tools/test/src/ohos_common.dart | 4 ++++ .../components/integration_test/FlutterDeviceScreenshot.ets | 4 ++++ .../components/integration_test/IntegrationTestPlugin.ets | 4 ++++ 16 files changed, 65 insertions(+) diff --git a/packages/flutter_tools/lib/src/build_system/targets/ohos.dart b/packages/flutter_tools/lib/src/build_system/targets/ohos.dart index ae8a9bd47d..e109143f14 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/ohos.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/ohos.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. +* +* Based on android.dart originally written by +* Copyright (C) 2019 Jonah Williams +* */ import 'package:file/file.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/application_package.dart b/packages/flutter_tools/lib/src/ohos/application_package.dart index c2e2ab987a..d7cb05c32f 100644 --- a/packages/flutter_tools/lib/src/ohos/application_package.dart +++ b/packages/flutter_tools/lib/src/ohos/application_package.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. +* +* Based on application_package.dart originally written by +* Copyright (C) 2015 Ian Fischer +* */ import 'package:json5/json5.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_builder.dart b/packages/flutter_tools/lib/src/ohos/ohos_builder.dart index 0e36e5036d..ca4ce7a8ab 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_builder.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_builder.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. +* +* Based on android_builder.dart originally written by +* Copyright (C) 2019 Emmanuel Garcia +* */ import '../base/context.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_device.dart b/packages/flutter_tools/lib/src/ohos/ohos_device.dart index 14c90a39d2..0a2fddae37 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_device.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_device.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. +* +* Based on android_device.dart originally written by +* Copyright (C) 2016 Devon Carew +* */ import 'dart:async'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart b/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart index a410af1f48..b6418ddcec 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. +* +* Based on android_device_discovery.dart originally written by +* Copyright (C) 2020 Jonah Williams +* */ import 'package:process/process.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart b/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart index 05e9dabed7..082c50fda1 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. +* +* Based on linux_doctor.dart originally written by +* Copyright (C) 2019 Jonah Williams +* */ import 'package:process/process.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart b/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart index 0b737851bb..fcc9fe62f8 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. +* +* Based on android_sdk.dart originally written by +* Copyright (C) 2016 Devon Carew +* */ import 'dart:collection'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart b/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart index f372aff993..b1603382d0 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. +* +* Based on android_workflow.dart originally written by +* Copyright (C) 2016 Devon Carew +* */ import '../base/context.dart'; diff --git a/packages/flutter_tools/templates/plugin/ohos.tmpl/src/main/ets/components/plugin/pluginClass.ets.tmpl b/packages/flutter_tools/templates/plugin/ohos.tmpl/src/main/ets/components/plugin/pluginClass.ets.tmpl index cc521f51b2..990595412d 100644 --- a/packages/flutter_tools/templates/plugin/ohos.tmpl/src/main/ets/components/plugin/pluginClass.ets.tmpl +++ b/packages/flutter_tools/templates/plugin/ohos.tmpl/src/main/ets/components/plugin/pluginClass.ets.tmpl @@ -1,3 +1,8 @@ +/* +* Based on pluginClass.java.tmpl originally written by +* Copyright (C) 2017 Jakob Andersen +*/ + import { FlutterPlugin, FlutterPluginBinding, diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart index 356890262c..b5673ebb2b 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Based on android_test.dart originally written by + * Copyright (C) 2019 Jonah Williams + * */ import 'package:file/memory.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart index bbf9f4ca13..7a94ebb12d 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Based on android_device_discovery_test.dart originally written by + * Copyright (C) 2020 Jonah Williams + * */ import 'package:file/memory.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart index 1485d76f9d..0036c2753a 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Based on android_sdk_test.dart originally written by + * Copyright (C) 2016 Devon Carew + * */ import 'package:file/memory.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart index e0cff7ef0a..b93a2bc35f 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Based on android_sdk_test.dart originally written by + * Copyright (C) 2016 Devon Carew + * */ import 'package:flutter_tools/src/ohos/ohos_sdk.dart'; diff --git a/packages/flutter_tools/test/src/ohos_common.dart b/packages/flutter_tools/test/src/ohos_common.dart index a71e20f66e..fd3714afe4 100644 --- a/packages/flutter_tools/test/src/ohos_common.dart +++ b/packages/flutter_tools/test/src/ohos_common.dart @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Based on android_common.dart originally written by + * Copyright (C) 2019 Emmanuel Garcia + * */ import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets b/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets index ea9629b059..21ce29d779 100644 --- a/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets +++ b/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Based on FlutterDeviceScreenshot.java originally written by + * Copyright (C) 2021 Emmanuel Garcia + * */ import { MethodChannel, diff --git a/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets b/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets index 1b9bf02b13..91d5100266 100644 --- a/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets +++ b/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets @@ -11,6 +11,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Based on IntegrationTestPlugin.java originally written by + * Copyright (C) 2020 Dan Field + * */ import { -- Gitee From 11469624235c59b3db50e2bdff5a8217bf015c89 Mon Sep 17 00:00:00 2001 From: huangxiaoyao <976125628@qq.com> Date: Wed, 11 Dec 2024 20:42:57 +0800 Subject: [PATCH 03/42] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=EF=BC=9AHarmonyOS=E6=9B=BF=E6=8D=A2=E6=88=90OpenHarmony?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huangxiaoyao <976125628@qq.com> --- README.en.md | 4 ++-- README.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.en.md b/README.en.md index ef5a60e50a..822718be49 100644 --- a/README.en.md +++ b/README.en.md @@ -20,10 +20,10 @@ This repository is an extension of the Flutter SDK for compatibility with OpenHa For Windows, the Flutter project and the dependent plugin project must be in the same disk. * Environment configuration - **Download the supporting development kits from [HarmonyOS SDK](https://developer.huawei.com/consumer/en/develop).** + **Download the supporting development kits from [OpenHarmony SDK](https://developer.huawei.com/consumer/en/develop).** *For Unix-like systems (Linux and macOS), you can refer to the environment variable configuration below. For Windows, set environment variables by following the instructions provided in "Edit System Environment Variables."* - 1. Configure the HarmonyOS SDK and the environment variables. + 1. Configure the OpenHarmony SDK and the environment variables. * API 12, DevEco Studio 5.0, or command-line-tools-5.0. * Download JDK 17 and configure environment variables. diff --git a/README.md b/README.md index 6be5cea9ff..08d68bf170 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Flutter SDK 仓库 **请从[鸿蒙SDK](https://developer.huawei.com/consumer/cn/develop)下载配套开发工具** *下列环境变量配置，类Unix系统（Linux、Mac），下可直接参照配置，Windows下环境变量配置请在‘编辑系统环境变量’中设置* - 1. 配置HarmonyOS SDK和环境变量 + 1. 配置OpenHarmony SDK和环境变量 * API12, deveco-studio-5.0 或 command-line-tools-5.0 * 下载jdk17并配置环境变量 @@ -149,9 +149,9 @@ Flutter SDK 仓库 | clean | 清除项目依赖 | flutter clean | | cache | 清除全局缓存数据 | flutter pub cache clean | -附：[Flutter高频使用的三方库（部分鸿蒙化）列表](https://gitee.com/openharmony-sig/flutter_packages#openharmony%E5%B9%B3%E5%8F%B0%E5%B7%B2%E5%85%BC%E5%AE%B9%E5%BA%93) - - +附： +[Flutter高频使用的三方库（部分鸿蒙化）列表](https://gitee.com/openharmony-sig/flutter_packages#openharmony%E5%B9%B3%E5%8F%B0%E5%B7%B2%E5%85%BC%E5%AE%B9%E5%BA%93) +[OpenHarmony设备运行指导](https://gitee.com/openharmony-sig/flutter_samples/blob/cc8b4ee806908b13ec1b0cf3c333a19244823e41/ohos/docs/03_environment/OpenHarmony%E8%AE%BE%E5%A4%87%E8%BF%90%E8%A1%8C%E6%8C%87%E5%AF%BC.md) ## 常见问题 1. 模拟器调试只支持Mac(arm64)，还不支持Mac(x86) 和 Windows。 -- Gitee From a5c76751e28163cac9224fb949402f3387f52573 Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Tue, 17 Dec 2024 06:30:41 +0000 Subject: [PATCH 04/42] =?UTF-8?q?update=20OAT.xml.=20=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=B3=95=E5=8A=A1=E8=A6=81=E6=B1=82=E6=B7=BB=E5=8A=A0base=20on?= =?UTF-8?q?=20=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=94=B1=E4=BA=8Ebase=20on?= =?UTF-8?q?=E6=B6=89=E5=8F=8A=E5=8E=9F=E4=BD=9C=E8=80=85=E7=9A=84=E7=89=88?= =?UTF-8?q?=E6=9D=83=E4=BF=A1=E6=81=AF=E5=AF=BC=E8=87=B4=E7=89=88=E6=9D=83?= =?UTF-8?q?=E5=A4=B4=E6=A0=A1=E9=AA=8C=E4=B8=8D=E9=80=9A=E8=BF=87=EF=BC=8C?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=B5=81=E6=B0=B4=E7=BA=BF=E5=90=8C=E4=BA=8B?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=B0=86=E5=8E=9F=E4=BD=9C=E8=80=85=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B9=9F=E6=B7=BB=E5=8A=A0=E5=88=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenzhensheng79 <15118029047@139.com> --- OAT.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OAT.xml b/OAT.xml index ff270e602a..7caeff057d 100644 --- a/OAT.xml +++ b/OAT.xml @@ -56,7 +56,7 @@ desc="Developed By OpenValley Digital Co., Ltd." filefilter="copyrightPolicyFilter" group="defaultGroup" - name="Hunan OpenValley Digital Industry Development Co., Ltd." + name="Hunan OpenValley Digital Industry Development Co., Ltd.|Dan Field |Devon Carew |Devon Carew |Emmanuel Garcia |Ian Fischer |Jakob Andersen |Jonah Williams " path=".*" rule="may" type="copyright"/> -- Gitee From 4105292dfc1e66150d2df54a94d56a203402d1f7 Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Tue, 17 Dec 2024 18:49:46 +0800 Subject: [PATCH 05/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- .../entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl index 0f7f6669df..3e96b264ed 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -10,7 +10,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and -* limitations under the License. +* limitations under the License.test */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; -- Gitee From b4161a2ddbcf5d5abd608e6ded7725e71f64ca6d Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Tue, 17 Dec 2024 11:06:02 +0000 Subject: [PATCH 06/42] =?UTF-8?q?update=20OAT.xml.=20=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=B3=95=E5=8A=A1=E8=A6=81=E6=B1=82=E6=B7=BB=E5=8A=A0base=20on?= =?UTF-8?q?=20=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=94=B1=E4=BA=8Ebase=20on?= =?UTF-8?q?=E6=B6=89=E5=8F=8A=E5=8E=9F=E4=BD=9C=E8=80=85=E7=9A=84=E7=89=88?= =?UTF-8?q?=E6=9D=83=E4=BF=A1=E6=81=AF=E5=AF=BC=E8=87=B4=E7=89=88=E6=9D=83?= =?UTF-8?q?=E5=A4=B4=E6=A0=A1=E9=AA=8C=E4=B8=8D=E9=80=9A=E8=BF=87=EF=BC=8C?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=B5=81=E6=B0=B4=E7=BA=BF=E5=90=8C=E4=BA=8B?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=B0=86=E5=8E=9F=E4=BD=9C=E8=80=85=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B9=9F=E6=B7=BB=E5=8A=A0=E5=88=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenzhensheng79 <15118029047@139.com> --- OAT.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/OAT.xml b/OAT.xml index 7caeff057d..53cd3f5183 100644 --- a/OAT.xml +++ b/OAT.xml @@ -56,10 +56,66 @@ desc="Developed By OpenValley Digital Co., Ltd." filefilter="copyrightPolicyFilter" group="defaultGroup" - name="Hunan OpenValley Digital Industry Development Co., Ltd.|Dan Field |Devon Carew |Devon Carew |Emmanuel Garcia |Ian Fischer |Jakob Andersen |Jonah Williams " + name="Hunan OpenValley Digital Industry Development Co., Ltd." path=".*" rule="may" type="copyright"/> + + + + + + + -- Gitee From ed8a52c53f701faba669c9f67ba1e92b84b57f9c Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Wed, 18 Dec 2024 15:05:35 +0800 Subject: [PATCH 07/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart | 2 +- .../entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart b/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart index b6418ddcec..0bc053a8d7 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart @@ -13,7 +13,7 @@ * limitations under the License. * * Based on android_device_discovery.dart originally written by -* Copyright (C) 2020 Jonah Williams +* © 2020 Jonah Williams * */ diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl index 3e96b264ed..d00cadbab1 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -10,7 +10,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and -* limitations under the License.test +* limitations under the License */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; -- Gitee From 19131721e7a16e9dccf17c9928e3ea59ac50d61d Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Thu, 19 Dec 2024 17:07:54 +0800 Subject: [PATCH 08/42] Update engine.ohos.version to 5b356048 Signed-off-by: hezhengyi --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index f08b3e435e..2425c69904 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -e10bd6ac40602bd7b2410561b71c035a5cf7c931 +5b356048a450cdd5bc436492ed9e93fa921b96b4 -- Gitee From 7449c396289db9123da27ede2996c034bd935085 Mon Sep 17 00:00:00 2001 From: anchi Date: Thu, 26 Dec 2024 11:23:29 +0800 Subject: [PATCH 09/42] =?UTF-8?q?=E6=8F=92=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: anchi --- packages/flutter/lib/src/scheduler/binding.dart | 7 +++++++ packages/flutter/lib/src/services/system_channels.dart | 5 +++++ packages/flutter/lib/src/widgets/scroll_position.dart | 1 + packages/flutter/lib/src/widgets/scrollable.dart | 2 ++ 4 files changed, 15 insertions(+) diff --git a/packages/flutter/lib/src/scheduler/binding.dart b/packages/flutter/lib/src/scheduler/binding.dart index 8820c7cf04..919da31e78 100644 --- a/packages/flutter/lib/src/scheduler/binding.dart +++ b/packages/flutter/lib/src/scheduler/binding.dart @@ -9,6 +9,7 @@ import 'dart:ui' show AppLifecycleState, DartPerformanceMode, FramePhase, FrameT import 'package:collection/collection.dart' show HeapPriorityQueue, PriorityQueue; import 'package:flutter/foundation.dart'; +import 'package:flutter/services.dart'; import 'debug.dart'; import 'priority.dart'; @@ -1310,6 +1311,12 @@ mixin SchedulerBinding on BindingBase { return true; }()); } + + void setDVsyncSwitch(bool isEnable) { + if (defaultTargetPlatform == TargetPlatform.ohos) { + SystemChannels.nativeVsync.send({"isEnable": isEnable}); + } + } } /// The default [SchedulingStrategy] for [SchedulerBinding.schedulingStrategy]. diff --git a/packages/flutter/lib/src/services/system_channels.dart b/packages/flutter/lib/src/services/system_channels.dart index c69c7e5e77..13531d3fb1 100644 --- a/packages/flutter/lib/src/services/system_channels.dart +++ b/packages/flutter/lib/src/services/system_channels.dart @@ -465,4 +465,9 @@ class SystemChannels { /// /// * [DefaultPlatformMenuDelegate], which uses this channel. static const MethodChannel menu = OptionalMethodChannel('flutter/menu'); + + static const BasicMessageChannel nativeVsync = BasicMessageChannel( + 'flutter/nativevsync', + StandardMessageCodec(), + ); } diff --git a/packages/flutter/lib/src/widgets/scroll_position.dart b/packages/flutter/lib/src/widgets/scroll_position.dart index db363517c3..e9f8de32d2 100644 --- a/packages/flutter/lib/src/widgets/scroll_position.dart +++ b/packages/flutter/lib/src/widgets/scroll_position.dart @@ -916,6 +916,7 @@ abstract class ScrollPosition extends ViewportOffset with ScrollMetrics { /// /// This also saves the scroll offset using [saveScrollOffset]. void didEndScroll() { + SchedulerBinding.instance.setDVsyncSwitch(false); activity!.dispatchScrollEndNotification(copyWith(), context.notificationContext!); saveOffset(); if (keepScrollOffset) { diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart index 158228c23a..1415fc363e 100644 --- a/packages/flutter/lib/src/widgets/scrollable.dart +++ b/packages/flutter/lib/src/widgets/scrollable.dart @@ -709,6 +709,7 @@ class ScrollableState extends State with TickerProviderStateMixin, R // triggers a new activity to begin. assert(_drag == null); _drag = position.drag(details, _disposeDrag); + SchedulerBinding.instance.setDVsyncSwitch(false); assert(_drag != null); assert(_hold == null); } @@ -723,6 +724,7 @@ class ScrollableState extends State with TickerProviderStateMixin, R // _drag might be null if the drag activity ended and called _disposeDrag. assert(_hold == null || _drag == null); _drag?.end(details); + SchedulerBinding.instance.setDVsyncSwitch(true); assert(_drag == null); } -- Gitee From 5887f15067a8f55aab81669ce7c1e855fa0c2ca3 Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Thu, 26 Dec 2024 14:49:05 +0800 Subject: [PATCH 10/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- OAT.xml | 36 +++++++++++-------- .../lib/src/ohos/ohos_device_discovery.dart | 2 +- .../ets/entryability/EntryAbility.ets.tmpl | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/OAT.xml b/OAT.xml index 53cd3f5183..2e714c817b 100644 --- a/OAT.xml +++ b/OAT.xml @@ -52,6 +52,14 @@ + diff --git a/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart b/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart index 0bc053a8d7..b6418ddcec 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart @@ -13,7 +13,7 @@ * limitations under the License. * * Based on android_device_discovery.dart originally written by -* © 2020 Jonah Williams +* Copyright (C) 2020 Jonah Williams * */ diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl index d00cadbab1..0f7f6669df 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -10,7 +10,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and -* limitations under the License +* limitations under the License. */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; -- Gitee From f5b7bc06d1e0dd6d66c316896cd5cb21c470e9f5 Mon Sep 17 00:00:00 2001 From: liujiake Date: Thu, 26 Dec 2024 14:53:52 +0800 Subject: [PATCH 11/42] Update engine.ohos.version to 804c70a2 Signed-off-by: liujiake --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index 2425c69904..bc98d0949e 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -5b356048a450cdd5bc436492ed9e93fa921b96b4 +804c70a21f2a284868eb88f4bb7f22bc280a39cb -- Gitee From ddb258d614719ffa3fc956b0cf76b7cd4fa11571 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Tue, 24 Dec 2024 19:44:09 +0800 Subject: [PATCH 12/42] =?UTF-8?q?=E5=88=A0=E9=99=A4libapp.so=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=80=83=E8=99=91arm64=E5=92=8Cx64=E7=9A=84=E5=8C=BA?= =?UTF-8?q?=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- packages/flutter_tools/lib/src/ohos/hvigor.dart | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index bd03033053..cfb7d64e2e 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -390,9 +390,13 @@ void cleanAndCopyFlutterAsset( ensureParentExists(desAppSoPath); appSoFile.copySync(desAppSoPath); } else { - final File appSo = globals.fs.file(desAppSoPath); - if (appSo.existsSync()) { - appSo.deleteSync(); + // delete libapp.so + final String dir = globals.fs.path.join(ohosProject.flutterModuleDirectory.path, 'libs'); + final List files = globals.fs.directory(dir).listSync(recursive: true); + for (final FileSystemEntity item in files) { + if (item.basename == APP_SO && item.existsSync()) { + item.deleteSync(); + } } } logger?.printTrace('copy flutter assets to project end'); -- Gitee From 10ad319c56c6d1ad0043d150d215b2628588febf Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Fri, 29 Nov 2024 15:05:49 +0800 Subject: [PATCH 13/42] =?UTF-8?q?=E6=9B=B4=E6=96=B0x64=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E4=BA=91=E7=AB=AF=E4=BA=A7=E7=89=A9=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- packages/flutter_tools/lib/src/flutter_cache.dart | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart index 7822ffbe9b..e71d805901 100644 --- a/packages/flutter_tools/lib/src/flutter_cache.dart +++ b/packages/flutter_tools/lib/src/flutter_cache.dart @@ -1021,25 +1021,31 @@ const List> _androidBinaryDirs = >[ const List> _osxBinaryDirsForOhos = >[ ['ohos-arm64-profile/darwin-x64', 'ohos-arm64-profile/darwin-x64.zip'], ['ohos-arm64-release/darwin-x64', 'ohos-arm64-release/darwin-x64.zip'], + ['ohos-x64-profile/darwin-x64', 'ohos-x64-profile/darwin-x64.zip'], + ['ohos-x64-release/darwin-x64', 'ohos-x64-release/darwin-x64.zip'], ]; const List> _linuxBinaryDirsForOhos = >[ ['ohos-arm64-profile/linux-x64', 'ohos-arm64-profile/linux-x64.zip'], ['ohos-arm64-release/linux-x64', 'ohos-arm64-release/linux-x64.zip'], + ['ohos-x64-profile/linux-x64', 'ohos-x64-profile/linux-x64.zip'], + ['ohos-x64-release/linux-x64', 'ohos-x64-release/linux-x64.zip'], ]; const List> _windowsBinaryDirsForOhos = >[ ['ohos-arm64-profile/windows-x64', 'ohos-arm64-profile/windows-x64.zip'], ['ohos-arm64-release/windows-x64', 'ohos-arm64-release/windows-x64.zip'], + ['ohos-x64-profile/windows-x64', 'ohos-x64-profile/windows-x64.zip'], + ['ohos-x64-release/windows-x64', 'ohos-x64-release/windows-x64.zip'], ]; const List> _ohosBinaryDirs = >[ ['ohos-arm64', 'ohos-arm64/artifacts.zip'], ['ohos-arm64-profile', 'ohos-arm64-profile/artifacts.zip'], ['ohos-arm64-release', 'ohos-arm64-release/artifacts.zip'], - // ['ohos-x64', 'ohos-x64/artifacts.zip'], - // ['ohos-x64-profile', 'ohos-x64-profile/artifacts.zip'], - // ['ohos-x64-release', 'ohos-x64-release/artifacts.zip'], + ['ohos-x64', 'ohos-x64/artifacts.zip'], + ['ohos-x64-profile', 'ohos-x64-profile/artifacts.zip'], + ['ohos-x64-release', 'ohos-x64-release/artifacts.zip'], ]; const List> _dartSdks = > [ -- Gitee From 0632a7ad812cd82937d52f5d9ab33a8d226a891b Mon Sep 17 00:00:00 2001 From: songzh Date: Mon, 23 Sep 2024 19:39:19 +0800 Subject: [PATCH 14/42] download dart-sdk from cloud. cherry-pick from 3.22: ab6f9b79949e19bc3540b25b644f33bef6e4e264 Signed-off-by: hezhengyi --- bin/internal/update_dart_sdk.ps1 | 35 +++++++++++++++---- bin/internal/update_dart_sdk.sh | 9 +++-- packages/flutter_tools/lib/src/artifacts.dart | 3 ++ packages/flutter_tools/lib/src/cache.dart | 21 ++++++++--- 4 files changed, 55 insertions(+), 13 deletions(-) diff --git a/bin/internal/update_dart_sdk.ps1 b/bin/internal/update_dart_sdk.ps1 index f4e2e77a55..512f814479 100644 --- a/bin/internal/update_dart_sdk.ps1 +++ b/bin/internal/update_dart_sdk.ps1 @@ -19,7 +19,10 @@ $flutterRoot = (Get-Item $progName).parent.parent.FullName $cachePath = "$flutterRoot\bin\cache" $dartSdkPath = "$cachePath\dart-sdk" $engineStamp = "$cachePath\engine-dart-sdk.stamp" -$engineVersion = (Get-Content "$flutterRoot\bin\internal\engine.version") +$engineVersionFile = "engine.ohos.version" + +$engineVersion = (Get-Content "$flutterRoot\bin\internal\$engineVersionFile") +$engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm") $oldDartSdkPrefix = "dart-sdk.old" @@ -38,14 +41,34 @@ if ((Test-Path $engineStamp) -and ($engineVersion -eq (Get-Content $engineStamp) return } -$dartSdkBaseUrl = $Env:FLUTTER_STORAGE_BASE_URL +$dartSdkBaseUrl = $Env:FLUTTER_OHOS_STORAGE_BASE_URL if (-not $dartSdkBaseUrl) { - $dartSdkBaseUrl = "https://storage.googleapis.com" + $dartSdkBaseUrl = "https://flutter-ohos.obs.cn-south-1.myhuaweicloud.com" +} +if ($engineRealm) { + $dartSdkBaseUrl = "$dartSdkBaseUrl/$engineRealm" +} +if($Env:FLUTTER_OHOS_STORAGE_BASE_URL) { + $dartSdkBaseUrl = $Env:FLUTTER_OHOS_STORAGE_BASE_URL +} +# It's important to use the native Dart SDK as the default target architecture +# for Flutter Windows builds depend on the Dart executable's architecture. +$dartZipNameX64 = "dart-sdk-windows-x64.zip" +$dartZipNameArm64 = "dart-sdk-windows-arm64.zip" +$dartZipName = $dartZipNameX64 +if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { + $dartSdkArm64Url = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipNameArm64" + Try { + Invoke-WebRequest -Uri $dartSdkArm64Url -UseBasicParsing -Method Head | Out-Null + $dartZipName = $dartZipNameArm64 + } + Catch { + Write-Host "The current channel's Dart SDK does not support Windows Arm64, falling back to Windows x64..." + } } -$dartZipName = "dart-sdk-windows-x64.zip" $dartSdkUrl = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipName" - -if (Test-Path $dartSdkPath) { +Write-Host "dart-sdk-url: $dartSdkUrl" +if ((Test-Path $dartSdkPath) -or (Test-Path $dartSdkLicense)) { # Move old SDK to a new location instead of deleting it in case it is still in use (e.g. by IntelliJ). $oldDartSdkSuffix = 1 while (Test-Path "$cachePath\$oldDartSdkPrefix$oldDartSdkSuffix") { $oldDartSdkSuffix++ } diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 49e4698a82..4ed2e2a3fc 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -16,10 +16,14 @@ set -e FLUTTER_ROOT="$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")" +ENGINE_VERSION_FILE="engine.ohos.version" +FLUTTER_OHOS_STORAGE_BASE_URL=${FLUTTER_OHOS_STORAGE_BASE_URL:-https://flutter-ohos.obs.cn-south-1.myhuaweicloud.com} + DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk" DART_SDK_PATH_OLD="$DART_SDK_PATH.old" ENGINE_STAMP="$FLUTTER_ROOT/bin/cache/engine-dart-sdk.stamp" -ENGINE_VERSION=`cat "$FLUTTER_ROOT/bin/internal/engine.version"` +ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/$ENGINE_VERSION_FILE") +ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]') OS="$(uname -s)" if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; then @@ -121,9 +125,10 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t FIND=find fi - DART_SDK_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-https://storage.googleapis.com}" + DART_SDK_BASE_URL="${FLUTTER_OHOS_STORAGE_BASE_URL}${ENGINE_REALM:+/$ENGINE_REALM}" DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra_release/flutter/$ENGINE_VERSION/$DART_ZIP_NAME" + echo 'dart-sdk-url:' $DART_SDK_URL # if the sdk path exists, copy it to a temporary location if [ -d "$DART_SDK_PATH" ]; then rm -rf "$DART_SDK_PATH_OLD" diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart index c99e24cd5f..78e827ae3f 100644 --- a/packages/flutter_tools/lib/src/artifacts.dart +++ b/packages/flutter_tools/lib/src/artifacts.dart @@ -646,6 +646,9 @@ class CachedArtifacts implements Artifacts { assert(platform != null); switch (artifact) { case Artifact.genSnapshot: + if (platform == TargetPlatform.ohos_arm64) { + return _getAndroidArtifactPath(artifact, TargetPlatform.ohos_arm64, mode!); + } // For script snapshots any gen_snapshot binary will do. Returning gen_snapshot for // android_arm in profile mode because it is available on all supported host platforms. return _getAndroidArtifactPath(artifact, TargetPlatform.android_arm, BuildMode.profile); diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index 0102b3ea08..7f5e804a34 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -22,6 +22,7 @@ import 'base/user_messages.dart'; import 'build_info.dart'; import 'convert.dart'; import 'features.dart'; +import 'globals.dart'; const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo) const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo) @@ -893,6 +894,7 @@ abstract class EngineCachedArtifact extends CachedArtifact { List getPackageDirs(); String get storageBaseUrl => cache.storageBaseUrl; + String get ohosStorageBaseUrl => cache.ohosStorageBaseUrl; @override bool isUpToDateInner(FileSystem fileSystem) { @@ -927,21 +929,30 @@ abstract class EngineCachedArtifact extends CachedArtifact { OperatingSystemUtils operatingSystemUtils, ) async { final String url = '$storageBaseUrl/flutter_infra_release/flutter/$version/'; - + final String ohosEngineVersion = cache.getVersionFor('engine.ohos')!; + // New platform Ohos is supported, so flutter needs to download + // sky_engine.zip, flutter_patched_sdk.zip and flutter_patched_sdk_product.zip from ohos URL + final String ohosUrl = '$ohosStorageBaseUrl/flutter_infra_release/flutter/$ohosEngineVersion/'; final Directory pkgDir = cache.getCacheDir('pkg'); for (final String pkgName in getPackageDirs()) { - await artifactUpdater.downloadZipArchive('Downloading package $pkgName...', Uri.parse('$url$pkgName.zip'), pkgDir); + if (pkgName == 'sky_engine') { + await artifactUpdater.downloadZipArchive('Downloading package $pkgName...', Uri.parse('$ohosUrl$pkgName.zip'), pkgDir); + } else { + await artifactUpdater.downloadZipArchive('Downloading package $pkgName...', Uri.parse('$url$pkgName.zip'), pkgDir); + } } for (final List toolsDir in getBinaryDirs()) { final String cacheDir = toolsDir[0]; final String urlPath = toolsDir[1]; final Directory dir = fileSystem.directory(fileSystem.path.join(location.path, cacheDir)); - // Avoid printing things like 'Downloading linux-x64 tools...' multiple times. final String friendlyName = urlPath.replaceAll('/artifacts.zip', '').replaceAll('.zip', ''); - await artifactUpdater.downloadZipArchive('Downloading $friendlyName tools...', Uri.parse(url + urlPath), dir); - + if (urlPath.startsWith('flutter_patched_sdk')) { + await artifactUpdater.downloadZipArchive('Downloading $friendlyName tools...', Uri.parse(ohosUrl + urlPath), dir); + } else { + await artifactUpdater.downloadZipArchive('Downloading $friendlyName tools...', Uri.parse(url + urlPath), dir); + } _makeFilesExecutable(dir, operatingSystemUtils); final File frameworkZip = fileSystem.file(fileSystem.path.join(dir.path, 'FlutterMacOS.framework.zip')); -- Gitee From 5ca5d11652cfbbb406a765ab9120512808cb7aab Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Thu, 26 Dec 2024 19:35:00 +0800 Subject: [PATCH 15/42] Update engine.ohos.vertion to d2180af3 Signed-off-by: hezhengyi --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index bc98d0949e..0fb8b47c59 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -804c70a21f2a284868eb88f4bb7f22bc280a39cb +d2180af3058b7c48a6ddcf8ab7eee51a5382d556 -- Gitee From 05cc515a7763a17a01aa4093b8a8980d66ecd477 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Thu, 26 Dec 2024 19:58:25 +0800 Subject: [PATCH 16/42] add engine.realm Signed-off-by: hezhengyi --- bin/internal/engine.realm | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 bin/internal/engine.realm diff --git a/bin/internal/engine.realm b/bin/internal/engine.realm new file mode 100644 index 0000000000..e69de29bb2 -- Gitee From 24149aa7c77849599041752f57e696467c406573 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Thu, 26 Dec 2024 20:07:19 +0800 Subject: [PATCH 17/42] =?UTF-8?q?=E5=88=A0=E9=99=A43.7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=E6=B2=A1=E6=9C=89=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- bin/internal/update_dart_sdk.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/update_dart_sdk.ps1 b/bin/internal/update_dart_sdk.ps1 index 512f814479..b5c8d5940e 100644 --- a/bin/internal/update_dart_sdk.ps1 +++ b/bin/internal/update_dart_sdk.ps1 @@ -68,7 +68,7 @@ if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { } $dartSdkUrl = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipName" Write-Host "dart-sdk-url: $dartSdkUrl" -if ((Test-Path $dartSdkPath) -or (Test-Path $dartSdkLicense)) { +if (Test-Path $dartSdkPath) { # Move old SDK to a new location instead of deleting it in case it is still in use (e.g. by IntelliJ). $oldDartSdkSuffix = 1 while (Test-Path "$cachePath\$oldDartSdkPrefix$oldDartSdkSuffix") { $oldDartSdkSuffix++ } -- Gitee From 2836d0a6c6776e9025bc9421134bacde56bb9345 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Sat, 28 Dec 2024 12:06:52 +0800 Subject: [PATCH 18/42] =?UTF-8?q?=E5=88=A4=E6=96=ADlibs=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=90=8E=E5=86=8D=E6=89=A7=E8=A1=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4libapp.so=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- packages/flutter_tools/lib/src/ohos/hvigor.dart | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index cfb7d64e2e..99e0560836 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -392,10 +392,13 @@ void cleanAndCopyFlutterAsset( } else { // delete libapp.so final String dir = globals.fs.path.join(ohosProject.flutterModuleDirectory.path, 'libs'); - final List files = globals.fs.directory(dir).listSync(recursive: true); - for (final FileSystemEntity item in files) { - if (item.basename == APP_SO && item.existsSync()) { - item.deleteSync(); + if (globals.fs.directory(dir).existsSync()) { + final List files = globals.fs.directory(dir) + .listSync(recursive: true); + for (final FileSystemEntity item in files) { + if (item.basename == APP_SO && item.existsSync()) { + item.deleteSync(); + } } } } -- Gitee From 35300e2062fa2ae513d0944d7ffd6275e5f2ab3e Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Sat, 28 Dec 2024 12:07:38 +0800 Subject: [PATCH 19/42] Update engine.ohos.version to 22e6beb9 Signed-off-by: hezhengyi --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index 0fb8b47c59..ed63886244 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -d2180af3058b7c48a6ddcf8ab7eee51a5382d556 +22e6beb953c7b5b1446d5a00eeba78c5d996c5c2 -- Gitee From b2395f0f1b5469a12b41df65ddc3ea3eee426558 Mon Sep 17 00:00:00 2001 From: huangxiaoyao <976125628@qq.com> Date: Sun, 29 Dec 2024 17:55:15 +0800 Subject: [PATCH 20/42] =?UTF-8?q?=E6=9B=B4=E6=96=B0README=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huangxiaoyao <976125628@qq.com> --- README.md | 72 ++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 08d68bf170..7c3e571e51 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ Flutter SDK 仓库 Windows环境下flutter工程和依赖的插件工程需要在同一个磁盘。 * 环境配置 - **请从[鸿蒙SDK](https://developer.huawei.com/consumer/cn/develop)下载配套开发工具** - *下列环境变量配置，类Unix系统（Linux、Mac），下可直接参照配置，Windows下环境变量配置请在‘编辑系统环境变量’中设置* + **请从[OpenHarmony SDK](https://developer.huawei.com/consumer/cn/develop)下载配套开发工具** + *下列环境变量配置，类Unix系统（Linux、Mac）下可直接参照配置，Windows下环境变量配置请在‘编辑系统环境变量’中设置* 1. 配置OpenHarmony SDK和环境变量 * API12, deveco-studio-5.0 或 command-line-tools-5.0 @@ -104,14 +104,14 @@ Flutter SDK 仓库 flutter build hap --release ``` -4. 安装应用，通过```flutter devices```指令发现真机设备之后，然后安装到鸿蒙手机中。 +4. 安装应用，通过```flutter devices```指令发现真机设备之后，然后安装到OpenHarmony手机中。 - 方式一：进入编译产物目录，然后安装到鸿蒙手机中 + 方式一：进入编译产物目录，然后安装到OpenHarmony手机中 ```sh hdc -t install ``` - 方式二：进入项目目录，直接运行安装到鸿蒙手机中 + 方式二：进入项目目录，直接运行安装到OpenHarmony手机中 ```sh flutter run --debug -d ``` @@ -137,7 +137,7 @@ Flutter SDK 仓库 | create | 创建module模板 | flutter create -t module \ | | create | 创建plugin模板 | flutter create -t plugin --platforms ohos,android,ios \ | | create | 创建plugin_ffi模板 | flutter create -t plugin_ffi --platforms ohos,android,ios \ | -| devices | 已连接设备查找 | flutter devices | +| devices | 查找已连接设备 | flutter devices | | install | 应用安装 | flutter install -t \ \ | | assemble | 资源打包 | flutter assemble | | build | 测试应用构建 | flutter build hap --debug [--target-platform ohos-arm64] | @@ -149,28 +149,26 @@ Flutter SDK 仓库 | clean | 清除项目依赖 | flutter clean | | cache | 清除全局缓存数据 | flutter pub cache clean | -附： -[Flutter高频使用的三方库（部分鸿蒙化）列表](https://gitee.com/openharmony-sig/flutter_packages#openharmony%E5%B9%B3%E5%8F%B0%E5%B7%B2%E5%85%BC%E5%AE%B9%E5%BA%93) -[OpenHarmony设备运行指导](https://gitee.com/openharmony-sig/flutter_samples/blob/cc8b4ee806908b13ec1b0cf3c333a19244823e41/ohos/docs/03_environment/OpenHarmony%E8%AE%BE%E5%A4%87%E8%BF%90%E8%A1%8C%E6%8C%87%E5%AF%BC.md) +附：[Flutter高频使用的三方库（部分OpenHarmony化）列表](https://gitee.com/openharmony-sig/flutter_packages#openharmony%E5%B9%B3%E5%8F%B0%E5%B7%B2%E5%85%BC%E5%AE%B9%E5%BA%93) + ## 常见问题 1. 模拟器调试只支持Mac(arm64)，还不支持Mac(x86) 和 Windows。 -2. 切换FLUTTER_STORAGE_BASE_URL后需删除\/bin/cache 目录，并在项目中执行flutter clean后再运行 +2. 切换FLUTTER_STORAGE_BASE_URL后需删除\/bin/cache 目录，并在项目中执行flutter clean后再运行。 3. 构建Hap任务时报错：Error: The hvigor depends on the npmrc file. Configure the npmrc file first. - 请在用户目录`~`下创建文件`.npmrc`，该配置也可参考[DevEco Studio官方文档](https://developer.harmonyos.com/cn/docs/documentation/doc-guides-V3/environment_config-0000001052902427-V3)，编辑内容如下： + 请在用户目录`~`下创建文件`.npmrc`，该配置也可参考[DevEco Studio官方文档](https://developer.huawei.com/consumer/cn/doc/harmonyos-guides-V5/ide-environment-config-V5#section197296441787)，编辑内容如下： ``` registry=https://repo.huaweicloud.com/repository/npm/ @ohos:registry=https://repo.harmonyos.com/npm/ ``` -4. 查日志时，存在日志丢失现象。 - 解决方案：关闭全局日志，只打开自己领域的日志 - +4. 查日志时，存在日志丢失现象。 + 解决方案：关闭全局日志，只打开自己领域的日志。 ``` 步骤一：关闭所有领域的日志打印（部分特殊日志无法关闭） hdc shell hilog -b X @@ -181,20 +179,21 @@ Flutter SDK 仓库 打印A00000/XComFlutterOHOS_Native的日志，需要设置hdc shell hilog -b D -D A00000 注：上面的设置在机器重启后会失效，如果要继续使用，需要重新设置。 ``` -5. 若Api11 Beta1版本的机器上无法启动debug签名的应用，可以通过将签名换成正式签名，或在手机端打开开发者模式解决（步骤：设置->通用->开发者模式） -6. 如果报`Invalid CEN header (invalid zip64 extra data field size)`异常，请更换Jdk版本，参见[JDK-8313765](https://bugs.openjdk.org/browse/JDK-8313765) +5. 若Beta1版本的机器上无法启动debug签名的应用，可以通过将签名换成正式签名，或在手机端打开开发者模式解决（步骤：设置->通用->开发者模式）。 + +6. 如果报`Invalid CEN header (invalid zip64 extra data field size)`异常，请更换Jdk版本。参见[JDK-8313765](https://bugs.openjdk.org/browse/JDK-8313765) -7. 运行debug版本的flutter应用用到鸿蒙设备后报错（release和profile版本正常） +7. 运行debug版本的flutter应用用到OpenHarmony设备后报错（release和profile版本正常）。 1. 报错信息: `Error while initializing the Dart VM: Wrong full snapshot version, expected '8af474944053df1f0a3be6e6165fa7cf' found 'adb4292f3ec25074ca70abcd2d5c7251'` - 2. 解决方案: 依次执行以下操作 + 2. 解决方案: 依次执行以下操作。 1. 设置环境变量 `export FLUTTER_STORAGE_BASE_URL=https://flutter-ohos.obs.cn-south-1.myhuaweicloud.com` 2. 删除 /bin/cache 目录下的缓存 3. 执行 `flutter clean`，清除项目编译缓存 4. 运行 `flutter run -d $DEVICE --debug` - 3. 补充信息: 运行android或ios出现类似错误，也可以尝试还原环境变量 FLUTTER_STORAGE_BASE_URL ，清除缓存后重新运行。 + 3. 补充信息: 若运行android或ios也出现类似错误，可以尝试还原环境变量`FLUTTER_STORAGE_BASE_URL`，清除缓存后重新运行。 -8. Beta2版本的ROM更新后，不再支持申请有执行权限的匿名内存，导致debug运行闪退。 +8. ROM更新后，不再支持申请有执行权限的匿名内存，导致debug运行闪退。 1. 解决方案：更新 flutter_flutter 到 a44b8a6d (2024-07-25) 之后的版本。 2. 关键日志： @@ -206,14 +205,14 @@ Flutter SDK 仓库 9. 构建Hap命令直接执行`flutter build hap`即可，不再需要`--local-engine`参数，直接从云端获取编译产物。 -10. 配置环境完成后执行 flutter 命令 出现闪退。 - 1. 解决方案：windows环境中添加git环境变量配置。 +10. 配置环境完成后执行 flutter 命令 出现闪退。 + 解决方案：windows环境中添加git环境变量配置。 ``` export PATH=/cmd:$PATH ``` -11. 执行`flutter pub cache clean` 正常 执行`flutter clean` 报错，按照报错信息执行 update 命令也没有效果。 - 1. 解决方案：通过注释掉 build.json5 文件中的配置规避： "modules":[{ // 删除报错对应的整个对象 }] +11. 执行`flutter pub cache clean` 正常，执行`flutter clean` 报错，按照报错信息执行 update 命令也没有效果。 + 1. 解决方案：通过注释掉 build.json5 文件中的配置规避： "modules":[{ // 删除报错对应的整个对象 }]。 2. 报错信息: ``` #Parse ohos module. json5 error: Exception: Can not found module.json5 at @@ -224,9 +223,7 @@ Flutter SDK 仓库 ``` 12. 执行`flutter build hap` 时遇到路径校验报错。 - 1. 解决方案： - ·打开 deveco 安装路径 D:\DevEco Studio\tools\hvigor\hvigor-ohos-plugin\res\schemas 下的 ohos-project-build-profile-schema.json文件。 - ·在该文件中找到包含："pattern": "^(\\./|\\.\\./)[\\s\\S]+$"的行,并删除此行。 + 1. 解决方案：打开 deveco 安装路径 D:\DevEco Studio\tools\hvigor\hvigor-ohos-plugin\res\schemas 下的 ohos-project-build-profile-schema.json文件。在该文件中找到包含："pattern": "^(\\./|\\.\\./)[\\s\\S]+$"的行，并删除此行。 2. 报错信息: ``` #hvigor ERROR: Schema validate failed. @@ -239,15 +236,14 @@ Flutter SDK 仓库 ``` 13. 执行`flutter build hap` 报错。 - 1. 解决方案：打开 deveco 安装路径 D:\DevEco Studio\tools\hvigor\hvigor-ohos-plugin\src\model\module 下的 core-module-model-impl.js, - 修改 findBelongProjectPath 方法（需要管理员权限，可另存为后替换） - ``` - findBelongProjectPath(e) { - if (e === path_1.default.dirname(e)) { - return this.parentProject.getProjectDir() - } - } - ``` + 1. 解决方案：打开 deveco 安装路径 D:\DevEco Studio\tools\hvigor\hvigor-ohos-plugin\src\model\module 下的 core-module-model-impl.js，修改 findBelongProjectPath 方法（需要管理员权限，可另存为后替换）。 + ``` + findBelongProjectPath(e) { + if (e === path_1.default.dirname(e)) { + return this.parentProject.getProjectDir() + } + } + ``` 2. 报错信息: ``` # hvigor ERROR: Cannot find belonging project path for module at D:\. @@ -259,8 +255,8 @@ Flutter SDK 仓库 ``` 14. 在.ohos的项目执行`flutter clean` 报错，然后再执行`flutter pub get`也报错。 - 1. 解决方案：删除.ohos文件夹，重新flutter pub get 即可 - 2.报错信息： + 1. 解决方案：删除.ohos文件夹，重新flutter pub get 即可。 + 2. 报错信息： ``` Oops; flutter has exited unexpectedly: "PathNotFoundException: Cannot open file, path = 'D:\code\.ohos\build-profile.json5' (OS Error: 系统找不到指定的文件。，error = 2)". A crash report has been written to D:\code\flutter_01.log. -- Gitee From b886fcaa5759ef7ea5683afd75296dbe7e97e855 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Mon, 30 Dec 2024 09:42:10 +0800 Subject: [PATCH 21/42] =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=AF=8F=E6=AC=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8Cflutter=E5=91=BD=E4=BB=A4=E6=97=B6=E9=83=BD?= =?UTF-8?q?=E6=8F=90=E7=A4=BADownloading=20Dart=20SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- bin/internal/shared.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/shared.bat b/bin/internal/shared.bat index 26fea94219..8f1e38b0e1 100644 --- a/bin/internal/shared.bat +++ b/bin/internal/shared.bat @@ -21,7 +21,7 @@ SET stamp_path=%cache_dir%\flutter_tools.stamp SET script_path=%flutter_tools_dir%\bin\flutter_tools.dart SET dart_sdk_path=%cache_dir%\dart-sdk SET engine_stamp=%cache_dir%\engine-dart-sdk.stamp -SET engine_version_path=%FLUTTER_ROOT%\bin\internal\engine.version +SET engine_version_path=%FLUTTER_ROOT%\bin\internal\engine.ohos.version SET pub_cache_path=%FLUTTER_ROOT%\.pub-cache SET dart=%dart_sdk_path%\bin\dart.exe -- Gitee From 8e541111adc1e19e2df131acf0596a491b6fe5f4 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Mon, 30 Dec 2024 11:35:13 +0800 Subject: [PATCH 22/42] delete engine.realm Signed-off-by: hezhengyi --- bin/internal/engine.realm | 0 bin/internal/update_dart_sdk.ps1 | 4 ---- bin/internal/update_dart_sdk.sh | 3 +-- 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 bin/internal/engine.realm diff --git a/bin/internal/engine.realm b/bin/internal/engine.realm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bin/internal/update_dart_sdk.ps1 b/bin/internal/update_dart_sdk.ps1 index b5c8d5940e..ebca4a4b02 100644 --- a/bin/internal/update_dart_sdk.ps1 +++ b/bin/internal/update_dart_sdk.ps1 @@ -22,7 +22,6 @@ $engineStamp = "$cachePath\engine-dart-sdk.stamp" $engineVersionFile = "engine.ohos.version" $engineVersion = (Get-Content "$flutterRoot\bin\internal\$engineVersionFile") -$engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm") $oldDartSdkPrefix = "dart-sdk.old" @@ -45,9 +44,6 @@ $dartSdkBaseUrl = $Env:FLUTTER_OHOS_STORAGE_BASE_URL if (-not $dartSdkBaseUrl) { $dartSdkBaseUrl = "https://flutter-ohos.obs.cn-south-1.myhuaweicloud.com" } -if ($engineRealm) { - $dartSdkBaseUrl = "$dartSdkBaseUrl/$engineRealm" -} if($Env:FLUTTER_OHOS_STORAGE_BASE_URL) { $dartSdkBaseUrl = $Env:FLUTTER_OHOS_STORAGE_BASE_URL } diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 4ed2e2a3fc..2224a8f9e1 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -23,7 +23,6 @@ DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk" DART_SDK_PATH_OLD="$DART_SDK_PATH.old" ENGINE_STAMP="$FLUTTER_ROOT/bin/cache/engine-dart-sdk.stamp" ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/$ENGINE_VERSION_FILE") -ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]') OS="$(uname -s)" if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; then @@ -125,7 +124,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t FIND=find fi - DART_SDK_BASE_URL="${FLUTTER_OHOS_STORAGE_BASE_URL}${ENGINE_REALM:+/$ENGINE_REALM}" + DART_SDK_BASE_URL="${FLUTTER_OHOS_STORAGE_BASE_URL:-https://storage.googleapis.com}" DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra_release/flutter/$ENGINE_VERSION/$DART_ZIP_NAME" echo 'dart-sdk-url:' $DART_SDK_URL -- Gitee From ca1a255b26fb4c718af1b7412630f27f4d466ffb Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Thu, 2 Jan 2025 18:03:13 +0800 Subject: [PATCH 23/42] Update engine.ohos.version to ef735b46 Signed-off-by: hezhengyi --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index ed63886244..02746017c2 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -22e6beb953c7b5b1446d5a00eeba78c5d996c5c2 +ef735b463898b80ddcb63c8cd2cbadb56eea5f26 -- Gitee From 886b850fb72e33d89ce308dc50138c714f1d37eb Mon Sep 17 00:00:00 2001 From: liujiake Date: Tue, 7 Jan 2025 20:09:39 +0800 Subject: [PATCH 24/42] Update engine.ohos.version to 08e5cf2c Signed-off-by: liujiake --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index 02746017c2..ba7acc0b35 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -ef735b463898b80ddcb63c8cd2cbadb56eea5f26 +08e5cf2cf15f8be057f2cd7a6e8ed9cc8124b4b1 -- Gitee From f92a5cdaf651c5bb3656403b63828a70575aef06 Mon Sep 17 00:00:00 2001 From: keminLuo Date: Tue, 7 Jan 2025 21:28:51 +0800 Subject: [PATCH 25/42] =?UTF-8?q?Flutter=E5=88=97=E8=A1=A8=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: keminLuo --- .../lib/src/widgets/scroll_position.dart | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/packages/flutter/lib/src/widgets/scroll_position.dart b/packages/flutter/lib/src/widgets/scroll_position.dart index db363517c3..0c68f6f7f2 100644 --- a/packages/flutter/lib/src/widgets/scroll_position.dart +++ b/packages/flutter/lib/src/widgets/scroll_position.dart @@ -9,6 +9,7 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/physics.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; +import 'package:flutter/services.dart'; import 'basic.dart'; import 'framework.dart'; @@ -904,6 +905,21 @@ abstract class ScrollPosition extends ViewportOffset with ScrollMetrics { /// Called by [beginActivity] to report when an activity has started. void didStartScroll() { + switch (defaultTargetPlatform) { + case TargetPlatform.android: + case TargetPlatform.fuchsia: + case TargetPlatform.linux: + case TargetPlatform.windows: + case TargetPlatform.iOS: + case TargetPlatform.macOS: + break; + case TargetPlatform.ohos: + SystemChannels.platform.invokeMethod( + 'Scroll.Activity', + 'start', + ); + break; + } activity!.dispatchScrollStartNotification(copyWith(), context.notificationContext); } @@ -921,6 +937,21 @@ abstract class ScrollPosition extends ViewportOffset with ScrollMetrics { if (keepScrollOffset) { saveScrollOffset(); } + switch (defaultTargetPlatform) { + case TargetPlatform.android: + case TargetPlatform.fuchsia: + case TargetPlatform.linux: + case TargetPlatform.windows: + case TargetPlatform.iOS: + case TargetPlatform.macOS: + break; + case TargetPlatform.ohos: + SystemChannels.platform.invokeMethod( + 'Scroll.Activity', + 'end', + ); + break; + } } /// Called by [setPixels] to report overscroll when an attempt is made to -- Gitee From c811d9186a47512a0173abff67122f5ca9e568f3 Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Wed, 8 Jan 2025 10:47:50 +0800 Subject: [PATCH 26/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- LICENSE_KHZG | 21 +++++++++++++++++++ OAT.xml | 3 ++- app_build/__init__.py | 15 +++---------- app_build/build_dill.py | 15 +++---------- app_build/config.py | 15 +++---------- app_build/debug.py | 14 +++---------- app_build/env_util.py | 15 +++---------- app_build/excute_util.py | 15 +++---------- app_build/file_util.py | 15 +++---------- app_build/release.py | 15 +++---------- .../complex_layout/ohos/build-profile.json5 | 15 ------------- .../ohos/entry/build-profile.json5 | 14 ------------- .../complex_layout/ohos/entry/hvigorfile.ts | 15 +++---------- .../ohos/entry/oh-package.json5 | 14 ------------- .../main/ets/entryability/EntryAbility.ets | 15 +++---------- .../ohos/entry/src/main/ets/pages/Index.ets | 15 +++---------- .../ohos/entry/src/main/module.json5 | 15 +------------ .../src/ohosTest/ets/test/Ability.test.ets | 15 ------------- .../entry/src/ohosTest/ets/test/List.test.ets | 15 ------------- .../ohosTest/ets/testability/TestAbility.ets | 14 ------------- .../ohosTest/ets/testability/pages/Index.ets | 14 ------------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 +++---------- .../ohos/entry/src/ohosTest/module.json5 | 15 +------------ .../ohos/hvigor/hvigor-config.json5 | 14 ------------- .../complex_layout/ohos/hvigorfile.ts | 15 +++---------- .../complex_layout/ohos/oh-package.json5 | 14 ------------- .../macrobenchmarks/ohos/build-profile.json5 | 15 +------------ .../ohos/entry/build-profile.json5 | 15 +------------ .../macrobenchmarks/ohos/entry/hvigorfile.ts | 15 +++---------- .../ohos/entry/oh-package.json5 | 15 +------------ .../main/ets/entryability/EntryAbility.ets | 15 +++---------- .../ohos/entry/src/main/ets/pages/Index.ets | 15 +++---------- .../ohos/entry/src/main/module.json5 | 15 +------------ .../src/ohosTest/ets/test/Ability.test.ets | 14 ------------- .../entry/src/ohosTest/ets/test/List.test.ets | 14 ------------- .../ohosTest/ets/testability/TestAbility.ets | 14 ------------- .../ohosTest/ets/testability/pages/Index.ets | 14 ------------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 +++---------- .../ohos/entry/src/ohosTest/module.json5 | 15 +------------ .../ohos/hvigor/hvigor-config.json5 | 15 +------------ .../macrobenchmarks/ohos/hvigorfile.ts | 15 +++---------- .../macrobenchmarks/ohos/oh-package.json5 | 15 +------------ .../lib/src/build_system/targets/ohos.dart | 18 +++------------- .../lib/src/commands/build_hap.dart | 15 +++---------- .../lib/src/commands/build_har.dart | 15 +++---------- .../lib/src/commands/build_hsp.dart | 15 +++---------- .../lib/src/ohos/application_package.dart | 18 +++------------- .../flutter_tools/lib/src/ohos/build_env.dart | 15 +++---------- .../lib/src/ohos/hdc_server.dart | 15 +++---------- .../flutter_tools/lib/src/ohos/hvigor.dart | 15 +++---------- .../lib/src/ohos/hvigor_utils.dart | 15 +++---------- .../lib/src/ohos/ohos_builder.dart | 18 +++------------- .../lib/src/ohos/ohos_device.dart | 18 +++------------- .../lib/src/ohos/ohos_device_discovery.dart | 18 +++------------- .../lib/src/ohos/ohos_doctor.dart | 18 +++------------- .../lib/src/ohos/ohos_plugins_manager.dart | 15 +++---------- .../flutter_tools/lib/src/ohos/ohos_sdk.dart | 19 +++-------------- .../lib/src/ohos/ohos_workflow.dart | 19 +++-------------- .../ohos.tmpl/build-profile.json5.tmpl | 15 +------------ .../ohos.tmpl/entry/build-profile.json5.tmpl | 14 ------------- .../ohos.tmpl/entry/hvigorfile.ts.tmpl | 15 +++---------- .../ohos.tmpl/entry/oh-package.json5.tmpl | 15 +++---------- .../ets/entryability/EntryAbility.ets.tmpl | 14 ------------- .../entry/src/main/ets/pages/Index.ets.tmpl | 14 ------------- .../ohos.tmpl/entry/src/main/module.json5 | 15 +------------ .../src/ohosTest/ets/test/Ability.test.ets | 15 ------------- .../entry/src/ohosTest/ets/test/List.test.ets | 15 ------------- .../ohosTest/ets/testability/TestAbility.ets | 15 ------------- .../ohosTest/ets/testability/pages/Index.ets | 15 +++---------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 +++---------- .../entry/src/ohosTest/module.json5.tmpl | 15 +++---------- .../ohos.tmpl/hvigor/hvigor-config.json5.tmpl | 14 ------------- .../app_shared/ohos.tmpl/hvigorfile.ts.tmpl | 15 +++---------- .../ohos.tmpl/oh-package.json5.tmpl | 15 +++---------- .../host_app_common/build-profile.json5.tmpl | 15 ------------- .../entry.tmpl/build-profile.json5.tmpl | 14 ------------- .../entry.tmpl/hvigorfile.ts.tmpl | 14 ------------- .../entry.tmpl/oh-package.json5.tmpl | 14 ------------- .../ets/entryability/EntryAbility.ets.tmpl | 14 ------------- .../src/main/ets/pages/Index.ets.tmpl | 14 ------------- .../entry.tmpl/src/main/module.json5 | 15 +------------ .../src/ohosTest/ets/test/Ability.test.ets | 14 ------------- .../src/ohosTest/ets/test/List.test.ets | 15 +------------ .../ohosTest/ets/testability/TestAbility.ets | 15 +------------ .../ohosTest/ets/testability/pages/Index.ets | 15 +++---------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 +++---------- .../entry.tmpl/src/ohosTest/module.json5.tmpl | 14 ------------- .../ohos/host_config/build-profile.json5.tmpl | 14 ------------- .../ohos/host_config/oh-package.json5.tmpl | 14 ------------- .../hvigor/hvigor-config.json5.tmpl | 14 ------------- .../ohos/hvigor_plugin/hvigorfile.ts.tmpl | 15 +++---------- .../build-profile.json5.tmpl | 15 +------------ .../flutter_module.tmpl/hvigorfile.ts.tmpl | 15 +++---------- .../flutter_module.tmpl/index.ets | 15 +++---------- .../flutter_module.tmpl/oh-package.json5.tmpl | 14 ------------- .../flutter_module.tmpl/src/main/module.json5 | 15 +------------ .../templates/plugin/ohos.tmpl/index.ets.tmpl | 14 ------------- .../components/plugin/pluginClass.ets.tmpl | 5 ----- .../permeable/build_app_test.dart | 17 +++------------ .../permeable/build_hap_test.dart | 15 +++---------- .../permeable/build_har_test.dart | 15 +++---------- .../permeable/build_hsp_test.dart | 15 +++---------- .../build_system/targets/ohos_test.dart | 21 +++---------------- .../general.shard/ohos/hdc_server_test.dart | 14 ------------- .../test/general.shard/ohos/hvigor_test.dart | 15 +------------ .../general.shard/ohos/hvigor_utils_test.dart | 14 ------------- .../ohos/ohos_application_package_test.dart | 15 +------------ .../ohos/ohos_device_discovery_test.dart | 19 +---------------- .../general.shard/ohos/ohos_device_test.dart | 15 +------------ .../general.shard/ohos/ohos_doctor_test.dart | 14 ------------- .../ohos/ohos_plugins_manager_test.dart | 15 +------------ .../general.shard/ohos/ohos_sdk_test.dart | 19 +---------------- .../ohos/ohos_workflow_test.dart | 19 +---------------- .../flutter_tools/test/src/ohos_common.dart | 18 +++------------- .../example/ohos/entry/build-profile.json5 | 15 +------------ .../example/ohos/entry/hvigorfile.ts | 15 +++---------- .../main/ets/entryability/EntryAbility.ets | 15 +++---------- .../ohos/entry/src/main/ets/pages/Index.ets | 15 +++---------- .../example/ohos/entry/src/main/module.json5 | 15 +------------ .../src/ohosTest/ets/test/Ability.test.ets | 14 ------------- .../entry/src/ohosTest/ets/test/List.test.ets | 14 ------------- .../ohosTest/ets/testability/TestAbility.ets | 14 ------------- .../ohosTest/ets/testability/pages/Index.ets | 15 +++---------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 +++---------- .../ohos/entry/src/ohosTest/module.json5 | 15 +------------ .../example/ohos/hvigor/hvigor-config.json5 | 15 +------------ .../example/ohos/hvigorfile.ts | 15 +++---------- packages/integration_test/ohos/Index.ets | 19 +++++------------ .../FlutterDeviceScreenshot.ets | 18 +++------------- .../IntegrationTestPlugin.ets | 18 +++------------- .../ohos/src/test/List.test.ets | 15 +------------ 131 files changed, 236 insertions(+), 1739 deletions(-) create mode 100644 LICENSE_KHZG diff --git a/LICENSE_KHZG b/LICENSE_KHZG new file mode 100644 index 0000000000..452a23994b --- /dev/null +++ b/LICENSE_KHZG @@ -0,0 +1,21 @@ +Copyright 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted (subject to the limitations in the disclaimer below) provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the distribution. + + * Neither the name of Hunan OpenValley Digital Industry Development Co., Ltd. nor the names of its contributors may be + used to endorse or promote products derived from this software without specific prior written permission. + +NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT +HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/OAT.xml b/OAT.xml index 2e714c817b..09f239414f 100644 --- a/OAT.xml +++ b/OAT.xml @@ -133,10 +133,11 @@ - + + diff --git a/app_build/__init__.py b/app_build/__init__.py index 8a0d2b732f..5513928de6 100644 --- a/app_build/__init__.py +++ b/app_build/__init__.py @@ -1,12 +1,3 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. diff --git a/app_build/build_dill.py b/app_build/build_dill.py index a26e6cfaea..24af312de3 100644 --- a/app_build/build_dill.py +++ b/app_build/build_dill.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import excute_util diff --git a/app_build/config.py b/app_build/config.py index 322241ac8b..2c4a366136 100644 --- a/app_build/config.py +++ b/app_build/config.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import sys diff --git a/app_build/debug.py b/app_build/debug.py index 350ae37213..d085e3c6af 100644 --- a/app_build/debug.py +++ b/app_build/debug.py @@ -1,14 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file.language governing permissions and # limitations under the License. #!/usr/bin/python diff --git a/app_build/env_util.py b/app_build/env_util.py index 8fbc139d88..0a62ad92d1 100644 --- a/app_build/env_util.py +++ b/app_build/env_util.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import os diff --git a/app_build/excute_util.py b/app_build/excute_util.py index 6dbd289833..f2221de74b 100644 --- a/app_build/excute_util.py +++ b/app_build/excute_util.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. import subprocess from datetime import datetime diff --git a/app_build/file_util.py b/app_build/file_util.py index 0189665f06..d51a82478b 100644 --- a/app_build/file_util.py +++ b/app_build/file_util.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import shutil diff --git a/app_build/release.py b/app_build/release.py index 62427c3eee..6241064c3c 100644 --- a/app_build/release.py +++ b/app_build/release.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import config diff --git a/dev/benchmarks/complex_layout/ohos/build-profile.json5 b/dev/benchmarks/complex_layout/ohos/build-profile.json5 index 7ceb22efee..8938b90e0f 100644 --- a/dev/benchmarks/complex_layout/ohos/build-profile.json5 +++ b/dev/benchmarks/complex_layout/ohos/build-profile.json5 @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - { "app": { "signingConfigs": [], diff --git a/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 b/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 index 633d360fbc..6de31ee224 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "apiType": 'stageMode', diff --git a/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts b/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts index 894fc15c6b..8c73fe7ecd 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts +++ b/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 b/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 index dabaee1315..80aa77e3db 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "name": "entry", diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 8bc48be877..f99d5d0a17 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets index 1125f9fdd9..45af41b576 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import common from '@ohos.app.ability.common'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 b/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 index 7bbf78b18f..5bd7950ba5 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "entry", diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3..8abf7f2f44 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets index f4140030e6..d766fe249d 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - import abilityTest from './Ability.test' export default function testsuite() { diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e601..42fcf69c98 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2..6466fb9197 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9..8b02fe38cf 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 index fab77ce2e0..e29411f46a 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { diff --git a/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 b/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 index 541ba35711..e7b855ac20 100644 --- a/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 +++ b/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/complex_layout/ohos/hvigorfile.ts b/dev/benchmarks/complex_layout/ohos/hvigorfile.ts index 8f2d2aafe6..dc3689cac5 100644 --- a/dev/benchmarks/complex_layout/ohos/hvigorfile.ts +++ b/dev/benchmarks/complex_layout/ohos/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/complex_layout/ohos/oh-package.json5 b/dev/benchmarks/complex_layout/ohos/oh-package.json5 index 0547594c0d..d0d5dd2e6f 100644 --- a/dev/benchmarks/complex_layout/ohos/oh-package.json5 +++ b/dev/benchmarks/complex_layout/ohos/oh-package.json5 @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 b/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 index 5fcb3dc466..e7ef02284e 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "app": { diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 index 633d360fbc..11a8dca6f9 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "apiType": 'stageMode', diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts b/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts index 894fc15c6b..8c73fe7ecd 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 index dabaee1315..ecce1057f9 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "name": "entry", diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 8bc48be877..f99d5d0a17 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets index 1125f9fdd9..45af41b576 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import common from '@ohos.app.ability.common'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 index 7bbf78b18f..5bd7950ba5 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "entry", diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3..fefeb6ea18 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets index f4140030e6..348ab4ea9e 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import abilityTest from './Ability.test' diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e601..42fcf69c98 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2..6466fb9197 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9..8b02fe38cf 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 index fab77ce2e0..e29411f46a 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { diff --git a/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 b/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 index 541ba35711..0e35b0d60f 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts b/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts index 8f2d2aafe6..dc3689cac5 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 b/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 index c640999ec2..c341a8f271 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/lib/src/build_system/targets/ohos.dart b/packages/flutter_tools/lib/src/build_system/targets/ohos.dart index e109143f14..8667a262e2 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/ohos.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/ohos.dart @@ -1,19 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Based on android.dart originally written by -* Copyright (C) 2019 Jonah Williams +* Copyright 2014 The Flutter Authors. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE file. * */ diff --git a/packages/flutter_tools/lib/src/commands/build_hap.dart b/packages/flutter_tools/lib/src/commands/build_hap.dart index 4adc519d22..20c3aa3074 100644 --- a/packages/flutter_tools/lib/src/commands/build_hap.dart +++ b/packages/flutter_tools/lib/src/commands/build_hap.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_har.dart b/packages/flutter_tools/lib/src/commands/build_har.dart index 0edbc0fc80..5e9a90dbba 100644 --- a/packages/flutter_tools/lib/src/commands/build_har.dart +++ b/packages/flutter_tools/lib/src/commands/build_har.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_hsp.dart b/packages/flutter_tools/lib/src/commands/build_hsp.dart index 9b8137409e..f68f1aeb75 100644 --- a/packages/flutter_tools/lib/src/commands/build_hsp.dart +++ b/packages/flutter_tools/lib/src/commands/build_hsp.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/application_package.dart b/packages/flutter_tools/lib/src/ohos/application_package.dart index d7cb05c32f..6cb1cd48e5 100644 --- a/packages/flutter_tools/lib/src/ohos/application_package.dart +++ b/packages/flutter_tools/lib/src/ohos/application_package.dart @@ -1,19 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Based on application_package.dart originally written by -* Copyright (C) 2015 Ian Fischer +* Copyright 2014 The Flutter Authors. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE file. * */ diff --git a/packages/flutter_tools/lib/src/ohos/build_env.dart b/packages/flutter_tools/lib/src/ohos/build_env.dart index e38dc143cd..b5b07e5af0 100644 --- a/packages/flutter_tools/lib/src/ohos/build_env.dart +++ b/packages/flutter_tools/lib/src/ohos/build_env.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ diff --git a/packages/flutter_tools/lib/src/ohos/hdc_server.dart b/packages/flutter_tools/lib/src/ohos/hdc_server.dart index 5748f09e08..5569907512 100644 --- a/packages/flutter_tools/lib/src/ohos/hdc_server.dart +++ b/packages/flutter_tools/lib/src/ohos/hdc_server.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'dart:io'; diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index 99e0560836..e184ea49a9 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'dart:convert'; diff --git a/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart b/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart index ea3fa101af..af2a670ff0 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'dart:convert'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_builder.dart b/packages/flutter_tools/lib/src/ohos/ohos_builder.dart index ca4ce7a8ab..21f8d6adb7 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_builder.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_builder.dart @@ -1,19 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Based on android_builder.dart originally written by -* Copyright (C) 2019 Emmanuel Garcia +* Copyright 2014 The Flutter Authors. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE file. * */ diff --git a/packages/flutter_tools/lib/src/ohos/ohos_device.dart b/packages/flutter_tools/lib/src/ohos/ohos_device.dart index 0a2fddae37..f450b4fd98 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_device.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_device.dart @@ -1,19 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Based on android_device.dart originally written by -* Copyright (C) 2016 Devon Carew +* Copyright 2014 The Flutter Authors. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE file. * */ diff --git a/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart b/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart index b6418ddcec..a700dc448e 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart @@ -1,19 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Based on android_device_discovery.dart originally written by -* Copyright (C) 2020 Jonah Williams +* Copyright 2014 The Flutter Authors. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE file. * */ diff --git a/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart b/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart index 082c50fda1..74d0d12366 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart @@ -1,19 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Based on linux_doctor.dart originally written by -* Copyright (C) 2019 Jonah Williams +* Copyright 2014 The Flutter Authors. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE file. * */ diff --git a/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart b/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart index 574df42646..c0a4dd2224 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright 2014 The Flutter Authors. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE file. */ import 'dart:convert'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart b/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart index fcc9fe62f8..1ca050d7a9 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart @@ -1,20 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Based on android_sdk.dart originally written by -* Copyright (C) 2016 Devon Carew -* +* Copyright 2014 The Flutter Authors. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE file. */ import 'dart:collection'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart b/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart index b1603382d0..fd67140142 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart @@ -1,20 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Based on android_workflow.dart originally written by -* Copyright (C) 2016 Devon Carew -* +* Copyright 2014 The Flutter Authors. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE file. */ import '../base/context.dart'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl index 0d8b167e6c..1d8b56bd87 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "app": { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl index 633d360fbc..6de31ee224 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl index 894fc15c6b..8c73fe7ecd 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl index dabaee1315..d0e6a68b31 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl index 8bc48be877..f85a65508a 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl index 1125f9fdd9..7bb6543fe7 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 index 7bbf78b18f..5bd7950ba5 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "entry", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3..8abf7f2f44 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets index f4140030e6..d766fe249d 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - import abilityTest from './Ability.test' export default function testsuite() { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e601..e3f6e911d3 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2..5942443207 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9..8b02fe38cf 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl index fab77ce2e0..7e88ff7ccc 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl index 541ba35711..e7b855ac20 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl index 8f2d2aafe6..dc3689cac5 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl index a5bc0bec4b..8f51f697f8 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ { diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl index 75b957106e..aebb05d26a 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - { "app": { "signingConfigs": [], diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl index 633d360fbc..6de31ee224 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl index 894fc15c6b..98b5db417e 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl index 6f7b62b27e..a5bfaf0e62 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "name": "entry", diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl index 0f7f6669df..08dc3c6dcb 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '@ohos/flutter_module'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl index 1125f9fdd9..7bb6543fe7 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 index 156fac615e..809307d2e1 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "entry", diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3..fefeb6ea18 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets index f4140030e6..073c11f4d5 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + import abilityTest from './Ability.test' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e601..242b0c6c21 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2..5942443207 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9..8b02fe38cf 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl index fab77ce2e0..3b02a75a22 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "module": { diff --git a/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl index 0de1d44b66..c129d89c4d 100644 --- a/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "app": { diff --git a/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl index 38968fc7e4..0db77d9a26 100644 --- a/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl index 541ba35711..e7b855ac20 100644 --- a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl index 8f2d2aafe6..dc3689cac5 100644 --- a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl index 633d360fbc..11a8dca6f9 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl index d3aba127d6..00b0bc719c 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { harTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets index ee4e374b29..b90535efc0 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ export { GeneratedPluginRegistrant } from './src/main/ets/plugins/GeneratedPluginRegistrant' \ No newline at end of file diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl index 1fa6a4dfea..f16bb33f6f 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "name": "@ohos/flutter_module", diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 index 81d88ba3a3..61b1982a96 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "flutter_module", diff --git a/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl b/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl index a4d4c30b47..8c3ee5813e 100644 --- a/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl +++ b/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import {{pluginClass}} from './src/main/ets/components/plugin/{{pluginClass}}'; export default {{pluginClass}}; diff --git a/packages/flutter_tools/templates/plugin/ohos.tmpl/src/main/ets/components/plugin/pluginClass.ets.tmpl b/packages/flutter_tools/templates/plugin/ohos.tmpl/src/main/ets/components/plugin/pluginClass.ets.tmpl index 990595412d..cc521f51b2 100644 --- a/packages/flutter_tools/templates/plugin/ohos.tmpl/src/main/ets/components/plugin/pluginClass.ets.tmpl +++ b/packages/flutter_tools/templates/plugin/ohos.tmpl/src/main/ets/components/plugin/pluginClass.ets.tmpl @@ -1,8 +1,3 @@ -/* -* Based on pluginClass.java.tmpl originally written by -* Copyright (C) 2017 Jakob Andersen -*/ - import { FlutterPlugin, FlutterPluginBinding, diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_app_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_app_test.dart index 9428c2e25d..0ee01a5d99 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_app_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_app_test.dart @@ -1,17 +1,6 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. import 'package:args/command_runner.dart'; import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_hap_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_hap_test.dart index aa20b8a512..42739bbbfa 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_hap_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_hap_test.dart @@ -1,16 +1,7 @@ /* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2014 The Flutter Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ import 'package:args/args.dart'; diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart index faa443cc54..f2847a70fd 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart @@ -1,16 +1,7 @@ /* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2014 The Flutter Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ import 'package:args/command_runner.dart'; diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart index 047e42d7ae..776bd2e3ba 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart @@ -1,16 +1,7 @@ /* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2014 The Flutter Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ import 'package:args/command_runner.dart'; diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart index b5673ebb2b..2a700d7b4e 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart @@ -1,21 +1,6 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Based on android_test.dart originally written by - * Copyright (C) 2019 Jonah Williams - * - */ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. import 'package:file/memory.dart'; import 'package:file_testing/file_testing.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart b/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart index 042aef1030..f887685b5b 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'package:flutter_tools/src/ohos/hdc_server.dart'; import 'package:flutter_tools/src/ohos/ohos_sdk.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart b/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart index 3ac7d9501d..63ead16ddb 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart @@ -1,17 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + import 'dart:async'; import 'dart:convert'; diff --git a/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart b/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart index deb9499ef4..8e8cd29f12 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'package:file/file.dart'; import 'package:flutter_tools/src/convert.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart index ce010cb8b2..c1379cd345 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart @@ -1,17 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart index 7a94ebb12d..0548ea29b5 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart @@ -1,21 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Based on android_device_discovery_test.dart originally written by - * Copyright (C) 2020 Jonah Williams - * - */ + import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/logger.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart index c0c915b78f..580c9621da 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart @@ -1,17 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + import 'package:flutter_tools/src/application_package.dart'; import 'package:flutter_tools/src/ohos/ohos_device.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart index 357363336c..03564e677d 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/config.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart index de4ceb5064..ce8723adeb 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart @@ -1,17 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart index 0036c2753a..e65cb789bf 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart @@ -1,21 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Based on android_sdk_test.dart originally written by - * Copyright (C) 2016 Devon Carew - * - */ + import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/config.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart index b93a2bc35f..22e36f4f9c 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart @@ -1,21 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Based on android_sdk_test.dart originally written by - * Copyright (C) 2016 Devon Carew - * - */ + import 'package:flutter_tools/src/ohos/ohos_sdk.dart'; import 'package:flutter_tools/src/ohos/ohos_workflow.dart'; diff --git a/packages/flutter_tools/test/src/ohos_common.dart b/packages/flutter_tools/test/src/ohos_common.dart index fd3714afe4..900a3b728c 100644 --- a/packages/flutter_tools/test/src/ohos_common.dart +++ b/packages/flutter_tools/test/src/ohos_common.dart @@ -1,19 +1,7 @@ /* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Based on android_common.dart originally written by - * Copyright (C) 2019 Emmanuel Garcia + * Copyright 2014 The Flutter Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. * */ diff --git a/packages/integration_test/example/ohos/entry/build-profile.json5 b/packages/integration_test/example/ohos/entry/build-profile.json5 index 633d360fbc..11a8dca6f9 100644 --- a/packages/integration_test/example/ohos/entry/build-profile.json5 +++ b/packages/integration_test/example/ohos/entry/build-profile.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "apiType": 'stageMode', diff --git a/packages/integration_test/example/ohos/entry/hvigorfile.ts b/packages/integration_test/example/ohos/entry/hvigorfile.ts index 894fc15c6b..8c73fe7ecd 100644 --- a/packages/integration_test/example/ohos/entry/hvigorfile.ts +++ b/packages/integration_test/example/ohos/entry/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 8bc48be877..f99d5d0a17 100644 --- a/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; diff --git a/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets b/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets index ac2b5dc723..912710312d 100644 --- a/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets +++ b/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import common from '@ohos.app.ability.common'; diff --git a/packages/integration_test/example/ohos/entry/src/main/module.json5 b/packages/integration_test/example/ohos/entry/src/main/module.json5 index 7bbf78b18f..5bd7950ba5 100644 --- a/packages/integration_test/example/ohos/entry/src/main/module.json5 +++ b/packages/integration_test/example/ohos/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "entry", diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3..fefeb6ea18 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets index f4140030e6..348ab4ea9e 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import abilityTest from './Ability.test' diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e601..42fcf69c98 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2..5942443207 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9..8b02fe38cf 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 b/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 index fab77ce2e0..e29411f46a 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { diff --git a/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 b/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 index 541ba35711..0e35b0d60f 100644 --- a/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 +++ b/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "modelVersion": "5.0.0", diff --git a/packages/integration_test/example/ohos/hvigorfile.ts b/packages/integration_test/example/ohos/hvigorfile.ts index 8f2d2aafe6..dc3689cac5 100644 --- a/packages/integration_test/example/ohos/hvigorfile.ts +++ b/packages/integration_test/example/ohos/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/integration_test/ohos/Index.ets b/packages/integration_test/ohos/Index.ets index 9cb1e4ae7c..4bc284a83c 100644 --- a/packages/integration_test/ohos/Index.ets +++ b/packages/integration_test/ohos/Index.ets @@ -1,17 +1,8 @@ -/** - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. +*/ import IntegrationTestPlugin from './src/main/ets/components/integration_test/IntegrationTestPlugin'; export default IntegrationTestPlugin; diff --git a/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets b/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets index 21ce29d779..386cfb69f1 100644 --- a/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets +++ b/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets @@ -1,19 +1,7 @@ /** - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Based on FlutterDeviceScreenshot.java originally written by - * Copyright (C) 2021 Emmanuel Garcia + * Copyright 2014 The Flutter Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. * */ import { diff --git a/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets b/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets index 91d5100266..442b09054f 100644 --- a/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets +++ b/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets @@ -1,19 +1,7 @@ /** - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Based on IntegrationTestPlugin.java originally written by - * Copyright (C) 2020 Dan Field + * Copyright 2014 The Flutter Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. * */ diff --git a/packages/integration_test/ohos/src/test/List.test.ets b/packages/integration_test/ohos/src/test/List.test.ets index 4b699aaccc..af9973d978 100644 --- a/packages/integration_test/ohos/src/test/List.test.ets +++ b/packages/integration_test/ohos/src/test/List.test.ets @@ -1,17 +1,4 @@ -/** - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + import localUnitTest from './LocalUnit.test'; export default function testsuite() { -- Gitee From 6093b7ef0463399df0440d0396e64eb0d1ac5d4d Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Wed, 8 Jan 2025 15:40:06 +0800 Subject: [PATCH 27/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- OAT.xml | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/OAT.xml b/OAT.xml index 09f239414f..417db11ac6 100644 --- a/OAT.xml +++ b/OAT.xml @@ -128,13 +128,24 @@ + + + + + + - - + + + + + + + @@ -169,6 +180,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + Date: Wed, 8 Jan 2025 15:48:14 +0800 Subject: [PATCH 28/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- app_build/.gitignore | 15 +++------------ .../src/ohosTest/ets/testability/pages/Index.ets | 5 +++++ .../src/ohosTest/ets/testability/pages/Index.ets | 5 +++++ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app_build/.gitignore b/app_build/.gitignore index a43bd6fdf3..897e31a843 100644 --- a/app_build/.gitignore +++ b/app_build/.gitignore @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. debug_out release_out diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index 6466fb9197..5942443207 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,3 +1,8 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. +*/ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index 6466fb9197..5942443207 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,3 +1,8 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. +*/ import hilog from '@ohos.hilog'; -- Gitee From 9aaf92b47ee005bdc41ebd741e81cedcba909757 Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Wed, 8 Jan 2025 16:02:56 +0800 Subject: [PATCH 29/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- OAT.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/OAT.xml b/OAT.xml index 417db11ac6..e756cbc128 100644 --- a/OAT.xml +++ b/OAT.xml @@ -124,11 +124,19 @@ path=".*" rule="may" type="copyright"/> + - + -- Gitee From 11be547dddd104947babba60c13e20e2b2881023 Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Thu, 9 Jan 2025 16:12:48 +0800 Subject: [PATCH 30/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- OAT.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OAT.xml b/OAT.xml index e756cbc128..c50aa96c4f 100644 --- a/OAT.xml +++ b/OAT.xml @@ -147,7 +147,7 @@ - + @@ -156,6 +156,7 @@ + -- Gitee From 6ae6c999a42170510a0347c73ca13e80af006505 Mon Sep 17 00:00:00 2001 From: liujiake Date: Thu, 16 Jan 2025 09:48:59 +0800 Subject: [PATCH 31/42] Update engine.ohos.version to 7b02a12e Signed-off-by: liujiake --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index ba7acc0b35..732ef251a1 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -08e5cf2cf15f8be057f2cd7a6e8ed9cc8124b4b1 +7b02a12e253169bc56b66b501c24a717683f033c -- Gitee From a04da551829d602b912b0ddebc09c226f5574eb0 Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Thu, 16 Jan 2025 18:08:37 +0800 Subject: [PATCH 32/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- app_build/.gitignore | 15 ++++++++++++--- app_build/__init__.py | 15 ++++++++++++--- app_build/build_dill.py | 15 ++++++++++++--- app_build/config.py | 15 ++++++++++++--- app_build/debug.py | 14 +++++++++++--- app_build/env_util.py | 15 ++++++++++++--- app_build/excute_util.py | 15 ++++++++++++--- app_build/file_util.py | 15 ++++++++++++--- app_build/release.py | 15 ++++++++++++--- .../complex_layout/ohos/build-profile.json5 | 15 +++++++++++++++ .../ohos/entry/build-profile.json5 | 14 ++++++++++++++ .../complex_layout/ohos/entry/hvigorfile.ts | 15 ++++++++++++--- .../ohos/entry/oh-package.json5 | 14 ++++++++++++++ .../main/ets/entryability/EntryAbility.ets | 15 ++++++++++++--- .../ohos/entry/src/main/ets/pages/Index.ets | 15 ++++++++++++--- .../ohos/entry/src/main/module.json5 | 15 ++++++++++++++- .../src/ohosTest/ets/test/Ability.test.ets | 15 +++++++++++++++ .../entry/src/ohosTest/ets/test/List.test.ets | 15 +++++++++++++++ .../ohosTest/ets/testability/TestAbility.ets | 14 ++++++++++++++ .../ohosTest/ets/testability/pages/Index.ets | 15 ++++++++++++--- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 ++++++++++++--- .../ohos/entry/src/ohosTest/module.json5 | 15 ++++++++++++++- .../ohos/hvigor/hvigor-config.json5 | 14 ++++++++++++++ .../complex_layout/ohos/hvigorfile.ts | 15 ++++++++++++--- .../complex_layout/ohos/oh-package.json5 | 14 ++++++++++++++ .../macrobenchmarks/ohos/build-profile.json5 | 15 ++++++++++++++- .../ohos/entry/build-profile.json5 | 15 ++++++++++++++- .../macrobenchmarks/ohos/entry/hvigorfile.ts | 15 ++++++++++++--- .../ohos/entry/oh-package.json5 | 15 ++++++++++++++- .../main/ets/entryability/EntryAbility.ets | 15 ++++++++++++--- .../ohos/entry/src/main/ets/pages/Index.ets | 15 ++++++++++++--- .../ohos/entry/src/main/module.json5 | 15 ++++++++++++++- .../src/ohosTest/ets/test/Ability.test.ets | 14 ++++++++++++++ .../entry/src/ohosTest/ets/test/List.test.ets | 14 ++++++++++++++ .../ohosTest/ets/testability/TestAbility.ets | 14 ++++++++++++++ .../ohosTest/ets/testability/pages/Index.ets | 15 ++++++++++++--- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 ++++++++++++--- .../ohos/entry/src/ohosTest/module.json5 | 15 ++++++++++++++- .../ohos/hvigor/hvigor-config.json5 | 15 ++++++++++++++- .../macrobenchmarks/ohos/hvigorfile.ts | 15 ++++++++++++--- .../macrobenchmarks/ohos/oh-package.json5 | 15 ++++++++++++++- .../lib/src/commands/build_hap.dart | 15 ++++++++++++--- .../lib/src/commands/build_har.dart | 15 ++++++++++++--- .../lib/src/commands/build_hsp.dart | 15 ++++++++++++--- .../flutter_tools/lib/src/ohos/build_env.dart | 15 ++++++++++++--- .../lib/src/ohos/hdc_server.dart | 15 ++++++++++++--- .../flutter_tools/lib/src/ohos/hvigor.dart | 15 ++++++++++++--- .../lib/src/ohos/hvigor_utils.dart | 15 ++++++++++++--- .../ohos.tmpl/build-profile.json5.tmpl | 15 ++++++++++++++- .../ohos.tmpl/entry/build-profile.json5.tmpl | 14 ++++++++++++++ .../ohos.tmpl/entry/hvigorfile.ts.tmpl | 15 ++++++++++++--- .../ohos.tmpl/entry/oh-package.json5.tmpl | 15 ++++++++++++--- .../ets/entryability/EntryAbility.ets.tmpl | 14 ++++++++++++++ .../entry/src/main/ets/pages/Index.ets.tmpl | 14 ++++++++++++++ .../ohos.tmpl/entry/src/main/module.json5 | 15 ++++++++++++++- .../src/ohosTest/ets/test/Ability.test.ets | 15 +++++++++++++++ .../entry/src/ohosTest/ets/test/List.test.ets | 15 +++++++++++++++ .../ohosTest/ets/testability/TestAbility.ets | 15 +++++++++++++++ .../ohosTest/ets/testability/pages/Index.ets | 15 ++++++++++++--- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 ++++++++++++--- .../entry/src/ohosTest/module.json5.tmpl | 15 ++++++++++++--- .../ohos.tmpl/hvigor/hvigor-config.json5.tmpl | 14 ++++++++++++++ .../app_shared/ohos.tmpl/hvigorfile.ts.tmpl | 15 ++++++++++++--- .../ohos.tmpl/oh-package.json5.tmpl | 15 ++++++++++++--- .../host_app_common/build-profile.json5.tmpl | 15 +++++++++++++++ .../entry.tmpl/build-profile.json5.tmpl | 14 ++++++++++++++ .../entry.tmpl/hvigorfile.ts.tmpl | 14 ++++++++++++++ .../entry.tmpl/oh-package.json5.tmpl | 14 ++++++++++++++ .../ets/entryability/EntryAbility.ets.tmpl | 14 ++++++++++++++ .../src/main/ets/pages/Index.ets.tmpl | 14 ++++++++++++++ .../entry.tmpl/src/main/module.json5 | 15 ++++++++++++++- .../src/ohosTest/ets/test/Ability.test.ets | 14 ++++++++++++++ .../src/ohosTest/ets/test/List.test.ets | 15 ++++++++++++++- .../ohosTest/ets/testability/TestAbility.ets | 15 ++++++++++++++- .../ohosTest/ets/testability/pages/Index.ets | 15 ++++++++++++--- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 ++++++++++++--- .../entry.tmpl/src/ohosTest/module.json5.tmpl | 14 ++++++++++++++ .../ohos/host_config/build-profile.json5.tmpl | 14 ++++++++++++++ .../ohos/host_config/oh-package.json5.tmpl | 14 ++++++++++++++ .../hvigor/hvigor-config.json5.tmpl | 14 ++++++++++++++ .../ohos/hvigor_plugin/hvigorfile.ts.tmpl | 15 ++++++++++++--- .../build-profile.json5.tmpl | 15 ++++++++++++++- .../flutter_module.tmpl/hvigorfile.ts.tmpl | 15 ++++++++++++--- .../flutter_module.tmpl/index.ets | 15 ++++++++++++--- .../flutter_module.tmpl/oh-package.json5.tmpl | 14 ++++++++++++++ .../flutter_module.tmpl/src/main/module.json5 | 15 ++++++++++++++- .../templates/plugin/ohos.tmpl/index.ets.tmpl | 14 ++++++++++++++ .../general.shard/ohos/hdc_server_test.dart | 14 ++++++++++++++ .../test/general.shard/ohos/hvigor_test.dart | 15 ++++++++++++++- .../general.shard/ohos/hvigor_utils_test.dart | 14 ++++++++++++++ .../ohos/ohos_application_package_test.dart | 15 ++++++++++++++- .../ohos/ohos_device_discovery_test.dart | 15 ++++++++++++++- .../general.shard/ohos/ohos_device_test.dart | 15 ++++++++++++++- .../general.shard/ohos/ohos_doctor_test.dart | 14 ++++++++++++++ .../ohos/ohos_plugins_manager_test.dart | 15 ++++++++++++++- .../general.shard/ohos/ohos_sdk_test.dart | 15 ++++++++++++++- .../ohos/ohos_workflow_test.dart | 15 ++++++++++++++- .../example/ohos/entry/build-profile.json5 | 15 ++++++++++++++- .../example/ohos/entry/hvigorfile.ts | 15 ++++++++++++--- .../main/ets/entryability/EntryAbility.ets | 15 ++++++++++++--- .../ohos/entry/src/main/ets/pages/Index.ets | 15 ++++++++++++--- .../example/ohos/entry/src/main/module.json5 | 15 ++++++++++++++- .../src/ohosTest/ets/test/Ability.test.ets | 14 ++++++++++++++ .../entry/src/ohosTest/ets/test/List.test.ets | 14 ++++++++++++++ .../ohosTest/ets/testability/TestAbility.ets | 14 ++++++++++++++ .../ohosTest/ets/testability/pages/Index.ets | 15 ++++++++++++--- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 ++++++++++++--- .../ohos/entry/src/ohosTest/module.json5 | 15 ++++++++++++++- .../example/ohos/hvigor/hvigor-config.json5 | 15 ++++++++++++++- .../example/ohos/hvigorfile.ts | 15 ++++++++++++--- packages/integration_test/ohos/Index.ets | 19 ++++++++++++++----- 111 files changed, 1468 insertions(+), 170 deletions(-) diff --git a/app_build/.gitignore b/app_build/.gitignore index 897e31a843..a43bd6fdf3 100644 --- a/app_build/.gitignore +++ b/app_build/.gitignore @@ -1,6 +1,15 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE_KHZG file. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. debug_out release_out diff --git a/app_build/__init__.py b/app_build/__init__.py index 5513928de6..8a0d2b732f 100644 --- a/app_build/__init__.py +++ b/app_build/__init__.py @@ -1,3 +1,12 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE_KHZG file. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/app_build/build_dill.py b/app_build/build_dill.py index 24af312de3..a26e6cfaea 100644 --- a/app_build/build_dill.py +++ b/app_build/build_dill.py @@ -1,6 +1,15 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE_KHZG file. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. #!/usr/bin/python import excute_util diff --git a/app_build/config.py b/app_build/config.py index 2c4a366136..322241ac8b 100644 --- a/app_build/config.py +++ b/app_build/config.py @@ -1,6 +1,15 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE_KHZG file. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. #!/usr/bin/python import sys diff --git a/app_build/debug.py b/app_build/debug.py index d085e3c6af..350ae37213 100644 --- a/app_build/debug.py +++ b/app_build/debug.py @@ -1,6 +1,14 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE_KHZG file.language governing permissions and +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and # limitations under the License. #!/usr/bin/python diff --git a/app_build/env_util.py b/app_build/env_util.py index 0a62ad92d1..8fbc139d88 100644 --- a/app_build/env_util.py +++ b/app_build/env_util.py @@ -1,6 +1,15 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE_KHZG file. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. #!/usr/bin/python import os diff --git a/app_build/excute_util.py b/app_build/excute_util.py index f2221de74b..6dbd289833 100644 --- a/app_build/excute_util.py +++ b/app_build/excute_util.py @@ -1,6 +1,15 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE_KHZG file. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import subprocess from datetime import datetime diff --git a/app_build/file_util.py b/app_build/file_util.py index d51a82478b..0189665f06 100644 --- a/app_build/file_util.py +++ b/app_build/file_util.py @@ -1,6 +1,15 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE_KHZG file. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. #!/usr/bin/python import shutil diff --git a/app_build/release.py b/app_build/release.py index 6241064c3c..62427c3eee 100644 --- a/app_build/release.py +++ b/app_build/release.py @@ -1,6 +1,15 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE_KHZG file. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. #!/usr/bin/python import config diff --git a/dev/benchmarks/complex_layout/ohos/build-profile.json5 b/dev/benchmarks/complex_layout/ohos/build-profile.json5 index 8938b90e0f..7ceb22efee 100644 --- a/dev/benchmarks/complex_layout/ohos/build-profile.json5 +++ b/dev/benchmarks/complex_layout/ohos/build-profile.json5 @@ -1,3 +1,18 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + { "app": { "signingConfigs": [], diff --git a/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 b/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 index 6de31ee224..633d360fbc 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "apiType": 'stageMode', diff --git a/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts b/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts index 8c73fe7ecd..894fc15c6b 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts +++ b/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 b/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 index 80aa77e3db..dabaee1315 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "name": "entry", diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets index f99d5d0a17..8bc48be877 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets index 45af41b576..1125f9fdd9 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import common from '@ohos.app.ability.common'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 b/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 index 5bd7950ba5..7bbf78b18f 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "module": { "name": "entry", diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 8abf7f2f44..25d4c71ff3 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,3 +1,18 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets index d766fe249d..f4140030e6 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,3 +1,18 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + import abilityTest from './Ability.test' export default function testsuite() { diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 42fcf69c98..4ca645e601 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index 5942443207..cef0447cd2 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 8b02fe38cf..1def08f2e9 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 index e29411f46a..fab77ce2e0 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "module": { diff --git a/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 b/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 index e7b855ac20..541ba35711 100644 --- a/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 +++ b/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/complex_layout/ohos/hvigorfile.ts b/dev/benchmarks/complex_layout/ohos/hvigorfile.ts index dc3689cac5..8f2d2aafe6 100644 --- a/dev/benchmarks/complex_layout/ohos/hvigorfile.ts +++ b/dev/benchmarks/complex_layout/ohos/hvigorfile.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/complex_layout/ohos/oh-package.json5 b/dev/benchmarks/complex_layout/ohos/oh-package.json5 index d0d5dd2e6f..0547594c0d 100644 --- a/dev/benchmarks/complex_layout/ohos/oh-package.json5 +++ b/dev/benchmarks/complex_layout/ohos/oh-package.json5 @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 b/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 index e7ef02284e..5fcb3dc466 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "app": { diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 index 11a8dca6f9..633d360fbc 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "apiType": 'stageMode', diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts b/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts index 8c73fe7ecd..894fc15c6b 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 index ecce1057f9..dabaee1315 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "name": "entry", diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets index f99d5d0a17..8bc48be877 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets index 45af41b576..1125f9fdd9 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import common from '@ohos.app.ability.common'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 index 5bd7950ba5..7bbf78b18f 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "module": { "name": "entry", diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index fefeb6ea18..25d4c71ff3 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets index 348ab4ea9e..f4140030e6 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import abilityTest from './Ability.test' diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 42fcf69c98..4ca645e601 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index 5942443207..cef0447cd2 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 8b02fe38cf..1def08f2e9 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 index e29411f46a..fab77ce2e0 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "module": { diff --git a/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 b/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 index 0e35b0d60f..541ba35711 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts b/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts index dc3689cac5..8f2d2aafe6 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 b/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 index c341a8f271..c640999ec2 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/lib/src/commands/build_hap.dart b/packages/flutter_tools/lib/src/commands/build_hap.dart index 20c3aa3074..4adc519d22 100644 --- a/packages/flutter_tools/lib/src/commands/build_hap.dart +++ b/packages/flutter_tools/lib/src/commands/build_hap.dart @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_har.dart b/packages/flutter_tools/lib/src/commands/build_har.dart index 5e9a90dbba..0edbc0fc80 100644 --- a/packages/flutter_tools/lib/src/commands/build_har.dart +++ b/packages/flutter_tools/lib/src/commands/build_har.dart @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_hsp.dart b/packages/flutter_tools/lib/src/commands/build_hsp.dart index f68f1aeb75..9b8137409e 100644 --- a/packages/flutter_tools/lib/src/commands/build_hsp.dart +++ b/packages/flutter_tools/lib/src/commands/build_hsp.dart @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/build_env.dart b/packages/flutter_tools/lib/src/ohos/build_env.dart index b5b07e5af0..e38dc143cd 100644 --- a/packages/flutter_tools/lib/src/ohos/build_env.dart +++ b/packages/flutter_tools/lib/src/ohos/build_env.dart @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ diff --git a/packages/flutter_tools/lib/src/ohos/hdc_server.dart b/packages/flutter_tools/lib/src/ohos/hdc_server.dart index 5569907512..5748f09e08 100644 --- a/packages/flutter_tools/lib/src/ohos/hdc_server.dart +++ b/packages/flutter_tools/lib/src/ohos/hdc_server.dart @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import 'dart:io'; diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index e184ea49a9..99e0560836 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import 'dart:convert'; diff --git a/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart b/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart index af2a670ff0..ea3fa101af 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import 'dart:convert'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl index 1d8b56bd87..0d8b167e6c 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "app": { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl index 6de31ee224..633d360fbc 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl index 8c73fe7ecd..894fc15c6b 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl index d0e6a68b31..dabaee1315 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl index f85a65508a..8bc48be877 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl index 7bb6543fe7..1125f9fdd9 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 index 5bd7950ba5..7bbf78b18f 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "module": { "name": "entry", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets index 8abf7f2f44..25d4c71ff3 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,3 +1,18 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets index d766fe249d..f4140030e6 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets @@ -1,3 +1,18 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + import abilityTest from './Ability.test' export default function testsuite() { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets index e3f6e911d3..4ca645e601 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,3 +1,18 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets index 5942443207..cef0447cd2 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 8b02fe38cf..1def08f2e9 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl index 7e88ff7ccc..fab77ce2e0 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl index e7b855ac20..541ba35711 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl index dc3689cac5..8f2d2aafe6 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl index 8f51f697f8..a5bc0bec4b 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ { diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl index aebb05d26a..75b957106e 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl @@ -1,3 +1,18 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + { "app": { "signingConfigs": [], diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl index 6de31ee224..633d360fbc 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl index 98b5db417e..894fc15c6b 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl index a5bfaf0e62..6f7b62b27e 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "name": "entry", diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl index 08dc3c6dcb..0f7f6669df 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '@ohos/flutter_module'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl index 7bb6543fe7..1125f9fdd9 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 index 809307d2e1..156fac615e 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "module": { "name": "entry", diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets index fefeb6ea18..25d4c71ff3 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets index 073c11f4d5..f4140030e6 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import abilityTest from './Ability.test' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets index 242b0c6c21..4ca645e601 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets index 5942443207..cef0447cd2 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 8b02fe38cf..1def08f2e9 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl index 3b02a75a22..fab77ce2e0 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "module": { diff --git a/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl index c129d89c4d..0de1d44b66 100644 --- a/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "app": { diff --git a/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl index 0db77d9a26..38968fc7e4 100644 --- a/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl index e7b855ac20..541ba35711 100644 --- a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl index dc3689cac5..8f2d2aafe6 100644 --- a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl index 11a8dca6f9..633d360fbc 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl index 00b0bc719c..d3aba127d6 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import { harTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets index b90535efc0..ee4e374b29 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ export { GeneratedPluginRegistrant } from './src/main/ets/plugins/GeneratedPluginRegistrant' \ No newline at end of file diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl index f16bb33f6f..1fa6a4dfea 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "name": "@ohos/flutter_module", diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 index 61b1982a96..81d88ba3a3 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "module": { "name": "flutter_module", diff --git a/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl b/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl index 8c3ee5813e..a4d4c30b47 100644 --- a/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl +++ b/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import {{pluginClass}} from './src/main/ets/components/plugin/{{pluginClass}}'; export default {{pluginClass}}; diff --git a/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart b/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart index f887685b5b..042aef1030 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart @@ -1,3 +1,17 @@ +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import 'package:flutter_tools/src/ohos/hdc_server.dart'; import 'package:flutter_tools/src/ohos/ohos_sdk.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart b/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart index 63ead16ddb..3ac7d9501d 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart @@ -1,4 +1,17 @@ - +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import 'dart:async'; import 'dart:convert'; diff --git a/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart b/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart index 8e8cd29f12..deb9499ef4 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart @@ -1,3 +1,17 @@ +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import 'package:file/file.dart'; import 'package:flutter_tools/src/convert.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart index c1379cd345..ce010cb8b2 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart @@ -1,4 +1,17 @@ - +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart index 0548ea29b5..bbf9f4ca13 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart @@ -1,4 +1,17 @@ - +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/logger.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart index 580c9621da..c0c915b78f 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart @@ -1,4 +1,17 @@ - +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import 'package:flutter_tools/src/application_package.dart'; import 'package:flutter_tools/src/ohos/ohos_device.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart index 03564e677d..357363336c 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart @@ -1,3 +1,17 @@ +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/config.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart index ce8723adeb..de4ceb5064 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart @@ -1,4 +1,17 @@ - +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart index e65cb789bf..1485d76f9d 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart @@ -1,4 +1,17 @@ - +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/config.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart index 22e36f4f9c..e0cff7ef0a 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart @@ -1,4 +1,17 @@ - +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import 'package:flutter_tools/src/ohos/ohos_sdk.dart'; import 'package:flutter_tools/src/ohos/ohos_workflow.dart'; diff --git a/packages/integration_test/example/ohos/entry/build-profile.json5 b/packages/integration_test/example/ohos/entry/build-profile.json5 index 11a8dca6f9..633d360fbc 100644 --- a/packages/integration_test/example/ohos/entry/build-profile.json5 +++ b/packages/integration_test/example/ohos/entry/build-profile.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "apiType": 'stageMode', diff --git a/packages/integration_test/example/ohos/entry/hvigorfile.ts b/packages/integration_test/example/ohos/entry/hvigorfile.ts index 8c73fe7ecd..894fc15c6b 100644 --- a/packages/integration_test/example/ohos/entry/hvigorfile.ts +++ b/packages/integration_test/example/ohos/entry/hvigorfile.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets index f99d5d0a17..8bc48be877 100644 --- a/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; diff --git a/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets b/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets index 912710312d..ac2b5dc723 100644 --- a/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets +++ b/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import common from '@ohos.app.ability.common'; diff --git a/packages/integration_test/example/ohos/entry/src/main/module.json5 b/packages/integration_test/example/ohos/entry/src/main/module.json5 index 5bd7950ba5..7bbf78b18f 100644 --- a/packages/integration_test/example/ohos/entry/src/main/module.json5 +++ b/packages/integration_test/example/ohos/entry/src/main/module.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "module": { "name": "entry", diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index fefeb6ea18..25d4c71ff3 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets index 348ab4ea9e..f4140030e6 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import abilityTest from './Ability.test' diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 42fcf69c98..4ca645e601 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,3 +1,17 @@ +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index 5942443207..cef0447cd2 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import hilog from '@ohos.hilog'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 8b02fe38cf..1def08f2e9 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import hilog from '@ohos.hilog'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 b/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 index e29411f46a..fab77ce2e0 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "module": { diff --git a/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 b/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 index 0e35b0d60f..541ba35711 100644 --- a/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 +++ b/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 @@ -1,4 +1,17 @@ - +/* +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ { "modelVersion": "5.0.0", diff --git a/packages/integration_test/example/ohos/hvigorfile.ts b/packages/integration_test/example/ohos/hvigorfile.ts index dc3689cac5..8f2d2aafe6 100644 --- a/packages/integration_test/example/ohos/hvigorfile.ts +++ b/packages/integration_test/example/ohos/hvigorfile.ts @@ -1,7 +1,16 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/integration_test/ohos/Index.ets b/packages/integration_test/ohos/Index.ets index 4bc284a83c..9cb1e4ae7c 100644 --- a/packages/integration_test/ohos/Index.ets +++ b/packages/integration_test/ohos/Index.ets @@ -1,8 +1,17 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ +/** + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import IntegrationTestPlugin from './src/main/ets/components/integration_test/IntegrationTestPlugin'; export default IntegrationTestPlugin; -- Gitee From f8f357b51195545a3fd53625e0b699b841b954dd Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Thu, 16 Jan 2025 18:12:31 +0800 Subject: [PATCH 33/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- .../integration_test/ohos/src/test/List.test.ets | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/integration_test/ohos/src/test/List.test.ets b/packages/integration_test/ohos/src/test/List.test.ets index af9973d978..4b699aaccc 100644 --- a/packages/integration_test/ohos/src/test/List.test.ets +++ b/packages/integration_test/ohos/src/test/List.test.ets @@ -1,4 +1,17 @@ - +/** + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import localUnitTest from './LocalUnit.test'; export default function testsuite() { -- Gitee From 83ea1bf102b5c5f457ed441481a607877d04a83a Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Mon, 20 Jan 2025 11:07:32 +0800 Subject: [PATCH 34/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- .../complex_layout/ohos/build-profile.json5 | 15 --------------- .../complex_layout/ohos/entry/build-profile.json5 | 14 -------------- .../complex_layout/ohos/entry/oh-package.json5 | 14 -------------- .../ohos/entry/src/main/module.json5 | 15 +-------------- .../entry/src/ohosTest/ets/test/Ability.test.ets | 15 --------------- .../entry/src/ohosTest/ets/test/List.test.ets | 15 --------------- .../src/ohosTest/ets/testability/TestAbility.ets | 14 -------------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 14 -------------- .../ohos/entry/src/ohosTest/module.json5 | 15 +-------------- .../ohos/hvigor/hvigor-config.json5 | 14 -------------- .../complex_layout/ohos/oh-package.json5 | 14 -------------- .../macrobenchmarks/ohos/build-profile.json5 | 15 +-------------- .../ohos/entry/build-profile.json5 | 15 +-------------- .../macrobenchmarks/ohos/entry/oh-package.json5 | 15 +-------------- .../ohos/entry/src/main/module.json5 | 15 +-------------- .../entry/src/ohosTest/ets/test/Ability.test.ets | 14 -------------- .../entry/src/ohosTest/ets/test/List.test.ets | 14 -------------- .../src/ohosTest/ets/testability/TestAbility.ets | 14 -------------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 14 -------------- .../ohos/entry/src/ohosTest/module.json5 | 15 +-------------- .../ohos/hvigor/hvigor-config.json5 | 15 +-------------- .../macrobenchmarks/ohos/oh-package.json5 | 15 +-------------- .../app_shared/ohos.tmpl/build-profile.json5.tmpl | 14 -------------- .../ohos.tmpl/entry/build-profile.json5.tmpl | 14 -------------- .../app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl | 14 -------------- .../ohos.tmpl/entry/oh-package.json5.tmpl | 14 -------------- .../main/ets/entryability/EntryAbility.ets.tmpl | 14 -------------- .../entry/src/main/ets/pages/Index.ets.tmpl | 14 -------------- .../ohos.tmpl/entry/src/main/module.json5 | 15 +-------------- .../entry/src/ohosTest/ets/test/Ability.test.ets | 15 --------------- .../entry/src/ohosTest/ets/test/List.test.ets | 15 --------------- .../src/ohosTest/ets/testability/TestAbility.ets | 15 --------------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 14 -------------- .../entry/src/ohosTest/module.json5.tmpl | 14 -------------- .../ohos.tmpl/hvigor/hvigor-config.json5.tmpl | 14 -------------- .../app_shared/ohos.tmpl/hvigorfile.ts.tmpl | 14 -------------- .../app_shared/ohos.tmpl/oh-package.json5.tmpl | 15 +-------------- .../ohos/host_app_common/build-profile.json5.tmpl | 15 +-------------- .../entry.tmpl/build-profile.json5.tmpl | 14 -------------- .../host_app_common/entry.tmpl/hvigorfile.ts.tmpl | 14 -------------- .../entry.tmpl/oh-package.json5.tmpl | 14 -------------- .../main/ets/entryability/EntryAbility.ets.tmpl | 14 -------------- .../entry.tmpl/src/main/ets/pages/Index.ets.tmpl | 14 -------------- .../entry.tmpl/src/main/module.json5 | 15 +-------------- .../src/ohosTest/ets/test/Ability.test.ets | 14 -------------- .../src/ohosTest/ets/test/List.test.ets | 14 -------------- .../src/ohosTest/ets/testability/TestAbility.ets | 14 -------------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 14 -------------- .../entry.tmpl/src/ohosTest/module.json5.tmpl | 14 -------------- .../ohos/host_config/build-profile.json5.tmpl | 15 +-------------- .../module/ohos/host_config/oh-package.json5.tmpl | 14 -------------- .../hvigor_plugin/hvigor/hvigor-config.json5.tmpl | 14 -------------- .../module/ohos/hvigor_plugin/hvigorfile.ts.tmpl | 14 -------------- .../flutter_module.tmpl/build-profile.json5.tmpl | 15 +-------------- .../flutter_module.tmpl/hvigorfile.ts.tmpl | 15 +-------------- .../flutter_module.tmpl/oh-package.json5.tmpl | 14 -------------- .../flutter_module.tmpl/src/main/module.json5 | 15 +-------------- .../templates/plugin/ohos.tmpl/index.ets.tmpl | 15 +-------------- .../test/general.shard/ohos/hdc_server_test.dart | 14 -------------- .../test/general.shard/ohos/hvigor_test.dart | 14 -------------- .../general.shard/ohos/hvigor_utils_test.dart | 15 +-------------- .../ohos/ohos_application_package_test.dart | 14 -------------- .../ohos/ohos_device_discovery_test.dart | 14 -------------- .../test/general.shard/ohos/ohos_device_test.dart | 14 -------------- .../test/general.shard/ohos/ohos_doctor_test.dart | 14 -------------- .../ohos/ohos_plugins_manager_test.dart | 14 -------------- .../test/general.shard/ohos/ohos_sdk_test.dart | 15 +-------------- .../general.shard/ohos/ohos_workflow_test.dart | 14 -------------- .../example/ohos/entry/build-profile.json5 | 15 +-------------- .../example/ohos/entry/src/main/module.json5 | 15 +-------------- .../entry/src/ohosTest/ets/test/Ability.test.ets | 14 -------------- .../entry/src/ohosTest/ets/test/List.test.ets | 15 +-------------- .../src/ohosTest/ets/testability/TestAbility.ets | 15 +-------------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 14 -------------- .../example/ohos/entry/src/ohosTest/module.json5 | 14 -------------- .../example/ohos/hvigor/hvigor-config.json5 | 14 -------------- .../integration_test/ohos/src/test/List.test.ets | 15 +-------------- 77 files changed, 25 insertions(+), 1084 deletions(-) diff --git a/dev/benchmarks/complex_layout/ohos/build-profile.json5 b/dev/benchmarks/complex_layout/ohos/build-profile.json5 index 7ceb22efee..8938b90e0f 100644 --- a/dev/benchmarks/complex_layout/ohos/build-profile.json5 +++ b/dev/benchmarks/complex_layout/ohos/build-profile.json5 @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - { "app": { "signingConfigs": [], diff --git a/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 b/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 index 633d360fbc..6de31ee224 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "apiType": 'stageMode', diff --git a/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 b/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 index dabaee1315..80aa77e3db 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "name": "entry", diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 b/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 index 7bbf78b18f..5bd7950ba5 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "entry", diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3..8abf7f2f44 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets index f4140030e6..d766fe249d 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - import abilityTest from './Ability.test' export default function testsuite() { diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e601..42fcf69c98 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9..47fc89b4f0 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 index fab77ce2e0..e29411f46a 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { diff --git a/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 b/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 index 541ba35711..e7b855ac20 100644 --- a/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 +++ b/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/complex_layout/ohos/oh-package.json5 b/dev/benchmarks/complex_layout/ohos/oh-package.json5 index 0547594c0d..d0d5dd2e6f 100644 --- a/dev/benchmarks/complex_layout/ohos/oh-package.json5 +++ b/dev/benchmarks/complex_layout/ohos/oh-package.json5 @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 b/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 index 5fcb3dc466..e7ef02284e 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "app": { diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 index 633d360fbc..11a8dca6f9 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "apiType": 'stageMode', diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 index dabaee1315..ecce1057f9 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "name": "entry", diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 index 7bbf78b18f..5bd7950ba5 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "entry", diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3..fefeb6ea18 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets index f4140030e6..348ab4ea9e 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import abilityTest from './Ability.test' diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e601..42fcf69c98 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9..47fc89b4f0 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 index fab77ce2e0..e29411f46a 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { diff --git a/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 b/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 index 541ba35711..0e35b0d60f 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 b/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 index c640999ec2..c341a8f271 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl index 0d8b167e6c..c521807822 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "app": { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl index 633d360fbc..6de31ee224 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl index 894fc15c6b..98b5db417e 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl index dabaee1315..80aa77e3db 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "name": "entry", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl index 8bc48be877..f85a65508a 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl index 1125f9fdd9..7bb6543fe7 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 index 7bbf78b18f..5bd7950ba5 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "entry", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3..8abf7f2f44 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets index f4140030e6..d766fe249d 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - import abilityTest from './Ability.test' export default function testsuite() { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e601..e3f6e911d3 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9..47fc89b4f0 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl index fab77ce2e0..3b02a75a22 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "module": { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl index 541ba35711..e7b855ac20 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl index 8f2d2aafe6..acfff37c8a 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl index a5bc0bec4b..75829e6fe4 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl index 75b957106e..33e535e5c3 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "app": { diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl index 633d360fbc..6de31ee224 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl index 894fc15c6b..98b5db417e 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl index 6f7b62b27e..a5bfaf0e62 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "name": "entry", diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl index 0f7f6669df..08dc3c6dcb 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '@ohos/flutter_module'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl index 1125f9fdd9..7bb6543fe7 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 index 156fac615e..809307d2e1 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "entry", diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3..fefeb6ea18 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets index f4140030e6..348ab4ea9e 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import abilityTest from './Ability.test' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e601..42fcf69c98 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9..47fc89b4f0 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl index fab77ce2e0..3b02a75a22 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "module": { diff --git a/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl index 0de1d44b66..a099777969 100644 --- a/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "app": { diff --git a/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl index 38968fc7e4..0db77d9a26 100644 --- a/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl index 541ba35711..e7b855ac20 100644 --- a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl index 8f2d2aafe6..acfff37c8a 100644 --- a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl index 633d360fbc..11a8dca6f9 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl index d3aba127d6..760996e98b 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + import { harTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl index 1fa6a4dfea..f16bb33f6f 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "name": "@ohos/flutter_module", diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 index 81d88ba3a3..61b1982a96 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "flutter_module", diff --git a/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl b/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl index a4d4c30b47..264faf5fd1 100644 --- a/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl +++ b/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + import {{pluginClass}} from './src/main/ets/components/plugin/{{pluginClass}}'; export default {{pluginClass}}; diff --git a/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart b/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart index 042aef1030..f887685b5b 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'package:flutter_tools/src/ohos/hdc_server.dart'; import 'package:flutter_tools/src/ohos/ohos_sdk.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart b/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart index 3ac7d9501d..1bd54d39a2 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'dart:async'; import 'dart:convert'; diff --git a/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart b/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart index deb9499ef4..4967e33d39 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart @@ -1,17 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + import 'package:file/file.dart'; import 'package:flutter_tools/src/convert.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart index ce010cb8b2..0e87ded631 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart index bbf9f4ca13..7b8a13d01a 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/logger.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart index c0c915b78f..4aa23b9442 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'package:flutter_tools/src/application_package.dart'; import 'package:flutter_tools/src/ohos/ohos_device.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart index 357363336c..03564e677d 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/config.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart index de4ceb5064..6fe1c5ba6a 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart index 1485d76f9d..e65cb789bf 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart @@ -1,17 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/config.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart index e0cff7ef0a..b697638774 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import 'package:flutter_tools/src/ohos/ohos_sdk.dart'; import 'package:flutter_tools/src/ohos/ohos_workflow.dart'; diff --git a/packages/integration_test/example/ohos/entry/build-profile.json5 b/packages/integration_test/example/ohos/entry/build-profile.json5 index 633d360fbc..11a8dca6f9 100644 --- a/packages/integration_test/example/ohos/entry/build-profile.json5 +++ b/packages/integration_test/example/ohos/entry/build-profile.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "apiType": 'stageMode', diff --git a/packages/integration_test/example/ohos/entry/src/main/module.json5 b/packages/integration_test/example/ohos/entry/src/main/module.json5 index 7bbf78b18f..5bd7950ba5 100644 --- a/packages/integration_test/example/ohos/entry/src/main/module.json5 +++ b/packages/integration_test/example/ohos/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + { "module": { "name": "entry", diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3..fefeb6ea18 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets index f4140030e6..073c11f4d5 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + import abilityTest from './Ability.test' diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e601..242b0c6c21 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + import UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9..47fc89b4f0 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ import hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 b/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 index fab77ce2e0..3b02a75a22 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "module": { diff --git a/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 b/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 index 541ba35711..e7b855ac20 100644 --- a/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 +++ b/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 @@ -1,17 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ { "modelVersion": "5.0.0", diff --git a/packages/integration_test/ohos/src/test/List.test.ets b/packages/integration_test/ohos/src/test/List.test.ets index 4b699aaccc..af9973d978 100644 --- a/packages/integration_test/ohos/src/test/List.test.ets +++ b/packages/integration_test/ohos/src/test/List.test.ets @@ -1,17 +1,4 @@ -/** - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + import localUnitTest from './LocalUnit.test'; export default function testsuite() { -- Gitee From 3e12a486d0e29154112866290d53a537e275124a Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Mon, 20 Jan 2025 14:11:35 +0800 Subject: [PATCH 35/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- OAT.xml | 58 +-------------------------------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/OAT.xml b/OAT.xml index c50aa96c4f..736577440b 100644 --- a/OAT.xml +++ b/OAT.xml @@ -68,62 +68,6 @@ path=".*" rule="may" type="copyright"/> - - - - - - - - + -- Gitee From e90a19050f12a492794971fc4b480af039872d42 Mon Sep 17 00:00:00 2001 From: liujiake Date: Thu, 23 Jan 2025 10:23:28 +0800 Subject: [PATCH 36/42] Update engine.ohos.version to 98b1104f Signed-off-by: liujiake --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index 732ef251a1..73068af274 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -7b02a12e253169bc56b66b501c24a717683f033c +98b1104ff3676642c6a4b62cc6a515593306fe63 -- Gitee From afe423ca2a96d35cd932f311356fe6745ec817b3 Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Wed, 5 Feb 2025 11:10:03 +0800 Subject: [PATCH 37/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- OAT.xml | 1 + app_build/.gitignore | 15 +++------------ app_build/__init__.py | 15 +++------------ app_build/build_dill.py | 15 +++------------ app_build/config.py | 15 +++------------ app_build/debug.py | 15 +++------------ app_build/env_util.py | 15 +++------------ app_build/excute_util.py | 15 +++------------ app_build/file_util.py | 15 +++------------ app_build/release.py | 15 +++------------ .../complex_layout/ohos/entry/hvigorfile.ts | 15 +++------------ .../src/main/ets/entryability/EntryAbility.ets | 15 +++------------ .../ohos/entry/src/main/ets/pages/Index.ets | 15 +++------------ .../src/ohosTest/ets/testability/pages/Index.ets | 15 +++------------ dev/benchmarks/complex_layout/ohos/hvigorfile.ts | 15 +++------------ .../macrobenchmarks/ohos/entry/hvigorfile.ts | 15 +++------------ .../src/main/ets/entryability/EntryAbility.ets | 15 +++------------ .../ohos/entry/src/main/ets/pages/Index.ets | 15 +++------------ .../src/ohosTest/ets/testability/pages/Index.ets | 15 +++------------ dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts | 15 +++------------ .../lib/src/services/raw_keyboard_ohos.dart | 15 +++------------ .../flutter_tools/lib/src/commands/build_app.dart | 15 +++------------ .../flutter_tools/lib/src/commands/build_hap.dart | 15 +++------------ .../flutter_tools/lib/src/commands/build_har.dart | 15 +++------------ .../flutter_tools/lib/src/commands/build_hsp.dart | 15 +++------------ .../flutter_tools/lib/src/ohos/build_env.dart | 15 +++------------ .../flutter_tools/lib/src/ohos/hdc_server.dart | 15 +++------------ packages/flutter_tools/lib/src/ohos/hvigor.dart | 15 +++------------ .../flutter_tools/lib/src/ohos/hvigor_utils.dart | 15 +++------------ .../src/ohosTest/ets/testability/pages/Index.ets | 15 +++------------ .../src/ohosTest/ets/testability/pages/Index.ets | 15 +++------------ .../module_library/flutter_module.tmpl/index.ets | 15 +++------------ .../example/ohos/entry/hvigorfile.ts | 15 +++------------ .../src/main/ets/entryability/EntryAbility.ets | 15 +++------------ .../ohos/entry/src/main/ets/pages/Index.ets | 15 +++------------ .../src/ohosTest/ets/testability/pages/Index.ets | 15 +++------------ .../integration_test/example/ohos/hvigorfile.ts | 15 +++------------ packages/integration_test/ohos/Index.ets | 14 -------------- 38 files changed, 109 insertions(+), 446 deletions(-) diff --git a/OAT.xml b/OAT.xml index 736577440b..4dc77be9d4 100644 --- a/OAT.xml +++ b/OAT.xml @@ -111,6 +111,7 @@ + diff --git a/app_build/.gitignore b/app_build/.gitignore index a43bd6fdf3..897e31a843 100644 --- a/app_build/.gitignore +++ b/app_build/.gitignore @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. debug_out release_out diff --git a/app_build/__init__.py b/app_build/__init__.py index 8a0d2b732f..5513928de6 100644 --- a/app_build/__init__.py +++ b/app_build/__init__.py @@ -1,12 +1,3 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. diff --git a/app_build/build_dill.py b/app_build/build_dill.py index a26e6cfaea..24af312de3 100644 --- a/app_build/build_dill.py +++ b/app_build/build_dill.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import excute_util diff --git a/app_build/config.py b/app_build/config.py index 322241ac8b..2c4a366136 100644 --- a/app_build/config.py +++ b/app_build/config.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import sys diff --git a/app_build/debug.py b/app_build/debug.py index 350ae37213..66db44c7cd 100644 --- a/app_build/debug.py +++ b/app_build/debug.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import file_util diff --git a/app_build/env_util.py b/app_build/env_util.py index 8fbc139d88..0a62ad92d1 100644 --- a/app_build/env_util.py +++ b/app_build/env_util.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import os diff --git a/app_build/excute_util.py b/app_build/excute_util.py index 6dbd289833..f2221de74b 100644 --- a/app_build/excute_util.py +++ b/app_build/excute_util.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. import subprocess from datetime import datetime diff --git a/app_build/file_util.py b/app_build/file_util.py index 0189665f06..d51a82478b 100644 --- a/app_build/file_util.py +++ b/app_build/file_util.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import shutil diff --git a/app_build/release.py b/app_build/release.py index 62427c3eee..6241064c3c 100644 --- a/app_build/release.py +++ b/app_build/release.py @@ -1,15 +1,6 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import config diff --git a/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts b/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts index 894fc15c6b..8c73fe7ecd 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts +++ b/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 8bc48be877..f99d5d0a17 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets index 1125f9fdd9..45af41b576 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import common from '@ohos.app.ability.common'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2..5942443207 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/complex_layout/ohos/hvigorfile.ts b/dev/benchmarks/complex_layout/ohos/hvigorfile.ts index 8f2d2aafe6..dc3689cac5 100644 --- a/dev/benchmarks/complex_layout/ohos/hvigorfile.ts +++ b/dev/benchmarks/complex_layout/ohos/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts b/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts index 894fc15c6b..8c73fe7ecd 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 8bc48be877..f99d5d0a17 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets index 1125f9fdd9..45af41b576 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import common from '@ohos.app.ability.common'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2..5942443207 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts b/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts index 8f2d2aafe6..dc3689cac5 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter/lib/src/services/raw_keyboard_ohos.dart b/packages/flutter/lib/src/services/raw_keyboard_ohos.dart index b54201d0a6..9c6ff843a3 100644 --- a/packages/flutter/lib/src/services/raw_keyboard_ohos.dart +++ b/packages/flutter/lib/src/services/raw_keyboard_ohos.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2024 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'keyboard_maps.g.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_app.dart b/packages/flutter_tools/lib/src/commands/build_app.dart index b5923bfbd9..6b2df6dea5 100644 --- a/packages/flutter_tools/lib/src/commands/build_app.dart +++ b/packages/flutter_tools/lib/src/commands/build_app.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2024 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_hap.dart b/packages/flutter_tools/lib/src/commands/build_hap.dart index 4adc519d22..20c3aa3074 100644 --- a/packages/flutter_tools/lib/src/commands/build_hap.dart +++ b/packages/flutter_tools/lib/src/commands/build_hap.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_har.dart b/packages/flutter_tools/lib/src/commands/build_har.dart index 0edbc0fc80..5e9a90dbba 100644 --- a/packages/flutter_tools/lib/src/commands/build_har.dart +++ b/packages/flutter_tools/lib/src/commands/build_har.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_hsp.dart b/packages/flutter_tools/lib/src/commands/build_hsp.dart index 9b8137409e..f68f1aeb75 100644 --- a/packages/flutter_tools/lib/src/commands/build_hsp.dart +++ b/packages/flutter_tools/lib/src/commands/build_hsp.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/build_env.dart b/packages/flutter_tools/lib/src/ohos/build_env.dart index e38dc143cd..b5b07e5af0 100644 --- a/packages/flutter_tools/lib/src/ohos/build_env.dart +++ b/packages/flutter_tools/lib/src/ohos/build_env.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ diff --git a/packages/flutter_tools/lib/src/ohos/hdc_server.dart b/packages/flutter_tools/lib/src/ohos/hdc_server.dart index 5748f09e08..5569907512 100644 --- a/packages/flutter_tools/lib/src/ohos/hdc_server.dart +++ b/packages/flutter_tools/lib/src/ohos/hdc_server.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'dart:io'; diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index 99e0560836..e184ea49a9 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'dart:convert'; diff --git a/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart b/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart index ea3fa101af..af2a670ff0 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'dart:convert'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2..5942443207 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2..5942443207 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets index ee4e374b29..b90535efc0 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ export { GeneratedPluginRegistrant } from './src/main/ets/plugins/GeneratedPluginRegistrant' \ No newline at end of file diff --git a/packages/integration_test/example/ohos/entry/hvigorfile.ts b/packages/integration_test/example/ohos/entry/hvigorfile.ts index 894fc15c6b..8c73fe7ecd 100644 --- a/packages/integration_test/example/ohos/entry/hvigorfile.ts +++ b/packages/integration_test/example/ohos/entry/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. diff --git a/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 8bc48be877..f99d5d0a17 100644 --- a/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; diff --git a/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets b/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets index ac2b5dc723..912710312d 100644 --- a/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets +++ b/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import common from '@ohos.app.ability.common'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2..5942443207 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import hilog from '@ohos.hilog'; diff --git a/packages/integration_test/example/ohos/hvigorfile.ts b/packages/integration_test/example/ohos/hvigorfile.ts index 8f2d2aafe6..dc3689cac5 100644 --- a/packages/integration_test/example/ohos/hvigorfile.ts +++ b/packages/integration_test/example/ohos/hvigorfile.ts @@ -1,16 +1,7 @@ /* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/integration_test/ohos/Index.ets b/packages/integration_test/ohos/Index.ets index 9cb1e4ae7c..d34b3cf281 100644 --- a/packages/integration_test/ohos/Index.ets +++ b/packages/integration_test/ohos/Index.ets @@ -1,17 +1,3 @@ -/** - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import IntegrationTestPlugin from './src/main/ets/components/integration_test/IntegrationTestPlugin'; export default IntegrationTestPlugin; -- Gitee From 447768b206f7d6a8105c0b940a3317b24e389eba Mon Sep 17 00:00:00 2001 From: chenzhensheng79 <15118029047@139.com> Date: Wed, 5 Feb 2025 17:22:23 +0800 Subject: [PATCH 38/42] update license info Signed-off-by: chenzhensheng79 <15118029047@139.com> --- OAT.xml | 1 + app_build/.gitignore | 3 --- dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts | 6 +----- .../ohos/entry/src/main/ets/entryability/EntryAbility.ets | 5 ----- .../complex_layout/ohos/entry/src/main/ets/pages/Index.ets | 6 +----- .../ohos/entry/src/ohosTest/ets/testability/pages/Index.ets | 5 ----- dev/benchmarks/complex_layout/ohos/hvigorfile.ts | 6 +----- dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts | 6 +----- .../ohos/entry/src/main/ets/entryability/EntryAbility.ets | 6 +----- .../macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets | 6 +----- .../ohos/entry/src/ohosTest/ets/testability/pages/Index.ets | 6 +----- dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts | 6 +----- .../entry/src/ohosTest/ets/testability/pages/Index.ets | 6 +----- .../entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets | 6 +----- .../ohos/module_library/flutter_module.tmpl/index.ets | 5 ----- packages/integration_test/example/ohos/entry/hvigorfile.ts | 6 +----- .../ohos/entry/src/main/ets/entryability/EntryAbility.ets | 5 ----- .../example/ohos/entry/src/main/ets/pages/Index.ets | 6 +----- .../ohos/entry/src/ohosTest/ets/testability/pages/Index.ets | 5 ----- packages/integration_test/example/ohos/hvigorfile.ts | 6 +----- 20 files changed, 14 insertions(+), 93 deletions(-) diff --git a/OAT.xml b/OAT.xml index 4dc77be9d4..aba6944fef 100644 --- a/OAT.xml +++ b/OAT.xml @@ -96,6 +96,7 @@ + diff --git a/app_build/.gitignore b/app_build/.gitignore index 897e31a843..4e5ab5126b 100644 --- a/app_build/.gitignore +++ b/app_build/.gitignore @@ -1,6 +1,3 @@ -# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE_KHZG file. debug_out release_out diff --git a/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts b/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts index 8c73fe7ecd..bcd2cf7dc3 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts +++ b/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets index f99d5d0a17..f85a65508a 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,8 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets index 45af41b576..f888d06192 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index 5942443207..6466fb9197 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,8 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/complex_layout/ohos/hvigorfile.ts b/dev/benchmarks/complex_layout/ohos/hvigorfile.ts index dc3689cac5..76cbff657f 100644 --- a/dev/benchmarks/complex_layout/ohos/hvigorfile.ts +++ b/dev/benchmarks/complex_layout/ohos/hvigorfile.ts @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts b/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts index 8c73fe7ecd..bcd2cf7dc3 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets index f99d5d0a17..efc4c75daf 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets index 45af41b576..f888d06192 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index 5942443207..545843d394 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + import hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts b/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts index dc3689cac5..76cbff657f 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + import { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets index 5942443207..545843d394 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets index 5942443207..545843d394 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets index b90535efc0..0d5f99ca41 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets @@ -1,7 +1,2 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ export { GeneratedPluginRegistrant } from './src/main/ets/plugins/GeneratedPluginRegistrant' \ No newline at end of file diff --git a/packages/integration_test/example/ohos/entry/hvigorfile.ts b/packages/integration_test/example/ohos/entry/hvigorfile.ts index 8c73fe7ecd..bcd2cf7dc3 100644 --- a/packages/integration_test/example/ohos/entry/hvigorfile.ts +++ b/packages/integration_test/example/ohos/entry/hvigorfile.ts @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets index f99d5d0a17..f85a65508a 100644 --- a/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,8 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; diff --git a/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets b/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets index 912710312d..3005e8388b 100644 --- a/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets +++ b/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index 5942443207..6466fb9197 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,8 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ import hilog from '@ohos.hilog'; diff --git a/packages/integration_test/example/ohos/hvigorfile.ts b/packages/integration_test/example/ohos/hvigorfile.ts index dc3689cac5..76cbff657f 100644 --- a/packages/integration_test/example/ohos/hvigorfile.ts +++ b/packages/integration_test/example/ohos/hvigorfile.ts @@ -1,8 +1,4 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. -* Use of this source code is governed by a BSD-style license that can be -* found in the LICENSE_KHZG file. -*/ + import { appTasks } from '@ohos/hvigor-ohos-plugin'; -- Gitee From d3703d8f8e8190854718458809c2e174a28670d6 Mon Sep 17 00:00:00 2001 From: liujiake Date: Thu, 6 Feb 2025 16:39:45 +0800 Subject: [PATCH 39/42] Update engine.ohos.version to 1c113842 Signed-off-by: liujiake --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index 73068af274..c7467bbcc8 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -98b1104ff3676642c6a4b62cc6a515593306fe63 +1c113842cd2ed24ac738f07f0ab25d37a559a604 -- Gitee From 9fee996cad7016d068f4f225de9bba38854f4f32 Mon Sep 17 00:00:00 2001 From: gxzmf <279822581@qq.com> Date: Fri, 7 Feb 2025 16:16:39 +0800 Subject: [PATCH 40/42] =?UTF-8?q?1.0.4=E7=89=88=E6=9C=AC=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gxzmf <279822581@qq.com> --- README.en.md | 1 + README.md | 1 + ...lutter 3.7.12-ohos 1.0.4 ReleaseNote.en.md | 22 +++++++++++++++++++ .../Flutter 3.7.12-ohos 1.0.4 ReleaseNote.md | 22 +++++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.en.md create mode 100644 release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.md diff --git a/README.en.md b/README.en.md index 822718be49..85efbdc7c0 100644 --- a/README.en.md +++ b/README.en.md @@ -123,6 +123,7 @@ This repository is an extension of the Flutter SDK for compatibility with OpenHa ``` ## Release Notes + - [3.7.12-ohos-1.0.4 Release](/release-notes/Flutter%203.7.12-ohos%201.0.4%20ReleaseNote.en.md) - [3.7.12-ohos-1.0.3 Release](/release-notes/Flutter%203.7.12-ohos%201.0.3%20ReleaseNote.en.md) - [3.7.12-ohos-1.0.2 Release](/release-notes/Flutter%203.7.12-ohos%201.0.2%20ReleaseNote.en.md) - [3.7.12-ohos-1.0.1 Release](/release-notes/Flutter%203.7.12-ohos%201.0.1%20ReleaseNote.en.md) diff --git a/README.md b/README.md index 7c3e571e51..1af0118460 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,7 @@ Flutter SDK 仓库 ``` ## 版本说明 + - [3.7.12-ohos-1.0.4 Release](/release-notes/Flutter%203.7.12-ohos%201.0.4%20ReleaseNote.md) - [3.7.12-ohos-1.0.3 Release](/release-notes/Flutter%203.7.12-ohos%201.0.3%20ReleaseNote.md) - [3.7.12-ohos-1.0.2 Release](/release-notes/Flutter%203.7.12-ohos%201.0.2%20ReleaseNote.md) - [3.7.12-ohos-1.0.1 Release](/release-notes/Flutter%203.7.12-ohos%201.0.1%20ReleaseNote.md) diff --git a/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.en.md b/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.en.md new file mode 100644 index 0000000000..2ee14ac452 --- /dev/null +++ b/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.en.md @@ -0,0 +1,22 @@ +## Version Overview +This version is Flutter OpenHarmony platform version 1.0.4, based on Flutter version 3.7.12. This version supports and improves the capabilities of the OpenHarmony platform and supports drag features. + +## Release Scope +HarmonyOS NEXT, API13 + +## New Features +- Support drag features + +## Version Release Time +February 7, 2025 + +## Version Support +- ROM: 205.0.1.115 +- IDE: DevEco Studio 5.0.5.330 +- Flutter SDK: 3.7.12-ohos-1.0.4 + +## Enablement Documents +- [Document Link](https://gitee.com/openharmony-sig/flutter_samples/tree/master/ohos/docs) + +## Fixed Issues +- External texture related issues \ No newline at end of file diff --git a/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.md b/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.md new file mode 100644 index 0000000000..d9dd7fd4ed --- /dev/null +++ b/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.md @@ -0,0 +1,22 @@ +## 版本概述 +本版本为Flutter OpenHarmony平台1.0.4版本，基于Flutter 3.7.12版本适配。本版本支持和完善OpenHarmony平台侧能力，支持拖拽特性。 + +## 发布范围 +HarmonyOS NEXT, API13 + +## 新增特性 +- 支持拖拽特性 + +## 版本发布时间 +2025年2月7日 + +## 版本配套 +- ROM: 205.0.1.115 +- IDE: DevEco Studio 5.0.5.330 +- Flutter SDK: 3.7.12-ohos-1.0.4 + +## 赋能文档 +- [文档链接](https://gitee.com/openharmony-sig/flutter_samples/tree/master/ohos/docs) + +## 修复问题 +- 外接纹理相关问题 \ No newline at end of file -- Gitee From f9c241a8e8ad1dcca60294e4a8dc13555d4e99fa Mon Sep 17 00:00:00 2001 From: liujiake Date: Tue, 11 Feb 2025 21:10:54 +0800 Subject: [PATCH 41/42] Update engine.ohos.version to dab3e001 Signed-off-by: liujiake --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index c7467bbcc8..8871ec58fb 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -1c113842cd2ed24ac738f07f0ab25d37a559a604 +dab3e00125d8626e018d5f021c377f0d53bece8e -- Gitee From de8c1858f2b0987dc50e57893d725827fdc803e5 Mon Sep 17 00:00:00 2001 From: liujiake Date: Wed, 19 Feb 2025 21:44:25 +0800 Subject: [PATCH 42/42] Update engine.ohos.version to a9e521ff Signed-off-by: liujiake --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index 8871ec58fb..5cbc1885ab 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -dab3e00125d8626e018d5f021c377f0d53bece8e +a9e521ff880033ab7bfecc6903da552483a506e1 \ No newline at end of file -- Gitee