diff --git a/build.gradle b/build.gradle index 27bdbecfd9a6282d2527be17038ebff9141705f1..3ae2dfc2e8aff7b1d4b0cec7e6b52904c2c8a1fb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. apply plugin: 'com.huawei.ohos.app' - +//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 6 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 6 } } - + buildscript { repositories { maven { @@ -17,11 +17,11 @@ buildscript { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' - classpath 'com.huawei.ohos:decctest:1.2.4.0' + classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } @@ -33,6 +33,6 @@ allprojects { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + jcenter() } } diff --git a/entry/build.gradle b/entry/build.gradle index bd89ee7d27dade11f3ef78ba2c0236202c6e93bf..23da3d885c2fd790273fba4eb933a5afef794865 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.huawei.ohos.decctest' ohos { compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 6 + compatibleSdkVersion 5 } buildTypes { release { diff --git a/entry/src/main/java/com/jetradar/multibackstack/sample/MainCallBack.java b/entry/src/main/java/com/jetradar/multibackstack/sample/MainCallBack.java deleted file mode 100644 index ae5ebbfcfba97ab199cf0a702a456d57ccc4696f..0000000000000000000000000000000000000000 --- a/entry/src/main/java/com/jetradar/multibackstack/sample/MainCallBack.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jetradar.multibackstack.sample; -/** - * MainCallBack - * - * @since 2021-06-10 - */ -public interface MainCallBack { - -} diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000000000000000000000000000000000..62bd9b9ccefea2b65ae41e5d9a545e2021b90a1d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/multibackstack/build.gradle b/multibackstack/build.gradle index 29231934ac368ab9c0731b0dca261212f7e289d4..7e1e475c1296e7c6d200a45810598ddff583ee7f 100644 --- a/multibackstack/build.gradle +++ b/multibackstack/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.huawei.ohos.library' -//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#ZH-CN_TOPIC_0000001154985555__section1112183053510 ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } diff --git a/multibackstack/src/main/java/com/jetradar/multibackstack/BaseAbilitySlice.java b/multibackstack/src/main/java/com/jetradar/multibackstack/BaseAbilitySlice.java index ba3b98156be7c0f293e22e518404714bb3ab7935..4be1b188b72c0a7d59fbc337e49dbb42309d62c7 100644 --- a/multibackstack/src/main/java/com/jetradar/multibackstack/BaseAbilitySlice.java +++ b/multibackstack/src/main/java/com/jetradar/multibackstack/BaseAbilitySlice.java @@ -33,7 +33,6 @@ public abstract class BaseAbilitySlice extends AbilitySlice implements CallBack list.add(action1); } } - } list.add(action1); } diff --git a/multibackstack/src/main/java/com/jetradar/multibackstack/bean/Action.java b/multibackstack/src/main/java/com/jetradar/multibackstack/bean/Action.java index 74670026cb241487e55951731203bb16bfb56683..a163fb4fe81999656b126ba4b4750314df9b5237 100644 --- a/multibackstack/src/main/java/com/jetradar/multibackstack/bean/Action.java +++ b/multibackstack/src/main/java/com/jetradar/multibackstack/bean/Action.java @@ -1,3 +1,17 @@ +/* + * 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 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT 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.jetradar.multibackstack.bean; import ohos.aafwk.ability.fraction.Fraction; diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 2f6e2acd32543c5b0c66caf779af16b17aee5227..0000000000000000000000000000000000000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':entry', ':multibackstack'