diff --git a/app/build.gradle b/app/build.gradle index 20708938e..7544974db 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -277,13 +277,12 @@ dependencies { implementation "io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbinding_version" // Licenses - final aboutlibraries_version = '8.3.0' - implementation "com.mikepenz:aboutlibraries-core:$aboutlibraries_version" - implementation "com.mikepenz:aboutlibraries:$aboutlibraries_version" + // NOTE: REMEMBER TO UPDATE GRADLE PLUGIN + implementation "com.mikepenz:aboutlibraries:8.3.0" // Tests testImplementation 'junit:junit:4.13' - testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'org.assertj:assertj-core:3.16.1' testImplementation 'org.mockito:mockito-core:1.10.19' final robolectric_version = '3.1.4' @@ -291,8 +290,8 @@ dependencies { testImplementation "org.robolectric:shadows-multidex:$robolectric_version" testImplementation "org.robolectric:shadows-play-services:$robolectric_version" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$BuildPluginsVersion.KOTLIN" + implementation "org.jetbrains.kotlin:kotlin-reflect:$BuildPluginsVersion.KOTLIN" final coroutines_version = '1.3.8' @@ -311,13 +310,6 @@ dependencies { // Text distance (EH) implementation 'info.debatty:java-string-similarity:1.2.1' - // Reprint (EH) - implementation 'com.github.ajalt.reprint:core:3.2.1@aar' - implementation 'com.github.ajalt.reprint:rxjava:3.2.1@aar' // optional: the RxJava 1 interface - - // Swirl (EH) - implementation 'com.mattprecious.swirl:swirl:1.2.0' - // RxJava 2 interop for Realm (EH) implementation 'com.github.akarnokd:rxjava2-interop:0.13.7' @@ -328,15 +320,16 @@ dependencies { implementation 'com.elvishew:xlog:1.6.1' // Time utils (EH) - def typed_time_version = '1.0.2' + final def typed_time_version = '1.0.4' implementation "com.github.kizitonwose.time:time:$typed_time_version" implementation "com.github.kizitonwose.time:time-android:$typed_time_version" // Debug utils (EH) - debugImplementation 'com.ms-square:debugoverlay:1.1.3' - releaseTestImplementation 'com.ms-square:debugoverlay:1.1.3' - releaseImplementation 'com.ms-square:debugoverlay-no-op:1.1.3' - testImplementation 'com.ms-square:debugoverlay-no-op:1.1.3' + final def debug_overlay_version = '1.1.3' + debugImplementation "com.ms-square:debugoverlay:$debug_overlay_version" + releaseTestImplementation "com.ms-square:debugoverlay:$debug_overlay_version" + releaseImplementation "com.ms-square:debugoverlay-no-op:$debug_overlay_version" + testImplementation "com.ms-square:debugoverlay-no-op:$debug_overlay_version" // Humanize (EH) implementation 'com.github.mfornos:humanize-slim:1.2.2' @@ -346,7 +339,7 @@ dependencies { implementation 'androidx.gridlayout:gridlayout:1.0.0' - final def markwon_version = '4.1.0' + final def markwon_version = '4.5.1' implementation "io.noties.markwon:core:$markwon_version" implementation "io.noties.markwon:ext-strikethrough:$markwon_version" @@ -355,16 +348,15 @@ dependencies { implementation "io.noties.markwon:image:$markwon_version" implementation "io.noties.markwon:linkify:$markwon_version" - implementation 'com.google.guava:guava:27.0.1-android' + implementation 'com.google.guava:guava:29.0-android' } buildscript { - ext.kotlin_version = '1.3.72' repositories { mavenCentral() } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$BuildPluginsVersion.KOTLIN" } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index 743ef5065..01f3bc9cf 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -79,7 +79,6 @@ open class App : Application(), LifecycleObserver { setupNotificationChannels() Realm.init(this) GlobalScope.launch { deleteOldMetadataRealm() } // Delete old metadata DB (EH) - // Reprint.initialize(this) //Setup fingerprint (EH) if ((BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "releaseTest") && DebugToggles.ENABLE_DEBUG_OVERLAY.enabled) { setupDebugOverlay() } diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index f1be93ac2..b8757e992 100755 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -42,10 +42,6 @@ gravity locale - - ?android:attr/textColorSecondary - ?android:attr/colorAccent - ?attr/colorPrimary ?attr/colorPrimary @@ -117,10 +113,6 @@ @color/textColorPrimaryDark @color/colorAccentDark - - ?android:attr/textColorSecondary - ?android:attr/colorAccent - gravity locale diff --git a/build.gradle.kts b/build.gradle.kts index 13d90a67f..1ecd13c9b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,7 +42,7 @@ buildscript { classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0") classpath("com.github.zellius:android-shortcut-gradle-plugin:0.1.2") classpath("com.google.gms:google-services:4.3.3") - classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.2.0") + classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.3.0") // Realm (EH) classpath("io.realm:realm-gradle-plugin:7.0.1") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e02ac2543..ac33e9944 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Jun 07 15:33:20 EDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/gradlew b/gradlew index 2fe81a7d9..4f906e0c8 100755 --- a/gradlew +++ b/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 diff --git a/gradlew.bat b/gradlew.bat index 62bd9b9cc..5093609d5 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%* 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%