diff --git a/app/build.gradle b/app/build.gradle
index 81fdefad4..62e647866 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,13 +6,13 @@ if (file('google-services.json').exists()) {
}
android {
- compileSdkVersion 28
+ compileSdkVersion 29
defaultConfig {
applicationId "com.hippo.ehviewer"
- minSdkVersion 14
- targetSdkVersion 28
- versionCode 104
+ minSdkVersion 16
+ targetSdkVersion 29
+ versionCode 105
versionName "1.7.3"
vectorDrawables.useSupportLibrary = true
resConfigs "zh", "zh-rCN", "zh-rHK", "zh-rTW",
@@ -21,6 +21,7 @@ android {
ndk {
abiFilters "armeabi-v7a", "x86"
}
+ versionNameSuffix = 'mod'
}
compileOptions {
@@ -69,10 +70,10 @@ clean {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0'
- implementation 'com.google.android.material:material:1.0.0'
- implementation 'com.google.firebase:firebase-core:16.0.9'
+ implementation 'com.google.android.material:material:1.1.0'
+ implementation 'com.google.firebase:firebase-core:17.2.3'
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
implementation 'com.getkeepsafe.relinker:relinker:1.3.1'
implementation 'com.github.amlcurran.showcaseview:library:5.4.3'
@@ -98,13 +99,13 @@ dependencies {
implementation 'com.github.seven332:yorozuya-thread:0.1.1'
implementation 'com.github.seven332:yorozuya-collect:0.1.4'
implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
- implementation 'com.squareup.okhttp3:okhttp:3.12.3'
+ implementation 'com.squareup.okhttp3:okhttp:3.14.2'
implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
implementation 'org.greenrobot:greendao:2.2.1'
- implementation 'org.jsoup:jsoup:1.12.1'
- testImplementation 'junit:junit:4.12'
- testImplementation 'org.robolectric:robolectric:4.2.1'
- testImplementation 'org.jooq:joor:0.9.6'
+ implementation 'org.jsoup:jsoup:1.12.2'
+ testImplementation 'junit:junit:4.13'
+ testImplementation 'org.robolectric:robolectric:4.3.1'
+ testImplementation 'org.jooq:joor:0.9.12'
}
configurations.all {
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 008c53ba3..91520ac3a 100755
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -464,8 +464,8 @@
在画廊列表中显示页数
显示标签翻译
显示翻译后的标签而非原始文字(需花费时间来下载数据文件)
- 补充翻译(由 EhTagTranslator 提供)
- https://github.com/Mapaler/EhTagTranslator/wiki
+ 补充翻译(由 EhTagTranslation 提供)
+ https://github.com/EhTagTranslation/Editor/wiki
屏蔽画廊
根据标题、上传者、标签屏蔽画廊
移动网络警告
diff --git a/app/src/main/res/values-zh-rHK/arrays.xml b/app/src/main/res/values-zh-rHK/arrays.xml
index e83f4ac35..fc1815cf8 100644
--- a/app/src/main/res/values-zh-rHK/arrays.xml
+++ b/app/src/main/res/values-zh-rHK/arrays.xml
@@ -19,9 +19,9 @@
- tag-translations-zh-rCN.sha1
- - https://github.com/seven332/Mapaler/raw/tag-translations/tag-translations/tag-translations-zh-rCN.sha1
+ - https://github.com/Mapaler/EhViewer/raw/tag-translations/tag-translations/tag-translations-zh-rCN.sha1
- tag-translations-zh-rCN
- - https://github.com/seven332/Mapaler/raw/tag-translations/tag-translations/tag-translations-zh-rCN
+ - https://github.com/Mapaler/EhViewer/raw/tag-translations/tag-translations/tag-translations-zh-rCN
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index b3597387a..67df4a8d2 100755
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -463,8 +463,8 @@
在畫廊列表中顯示頁數
顯示標籤翻譯
顯示翻譯後的標籤而非原始文字(需花費時間來下載數據文件)
- 補充翻譯(由 EhTagTranslator 提供)
- https://github.com/Mapaler/EhTagTranslator/wiki
+ 補充翻譯(由 EhTagTranslation 提供)
+ https://github.com/EhTagTranslation/Editor/wiki
屏蔽畫廊
根據標題、上傳者、標籤屏蔽畫廊
移動網絡警告
diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
index e83f4ac35..fc1815cf8 100644
--- a/app/src/main/res/values-zh-rTW/arrays.xml
+++ b/app/src/main/res/values-zh-rTW/arrays.xml
@@ -19,9 +19,9 @@
- tag-translations-zh-rCN.sha1
- - https://github.com/seven332/Mapaler/raw/tag-translations/tag-translations/tag-translations-zh-rCN.sha1
+ - https://github.com/Mapaler/EhViewer/raw/tag-translations/tag-translations/tag-translations-zh-rCN.sha1
- tag-translations-zh-rCN
- - https://github.com/seven332/Mapaler/raw/tag-translations/tag-translations/tag-translations-zh-rCN
+ - https://github.com/Mapaler/EhViewer/raw/tag-translations/tag-translations/tag-translations-zh-rCN
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8f4f95eb9..33f90127a 100755
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -462,8 +462,8 @@
在圖庫列表中顯示頁數
顯示標籤翻譯
顯示翻譯後的標籤而非原始文字(需花費時間來下載資料檔案)
- 補充翻譯(由 EhTagTranslator 提供)
- https://github.com/Mapaler/EhTagTranslator/wiki
+ 補充翻譯(由 EhTagTranslation 提供)
+ https://github.com/EhTagTranslation/Editor/wiki
遮蔽圖庫
根據標題、上傳者、標籤遮蔽圖庫
行動數據警告
diff --git a/build.gradle b/build.gradle
index a1cdb31f6..bcf3c892c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,15 +2,18 @@
buildscript {
repositories {
+ maven { url 'https://maven.aliyun.com/repository/google' }
+ maven { url 'https://maven.aliyun.com/repository/jcenter'}
+ maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
google()
jcenter()
maven { url "https://maven.fabric.io/public" }
maven { url "https://jitpack.io" }
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.3'
- classpath 'com.google.gms:google-services:4.3.0'
- classpath 'io.fabric.tools:gradle:1.27.1'
+ classpath 'com.android.tools.build:gradle:3.6.1'
+ classpath 'com.google.gms:google-services:4.3.3'
+ classpath 'io.fabric.tools:gradle:1.31.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -19,6 +22,9 @@ buildscript {
allprojects {
repositories {
+ maven { url 'https://maven.aliyun.com/repository/google/' }
+ maven { url 'https://maven.aliyun.com/repository/jcenter'}
+ maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
google()
jcenter()
maven { url "https://jitpack.io" }
diff --git a/daogenerator/build.gradle b/daogenerator/build.gradle
index a608c6623..1a71c3ba2 100644
--- a/daogenerator/build.gradle
+++ b/daogenerator/build.gradle
@@ -24,6 +24,6 @@ task executeDaoGenerator(type:JavaExec) {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'org.greenrobot:greendao-generator:2.2.0'
- compile 'org.jboss.forge.roaster:roaster-api:2.20.1.Final'
- compile 'org.jboss.forge.roaster:roaster-jdt:2.20.1.Final'
+ compile 'org.jboss.forge.roaster:roaster-api:2.21.1.Final'
+ compile 'org.jboss.forge.roaster:roaster-jdt:2.21.1.Final'
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cd7237a48..2510a0867 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
+#Wed Mar 04 04:30:57 CST 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip