From a6b8d11dcf4bc951bdcd36b23bd57b85f01ed653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Wed, 4 Mar 2020 03:51:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values-zh-rCN/arrays.xml | 4 ++-- app/src/main/res/values-zh-rCN/strings.xml | 4 ++-- app/src/main/res/values-zh-rHK/arrays.xml | 4 ++-- app/src/main/res/values-zh-rHK/strings.xml | 4 ++-- app/src/main/res/values-zh-rTW/arrays.xml | 4 ++-- app/src/main/res/values-zh-rTW/strings.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml index 7a509c673..fc1815cf8 100644 --- a/app/src/main/res/values-zh-rCN/arrays.xml +++ b/app/src/main/res/values-zh-rCN/arrays.xml @@ -19,9 +19,9 @@ tag-translations-zh-rCN.sha1 - https://github.com/seven332/EhViewer/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/EhViewer/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-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 7a509c673..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/EhViewer/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/EhViewer/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 7a509c673..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/EhViewer/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/EhViewer/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 遮蔽圖庫 根據標題、上傳者、標籤遮蔽圖庫 行動數據警告 From 8d968f04ec199892d148cc766b6b3944c64502f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Wed, 4 Mar 2020 04:36:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A5=BD=E5=83=8F=E8=83=BD=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=80=E9=83=A8=E5=88=86=E4=BE=9D=E8=B5=96=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + build.gradle | 12 +++++++++--- gradle/wrapper/gradle-wrapper.properties | 11 ++++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 81fdefad4..70d2ccead 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,6 +21,7 @@ android { ndk { abiFilters "armeabi-v7a", "x86" } + versionNameSuffix = 'official-final' } compileOptions { diff --git a/build.gradle b/build.gradle index 2f7108447..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.4.2' - 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/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 From ec2fd12288498eed72f8201c1a384024c0a2058d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Wed, 4 Mar 2020 05:23:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=99=E9=83=A8=E5=88=86=E9=83=BD?= =?UTF-8?q?=E6=98=AF=E5=8F=AF=E4=BB=A5=E5=8D=87=E7=BA=A7=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 70d2ccead..aa273784e 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", @@ -70,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' @@ -102,10 +102,10 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.12.3' 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 { From 3dabfdc1da85bff77b253a2a79ca587a78900725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Wed, 4 Mar 2020 05:39:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=84=E7=A7=8D?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=8C=85=E3=80=82app=E7=9A=84com.squareup.ok?= =?UTF-8?q?http3:okhttp=E5=8F=AA=E8=83=BD=E5=81=9C=E7=95=99=E5=9C=A83.x?= =?UTF-8?q?=EF=BC=8Cdaogenerator=E7=9A=84org.greenrobot:greendao-generator?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E5=81=9C=E7=95=99=E5=9C=A82.x=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E7=84=B6=E5=B0=B1=E4=BC=9A=E7=BC=96=E8=AF=91=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- daogenerator/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index aa273784e..b3da7afe6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,7 +99,7 @@ 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.2' 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' }