diff --git a/README.md b/README.md index 4f0f91898f94331f457ef530b193590867325d7d..98d3ced0bb75a20cf37c6e1b728cae0eb9ea2b3d 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ - 功能:支持给Ability定义 URL,这样可以通过 URL 跳转到Ability,支持在浏览器以及 app 中跳入。 - 项目移植状态: 主功能完成 - 调用差异: 无 -- 开发版本:sdk5,DevEco Studio 2.1 Release +- 开发版本:sdk6,DevEco Studio 2.2 Beta1 - 基线版本:Releases v1.1.5 ## 项目演示 @@ -39,7 +39,7 @@ dependencies { …… } ``` -在sdk5,DevEco Studio 2.1 Release下项目可直接运行 如无法运行,删除项目.gradle,.idea,build,gradle,build.gradle文件 并依据自己的版本创建新项目,将新项目的对应文件复制到根目录下 +在sdk6,DevEco Studio 2.2 Beta1下项目可直接运行 如无法运行,删除项目.gradle,.idea,build,gradle,build.gradle文件 并依据自己的版本创建新项目,将新项目的对应文件复制到根目录下 ## 使用说明 1.在需要配置的Ability上添加注解 @@ -143,7 +143,7 @@ CodeCheck代码测试无异常 CloudTest代码测试无异常 -火绒安全病毒安全检测通过 +病毒安全检测通过 当前版本demo功能与原组件基本无差异 diff --git a/activityrouter/build.gradle b/activityrouter/build.gradle index f57872238dd9ea0ea38da364e7e1ac09145d606d..13c83c2955f8576dcbaab61bf0b5c690912c9bec 100644 --- a/activityrouter/build.gradle +++ b/activityrouter/build.gradle @@ -4,9 +4,9 @@ sourceCompatibility = "1.8" targetCompatibility = "1.8" ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } } diff --git a/activityrouter/src/main/config.json b/activityrouter/src/main/config.json index 6d71d19b278e75e2dd58b286de0e7b4ea8cecafa..c1c08b92545fc22dd37abe4633ea2b08725e678b 100644 --- a/activityrouter/src/main/config.json +++ b/activityrouter/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" } }, "deviceConfig": {}, diff --git a/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/ExtraTypes.java b/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/ExtraTypes.java index 09f6bcfb638cfc0ab515cbcbad83f2c25cc22ded..18c936ade538eacb4a33d547dcbaf792daaad567 100644 --- a/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/ExtraTypes.java +++ b/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/ExtraTypes.java @@ -52,70 +52,79 @@ public class ExtraTypes { private Map transfer; public String[] getIntExtra() { + String[] intExtra = this.intExtra; return intExtra; } public void setIntExtra(String[] intExtra) { - this.intExtra = intExtra; + this.intExtra = intExtra.clone(); } public String[] getLongExtra() { + String[] longExtra = this.longExtra; return longExtra; } public void setLongExtra(String[] longExtra) { - this.longExtra = longExtra; + this.longExtra = longExtra.clone(); } public String[] getBooleanExtra() { + String[] booleanExtra = this.booleanExtra; return booleanExtra; } public void setBooleanExtra(String[] booleanExtra) { - this.booleanExtra = booleanExtra; + this.booleanExtra = booleanExtra.clone(); } public String[] getShortExtra() { + String[] shortExtra = this.shortExtra; return shortExtra; } public void setShortExtra(String[] shortExtra) { - this.shortExtra = shortExtra; + this.shortExtra = shortExtra.clone(); } public String[] getFloatExtra() { + String[] floatExtra = this.floatExtra; return floatExtra; } public void setFloatExtra(String[] floatExtra) { - this.floatExtra = floatExtra; + this.floatExtra = floatExtra.clone(); } public String[] getDoubleExtra() { + String[] doubleExtra = this.doubleExtra; return doubleExtra; } public void setDoubleExtra(String[] doubleExtra) { - this.doubleExtra = doubleExtra; + this.doubleExtra = doubleExtra.clone(); } public String[] getByteExtra() { + String[] byteExtra = this.byteExtra; return byteExtra; } public void setByteExtra(String[] byteExtra) { - this.byteExtra = byteExtra; + this.byteExtra = byteExtra.clone(); } public String[] getCharExtra() { + String[] charExtra = this.charExtra; return charExtra; } public void setCharExtra(String[] charExtra) { - this.charExtra = charExtra; + this.charExtra = charExtra.clone(); } public Map getTransfer() { + Map transfer = this.transfer; return transfer; } diff --git a/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/RouterAbility.java b/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/RouterAbility.java index 01a1f3c0502d7aa8812b6997571285255a51423b..2a7cba61c07c31f43de620bb26a5df8ddc5de2a3 100644 --- a/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/RouterAbility.java +++ b/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/RouterAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/annotation/src/main/config.json b/annotation/src/main/config.json index 025ded63fe3181e379823b266e37ac7f2486354e..01c5fa0650258803c029606906c6f20b8995189a 100644 --- a/annotation/src/main/config.json +++ b/annotation/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" } }, "deviceConfig": {}, diff --git a/app_module/build.gradle b/app_module/build.gradle index 76346276b4ba965468281c030836ba979d4aa59f..29c265e7b10021e127bcdbf3a798bb12528da942 100644 --- a/app_module/build.gradle +++ b/app_module/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } } diff --git a/app_module/src/main/config.json b/app_module/src/main/config.json index e61cee23384282c5959c4b7ff8f7c2b3e61781e5..768f0003e3bd8f349fe12d22c5871865369ea796 100644 --- a/app_module/src/main/config.json +++ b/app_module/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" } }, "deviceConfig": {}, diff --git a/app_module/src/main/java/com/github/mzule/abilityrouter/module/ModuleAbility.java b/app_module/src/main/java/com/github/mzule/abilityrouter/module/ModuleAbility.java index 2396efc6738d818472b6574731b0ee517c557cf9..c25ef833af7d035eff156e2f576f3479c7c9783b 100644 --- a/app_module/src/main/java/com/github/mzule/abilityrouter/module/ModuleAbility.java +++ b/app_module/src/main/java/com/github/mzule/abilityrouter/module/ModuleAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/build.gradle b/build.gradle index 8cdd760a21b2f97193ac7968854468f4fc746de6..d01a82686f7db0529eb805710e4c3872235cb599 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } } @@ -25,10 +25,10 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' + classpath 'com.huawei.ohos:hap:2.4.5.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' - classpath 'com.huawei.ohos:decctest:1.0.0.6' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } diff --git a/entry/build.gradle b/entry/build.gradle index 47d07c5d6f4490433a97c0e2ceeb63f324785719..9b064f8c2b7b9a82d0e31e350a44fcb03f7c62f2 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } compileOptions { annotationEnabled true diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 01d38a259f3ed253b3c9a4666e041459bd51b693..c57adba0caaef9f565932bc837566ae1a81b82b1 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -5,10 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 } }, "deviceConfig": {}, diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/MainAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/MainAbility.java index 37bd24a4dcd97442badc935386b7b6b540b3b832..eaebe99ef1f2297d49d63d04d3304a68349e93af 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/MainAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/MainAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java b/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java index c0fa5454cc004b5f03e6980ab203da8b99a6a4a5..e3c6c8b083b4d82b975c9474aacf145855667dd0 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java @@ -1,18 +1,18 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ + package com.github.mzule.abilityrouter; import com.github.mzule.abilityrouter.annotation.Modules; @@ -34,8 +34,8 @@ import ohos.utils.net.Uri; **/ @Modules({"app", "sdk"}) public class MyApplication extends AbilityPackage implements RouterCallbackProvider { - private final int beforopenmark = 11; - private final int notFound = 2; + private static final int beforopenmark = 11; + private static final int notFound = 2; @Override public void onInitialize() { super.onInitialize(); diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/DumpExtrasAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/DumpExtrasAbility.java index c4929225729f577ad973f5ca7879de5d746555a1..0a3b680bd52185439f8efc3f57b99827c857e1b1 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/DumpExtrasAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/DumpExtrasAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/ErrorStackAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/ErrorStackAbility.java index 21bd045098ae079d6eee2fce7c70927a2624dee5..78bcc1b314b0ca82e184a25eaefb38759b4b38ad 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/ErrorStackAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/ErrorStackAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/HomeAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/HomeAbility.java index e599b5f3e5e3318e4c2a7113939bbac93f2178c1..5297e7596882bf6015336864ab8dde7f94b829dd 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/HomeAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/HomeAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/HostAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/HostAbility.java index 7def4c839b31d3dc5b539affbcbbce89fb783eb9..5660ad94dbe05314f56aa98fe56f586003baf3c1 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/HostAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/HostAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/LaunchAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/LaunchAbility.java index 9421bc55a792245f02683e326f6a5af7243a0790..9847e25416d9a4e48894acb481efb176ecabf563 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/LaunchAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/LaunchAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/MainAbilitySlice.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/MainAbilitySlice.java index ff4181e6da31bc6ae5445b2cb668c61e34feab3c..0c3f29d63df1cd793c313099e4113e1f44b50fa9 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/MainAbilitySlice.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/NonUIActions.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/NonUIActions.java index ac7a31473c233cbae4df2f7f051cf523b401bb9f..3942e36caf43eb4d6e6ce11fc13c7213ed5b8b31 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/NonUIActions.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/NonUIActions.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/NotFoundAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/NotFoundAbility.java index 572e26a47d10b3f709f37042d0b344f8dcc656db..c7af4fbe54e62ad1e996c828d786cf75d09815d6 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/NotFoundAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/NotFoundAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserAbility.java index 7fb5967da1d8079be9358857fec3c1d0c1607851..cc5e772b8184ea085eccaa792bcd452131d09444 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserCollectionAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserCollectionAbility.java index b74ee85b4520289453676f7620e3d4f4d9518f50..8829a339f926c2f59dbef5c891e64731b201c2d2 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserCollectionAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserCollectionAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * Copyright (C) 2021 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index fd1f06f1775435805eea8878dd1cf73d2788d39c..4b402bfb1587d81548d3732c711ea21c7aedb851 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/stub/src/main/config.json b/stub/src/main/config.json index 01f296a3447b686b79f4c91c0fc003bc6715073f..431ee5ec53595e75fb28882e4f202b95f9cbe37a 100644 --- a/stub/src/main/config.json +++ b/stub/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" } }, "deviceConfig": {},