Skip to content

Commit 9142c41

Browse files
MapalerMapaler
committed
将队官方代码的修改合并到mod分支上
2 parents a61802d + 3dabfdc commit 9142c41

File tree

9 files changed

+40
-32
lines changed

9 files changed

+40
-32
lines changed

‎app/build.gradle‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ if (file('google-services.json').exists()) {
66
}
77

88
android {
9-
compileSdkVersion 28
9+
compileSdkVersion 29
1010

1111
defaultConfig {
1212
applicationId "com.hippo.ehviewer"
13-
minSdkVersion 14
14-
targetSdkVersion 28
15-
versionCode 104
13+
minSdkVersion 16
14+
targetSdkVersion 29
15+
versionCode 105
1616
versionName "1.7.3"
1717
vectorDrawables.useSupportLibrary = true
1818
resConfigs "zh", "zh-rCN", "zh-rHK", "zh-rTW",
@@ -21,6 +21,7 @@ android {
2121
ndk {
2222
abiFilters "armeabi-v7a", "x86"
2323
}
24+
versionNameSuffix = 'mod'
2425
}
2526

2627
compileOptions {
@@ -69,10 +70,10 @@ clean {
6970

7071
dependencies {
7172
implementation fileTree(include: ['*.jar'], dir: 'libs')
72-
implementation 'androidx.appcompat:appcompat:1.0.2'
73+
implementation 'androidx.appcompat:appcompat:1.1.0'
7374
implementation 'androidx.cardview:cardview:1.0.0'
74-
implementation 'com.google.android.material:material:1.0.0'
75-
implementation 'com.google.firebase:firebase-core:16.0.9'
75+
implementation 'com.google.android.material:material:1.1.0'
76+
implementation 'com.google.firebase:firebase-core:17.2.3'
7677
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
7778
implementation 'com.getkeepsafe.relinker:relinker:1.3.1'
7879
implementation 'com.github.amlcurran.showcaseview:library:5.4.3'
@@ -98,13 +99,13 @@ dependencies {
9899
implementation 'com.github.seven332:yorozuya-thread:0.1.1'
99100
implementation 'com.github.seven332:yorozuya-collect:0.1.4'
100101
implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
101-
implementation 'com.squareup.okhttp3:okhttp:3.12.3'
102+
implementation 'com.squareup.okhttp3:okhttp:3.14.2'
102103
implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
103104
implementation 'org.greenrobot:greendao:2.2.1'
104-
implementation 'org.jsoup:jsoup:1.12.1'
105-
testImplementation 'junit:junit:4.12'
106-
testImplementation 'org.robolectric:robolectric:4.2.1'
107-
testImplementation 'org.jooq:joor:0.9.6'
105+
implementation 'org.jsoup:jsoup:1.12.2'
106+
testImplementation 'junit:junit:4.13'
107+
testImplementation 'org.robolectric:robolectric:4.3.1'
108+
testImplementation 'org.jooq:joor:0.9.12'
108109
}
109110

110111
configurations.all {

‎app/src/main/res/values-zh-rCN/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,8 @@
464464
<string name="settings_eh_show_gallery_pages_summary">在画廊列表中显示页数</string>
465465
<string name="settings_eh_show_tag_translations">显示标签翻译</string>
466466
<string name="settings_eh_show_tag_translations_summary">显示翻译后的标签而非原始文字（需花费时间来下载数据文件）</string>
467-
<string name="settings_eh_tag_translations_source">补充翻译（由 EhTagTranslator 提供）</string>
468-
<string name="settings_eh_tag_translations_source_url">https://github.com/Mapaler/EhTagTranslator/wiki</string>
467+
<string name="settings_eh_tag_translations_source">补充翻译（由 EhTagTranslation 提供）</string>
468+
<string name="settings_eh_tag_translations_source_url">https://github.com/EhTagTranslation/Editor/wiki</string>
469469
<string name="settings_eh_filter">屏蔽画廊</string>
470470
<string name="settings_eh_filter_summary">根据标题、上传者、标签屏蔽画廊</string>
471471
<string name="settings_eh_cellular_network_warning">移动网络警告</string>

‎app/src/main/res/values-zh-rHK/arrays.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
<string-array name="tag_translation_metadata" tools:ignore="InconsistentArrays">
2121
<item>tag-translations-zh-rCN.sha1</item>
22-
<item>https://github.com/seven332/Mapaler/raw/tag-translations/tag-translations/tag-translations-zh-rCN.sha1</item>
22+
<item>https://github.com/Mapaler/EhViewer/raw/tag-translations/tag-translations/tag-translations-zh-rCN.sha1</item>
2323
<item>tag-translations-zh-rCN</item>
24-
<item>https://github.com/seven332/Mapaler/raw/tag-translations/tag-translations/tag-translations-zh-rCN</item>
24+
<item>https://github.com/Mapaler/EhViewer/raw/tag-translations/tag-translations/tag-translations-zh-rCN</item>
2525
</string-array>
2626

2727
</resources>

‎app/src/main/res/values-zh-rHK/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,8 @@
463463
<string name="settings_eh_show_gallery_pages_summary">在畫廊列表中顯示頁數</string>
464464
<string name="settings_eh_show_tag_translations">顯示標籤翻譯</string>
465465
<string name="settings_eh_show_tag_translations_summary">顯示翻譯後的標籤而非原始文字（需花費時間來下載數據文件）</string>
466-
<string name="settings_eh_tag_translations_source">補充翻譯（由 EhTagTranslator 提供）</string>
467-
<string name="settings_eh_tag_translations_source_url">https://github.com/Mapaler/EhTagTranslator/wiki</string>
466+
<string name="settings_eh_tag_translations_source">補充翻譯（由 EhTagTranslation 提供）</string>
467+
<string name="settings_eh_tag_translations_source_url">https://github.com/EhTagTranslation/Editor/wiki</string>
468468
<string name="settings_eh_filter">屏蔽畫廊</string>
469469
<string name="settings_eh_filter_summary">根據標題、上傳者、標籤屏蔽畫廊</string>
470470
<string name="settings_eh_cellular_network_warning">移動網絡警告</string>

‎app/src/main/res/values-zh-rTW/arrays.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
<string-array name="tag_translation_metadata" tools:ignore="InconsistentArrays">
2121
<item>tag-translations-zh-rCN.sha1</item>
22-
<item>https://github.com/seven332/Mapaler/raw/tag-translations/tag-translations/tag-translations-zh-rCN.sha1</item>
22+
<item>https://github.com/Mapaler/EhViewer/raw/tag-translations/tag-translations/tag-translations-zh-rCN.sha1</item>
2323
<item>tag-translations-zh-rCN</item>
24-
<item>https://github.com/seven332/Mapaler/raw/tag-translations/tag-translations/tag-translations-zh-rCN</item>
24+
<item>https://github.com/Mapaler/EhViewer/raw/tag-translations/tag-translations/tag-translations-zh-rCN</item>
2525
</string-array>
2626

2727
</resources>

‎app/src/main/res/values-zh-rTW/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,8 @@
462462
<string name="settings_eh_show_gallery_pages_summary">在圖庫列表中顯示頁數</string>
463463
<string name="settings_eh_show_tag_translations">顯示標籤翻譯</string>
464464
<string name="settings_eh_show_tag_translations_summary">顯示翻譯後的標籤而非原始文字（需花費時間來下載資料檔案）</string>
465-
<string name="settings_eh_tag_translations_source">補充翻譯（由 EhTagTranslator 提供）</string>
466-
<string name="settings_eh_tag_translations_source_url">https://github.com/Mapaler/EhTagTranslator/wiki</string>
465+
<string name="settings_eh_tag_translations_source">補充翻譯（由 EhTagTranslation 提供）</string>
466+
<string name="settings_eh_tag_translations_source_url">https://github.com/EhTagTranslation/Editor/wiki</string>
467467
<string name="settings_eh_filter">遮蔽圖庫</string>
468468
<string name="settings_eh_filter_summary">根據標題、上傳者、標籤遮蔽圖庫</string>
469469
<string name="settings_eh_cellular_network_warning">行動數據警告</string>

‎build.gradle‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22

33
buildscript {
44
repositories {
5+
maven { url 'https://maven.aliyun.com/repository/google' }
6+
maven { url 'https://maven.aliyun.com/repository/jcenter'}
7+
maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
58
google()
69
jcenter()
710
maven { url "https://maven.fabric.io/public" }
811
maven { url "https://jitpack.io" }
912
}
1013
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.5.3'
12-
classpath 'com.google.gms:google-services:4.3.0'
13-
classpath 'io.fabric.tools:gradle:1.27.1'
14+
classpath 'com.android.tools.build:gradle:3.6.1'
15+
classpath 'com.google.gms:google-services:4.3.3'
16+
classpath 'io.fabric.tools:gradle:1.31.2'
1417

1518
// NOTE: Do not place your application dependencies here; they belong
1619
// in the individual module build.gradle files
@@ -19,6 +22,9 @@ buildscript {
1922

2023
allprojects {
2124
repositories {
25+
maven { url 'https://maven.aliyun.com/repository/google/' }
26+
maven { url 'https://maven.aliyun.com/repository/jcenter'}
27+
maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
2228
google()
2329
jcenter()
2430
maven { url "https://jitpack.io" }

‎daogenerator/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ task executeDaoGenerator(type:JavaExec) {
2424
dependencies {
2525
compile fileTree(dir: 'libs', include: ['*.jar'])
2626
compile 'org.greenrobot:greendao-generator:2.2.0'
27-
compile 'org.jboss.forge.roaster:roaster-api:2.20.1.Final'
28-
compile 'org.jboss.forge.roaster:roaster-jdt:2.20.1.Final'
27+
compile 'org.jboss.forge.roaster:roaster-api:2.21.1.Final'
28+
compile 'org.jboss.forge.roaster:roaster-jdt:2.21.1.Final'
2929
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
distributionBase=GRADLE_USER_HOME
2-
distributionPath=wrapper/dists
3-
zipStoreBase=GRADLE_USER_HOME
4-
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
1+
#Wed Mar 04 04:30:57 CST 2020
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip

0 commit comments

Comments
 (0)