From 85f498075989765a92ebb7bd4f678d7932a6d347 Mon Sep 17 00:00:00 2001
From: lele <879860859@qq.com>
Date: Thu, 1 Jul 2021 01:08:08 +0000
Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20grad?=
 =?UTF-8?q?lew.bat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradlew.bat | 103 ----------------------------------------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 gradlew.bat

diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index 62bd9b9..0000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,103 +0,0 @@
-@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
-- 
Gitee


From ea09d1b4752ea51a8fbefe438b126520a9f411f0 Mon Sep 17 00:00:00 2001
From: lele <879860859@qq.com>
Date: Thu, 1 Jul 2021 01:16:59 +0000
Subject: [PATCH 2/4] commit

---
 README.OPENSOURCE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.OPENSOURCE b/README.OPENSOURCE
index 535d39c..332c988 100644
--- a/README.OPENSOURCE
+++ b/README.OPENSOURCE
@@ -3,7 +3,7 @@
         "Name": "Android-MultiBackStack",
         "License": "Apache License",
         "License File": "LICENSE",
-        "Version Number": " release 1.2.1 ",
+        "Version Number": "1.2.1 ",
         "Upstream URL": "https://github.com/JetradarMobile/android-multibackstack",
         "Description": "Persistent bottom navigation like in instagram"
     }
-- 
Gitee


From 4e0855f47540671e9b305e473e8ad31f2f11acfb Mon Sep 17 00:00:00 2001
From: lele <879860859@qq.com>
Date: Thu, 1 Jul 2021 09:18:48 +0800
Subject: [PATCH 3/4] commit

---
 settings.gradle | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 settings.gradle

diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..2f6e2ac
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':entry', ':multibackstack'
-- 
Gitee


From ac72361f48df3b35dbf5be9bea9cbabc6910f90a Mon Sep 17 00:00:00 2001
From: lele <879860859@qq.com>
Date: Thu, 1 Jul 2021 03:01:09 +0000
Subject: [PATCH 4/4] commit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b56c698..fdaaea3 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Ohos-MultiBackStack
 - 功能：底部状态栏切换效果
 - 项目移植状态：完成
 - 调用差异：无
-- 开发版本：sdk6，DevEco Studio2.2 Beta1
+- 开发版本：sdk6，DevEco Studio 2.2 Beta1
 - 基线版本：release 1.2.1
 
 
-- 
Gitee