From fd4bf1845fa6b0c41cd8608572970b77402bbc1a Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 10 May 2022 08:53:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                               | 1 +
 app/src/main/AndroidManifest.xml                               | 3 +--
 app/src/main/assets/updateLog.md                               | 2 ++
 .../io/legado/app/ui/association/FileAssociationActivity.kt    | 2 +-
 build.gradle                                                   | 2 +-
 epublib/build.gradle                                           | 2 +-
 epublib/src/main/AndroidManifest.xml                           | 2 +-
 gradle/wrapper/gradle-wrapper.properties                       | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d380dbb4d..e9bb04249 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,6 +20,7 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    namespace 'io.legado.app'
     signingConfigs {
         if (project.hasProperty("RELEASE_STORE_FILE")) {
             myConfig {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index da98accad..6328e86ea 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="io.legado.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md
index d8d20dcd8..3faa451f3 100644
--- a/app/src/main/assets/updateLog.md
+++ b/app/src/main/assets/updateLog.md
@@ -16,7 +16,9 @@
 * js添加 getVerificationCode startBrowserAwait
 * 监测网络变化及时更新web服务的IP
 * 优化在线tts导入
+* 优化txt规则导入
 * 替换规则添加超时字段
+* 其它一些bug修复
 
 **2022/05/02**
 
diff --git a/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
index f62d26056..11bedf6bb 100644
--- a/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
@@ -89,7 +89,7 @@ class FileAssociationActivity :
             finish()
         }
         viewModel.notSupportedLiveData.observe(this) { data ->
-            appCtx.alert(
+            alert(
                 title = appCtx.getString(R.string.draw),
                 message = appCtx.getString(R.string.file_not_supported, data.second)
             ) {
diff --git a/build.gradle b/build.gradle
index ac7512912..49eaac2b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         //maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'de.timfreiheit.resourceplaceholders:placeholders:0.4'
         classpath 'de.undercouch:gradle-download-task:5.0.1'
diff --git a/epublib/build.gradle b/epublib/build.gradle
index 44439e495..9fef4731a 100644
--- a/epublib/build.gradle
+++ b/epublib/build.gradle
@@ -5,7 +5,7 @@ plugins {
 android {
     compileSdkVersion 31
     buildToolsVersion '31.0.0'
-
+    namespace 'me.ag2s.epublib'
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 31
diff --git a/epublib/src/main/AndroidManifest.xml b/epublib/src/main/AndroidManifest.xml
index f8f3d7bea..44008a433 100644
--- a/epublib/src/main/AndroidManifest.xml
+++ b/epublib/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="me.ag2s.epublib">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 637d848e9..324b48f79 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri May 07 15:24:46 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME