更新依赖

build.gradle

@@ -3,15 +3,15 @@
 buildscript {
     ext {
         javaVersion = JavaVersion.VERSION_1_8
-        kotlinVersion = '1.3.72'
+        kotlinVersion = '1.4.10'
         ndkVersion = '21.3.6528147'
         minSdkVersion = 21
         sdkVersion = 30
         compileSdkVersion = 30
-        buildToolsVersion = '30.0.1'
-        desugarLibsVersion = '1.0.9'
-        versionCode = 407
-        versionName = '5.0.6R'
+        buildToolsVersion = '30.0.2'
+        desugarLibsVersion = '1.0.10'
+        versionCode = 408
+        versionName = '5.0.6R.1'
         resConfigs = ['zh-rCN']
     }
 
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0-alpha04'
+        classpath 'com.android.tools.build:gradle:4.2.0-alpha12'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }

core/build.gradle

@@ -45,20 +45,21 @@ androidExtensions {
     experimental = true
 }
 
-def coroutinesVersion = '1.3.6'
+def coroutinesVersion = '1.3.9'
 def lifecycleVersion = '2.2.0'
 def roomVersion = '2.2.5'
 def workVersion = '2.3.4'
 dependencies {
     api project(':plugin')
+    api 'androidx.appcompat:appcompat:1.2.0'
     api 'androidx.fragment:fragment-ktx:1.2.5'
     api "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
     api "androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion"
     api 'androidx.preference:preference-ktx:1.1.1'
     api "androidx.room:room-runtime:$roomVersion"
     api "androidx.work:work-runtime-ktx:$workVersion"
     api 'com.google.code.gson:gson:2.8.6'
-    api 'dnsjava:dnsjava:3.2.1'
+    api 'dnsjava:dnsjava:3.2.2'
     api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
     api 'org.connectbot.jsocks:jsocks:1.0.0'
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugarLibsVersion"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -29,6 +29,9 @@ 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"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ 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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

mobile/build.gradle

@@ -65,11 +65,11 @@ androidExtensions.experimental true
 dependencies {
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugarLibsVersion"
     implementation project(':core')
-    implementation 'androidx.browser:browser:1.3.0-alpha04'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
+    implementation 'androidx.browser:browser:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
     implementation 'com.google.zxing:core:3.4.0'
     implementation 'com.takisoft.preferencex:preferencex-simplemenu:1.1.0'
     implementation 'com.twofortyfouram:android-plugin-api-for-locale:1.0.4'
-    implementation 'me.zhanghai.android.fastscroll:library:1.1.3'
+    implementation 'me.zhanghai.android.fastscroll:library:1.1.4'
 }

mobile/r8-rules.pro

@@ -1,4 +1,4 @@
--keepattributes InnerClasses
+-keepnames class kotlin.Pair
 -allowaccessmodification
 -repackageclasses
 -keepclassmembers class * implements android.os.Parcelable {

plugin/build.gradle

@@ -26,8 +26,8 @@ androidExtensions {
 }
 
 dependencies {
-    api 'androidx.core:core-ktx:1.3.0'
-    api 'androidx.drawerlayout:drawerlayout:1.1.0'
-    api 'com.google.android.material:material:1.3.0-alpha01'
-    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    api 'androidx.core:core-ktx:1.3.1'
+    api 'androidx.drawerlayout:drawerlayout:1.1.1'
+    api 'com.google.android.material:material:1.2.1'
+    api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 }