#1301 upgrade dependencies

This commit is contained in:
Sean Mac Gillicuddy 2019-11-26 16:15:34 +00:00
parent c599a1ef69
commit 33d2106d7c
4 changed files with 248 additions and 281 deletions

View File

@ -1,20 +1,4 @@
/*
* Kiwix Android
* Copyright (c) 2019 Kiwix <android.kiwix.org>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
import kotlin.String
/**
* Generated by https://github.com/jmfayard/buildSrcVersions
@ -23,154 +7,47 @@
* `$ ./gradlew buildSrcVersions`
*/
object Libs {
const val de_fayard_buildsrcversions_gradle_plugin: String =
"de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" +
Versions.de_fayard_buildsrcversions_gradle_plugin
const val com_github_triplet_play_gradle_plugin: String =
"com.github.triplet.play:com.github.triplet.play.gradle.plugin:" +
Versions.com_github_triplet_play_gradle_plugin
/**
* https://developer.android.com/topic/libraries/architecture/index.html
*/
const val android_arch_lifecycle_extensions: String = "android.arch.lifecycle:extensions:" +
Versions.android_arch_lifecycle_extensions
/**
* https://developer.android.com/studio
*/
const val com_android_tools_build_gradle: String = "com.android.tools.build:gradle:" +
Versions.com_android_tools_build_gradle
const val androidx_multidex_multidex: String = "androidx.multidex:multidex:" +
Versions.androidx_multidex_multidex
/**
* https://github.com/JakeWharton/butterknife/
*/
const val butterknife_gradle_plugin: String = "com.jakewharton:butterknife-gradle-plugin:" +
Versions.butterknife_gradle_plugin
const val multidex_instrumentation: String = "androidx.multidex:multidex-instrumentation:" +
Versions.multidex_instrumentation
/**
* https://developer.android.com/testing
*/
const val espresso_contrib: String = "androidx.test.espresso:espresso-contrib:" +
Versions.androidx_test_espresso
Versions.androidx_test_espresso
/**
* https://developer.android.com/testing
*/
const val espresso_core: String = "androidx.test.espresso:espresso-core:" +
Versions.androidx_test_espresso
Versions.androidx_test_espresso
/**
* https://developer.android.com/testing
*/
const val espresso_intents: String = "androidx.test.espresso:espresso-intents:" +
Versions.androidx_test_espresso
Versions.androidx_test_espresso
/**
* https://developer.android.com/testing
*/
const val espresso_web: String = "androidx.test.espresso:espresso-web:" +
Versions.androidx_test_espresso
Versions.androidx_test_espresso
/**
* https://github.com/square/retrofit/
*/
const val adapter_rxjava2: String = "com.squareup.retrofit2:adapter-rxjava2:" +
Versions.com_squareup_retrofit2
Versions.com_squareup_retrofit2
/**
* https://github.com/square/retrofit/
*/
const val converter_simplexml: String = "com.squareup.retrofit2:converter-simplexml:" +
Versions.com_squareup_retrofit2
Versions.com_squareup_retrofit2
/**
* https://github.com/square/retrofit/
*/
const val retrofit: String = "com.squareup.retrofit2:retrofit:" + Versions.com_squareup_retrofit2
const val play_services_location: String = "com.google.android.gms:play-services-location:" +
Versions.play_services_location
/**
* https://developer.android.com/testing
*/
const val androidx_test_runner: String = "androidx.test:runner:" + Versions.androidx_test_runner
/**
* https://github.com/JakeWharton/butterknife/
*/
const val butterknife_compiler: String = "com.jakewharton:butterknife-compiler:" +
Versions.butterknife_compiler
/**
* http://jcp.org/en/jsr/detail?id=250
*/
const val javax_annotation_api: String = "javax.annotation:javax.annotation-api:" +
Versions.javax_annotation_api
/**
* https://kotlinlang.org/
*/
const val kotlin_android_extensions: String = "org.jetbrains.kotlin:kotlin-android-extensions:" +
Versions.org_jetbrains_kotlin
/**
* https://kotlinlang.org/
*/
const val kotlin_android_extensions_runtime: String =
"org.jetbrains.kotlin:kotlin-android-extensions-runtime:" + Versions.org_jetbrains_kotlin
/**
* https://kotlinlang.org/
*/
const val kotlin_annotation_processing_gradle: String =
"org.jetbrains.kotlin:kotlin-annotation-processing-gradle:" + Versions.org_jetbrains_kotlin
/**
* https://kotlinlang.org/
*/
const val kotlin_gradle_plugin: String = "org.jetbrains.kotlin:kotlin-gradle-plugin:" +
Versions.org_jetbrains_kotlin
/**
* https://kotlinlang.org/
*/
const val kotlin_stdlib_jdk7: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:" +
Versions.org_jetbrains_kotlin
/**
* https://developer.android.com/testing
*/
const val androidx_test_rules: String = "androidx.test:rules:" + Versions.androidx_test_rules
/**
* https://github.com/square/okhttp
*/
const val logging_interceptor: String = "com.squareup.okhttp3:logging-interceptor:" +
Versions.logging_interceptor
/**
* https://developer.android.com/testing
*/
const val androidx_test_core: String = "androidx.test:core:" + Versions.androidx_test_core
const val ink_page_indicator: String = "com.pacioianu.david:ink-page-indicator:" +
Versions.ink_page_indicator
/**
* http://github.com/square/leakcanary/
*/
const val leakcanary_android: String = "com.squareup.leakcanary:leakcanary-android:" +
Versions.leakcanary_android
/**
* https://github.com/google/dagger
*/
@ -180,19 +57,19 @@ object Libs {
* https://github.com/google/dagger
*/
const val dagger_android: String = "com.google.dagger:dagger-android:" +
Versions.com_google_dagger
Versions.com_google_dagger
/**
* https://github.com/google/dagger
*/
const val dagger_android_processor: String = "com.google.dagger:dagger-android-processor:" +
Versions.com_google_dagger
Versions.com_google_dagger
/**
* https://github.com/google/dagger
*/
const val dagger_compiler: String = "com.google.dagger:dagger-compiler:" +
Versions.com_google_dagger
Versions.com_google_dagger
/**
* https://github.com/yahoo/squidb
@ -203,19 +80,179 @@ object Libs {
* https://github.com/yahoo/squidb
*/
const val squidb_annotations: String = "com.yahoo.squidb:squidb-annotations:" +
Versions.com_yahoo_squidb
Versions.com_yahoo_squidb
/**
* https://github.com/yahoo/squidb
*/
const val squidb_processor: String = "com.yahoo.squidb:squidb-processor:" +
Versions.com_yahoo_squidb
Versions.com_yahoo_squidb
/**
* https://github.com/JakeWharton/butterknife/
*/
const val butterknife: String = "com.jakewharton:butterknife:" + Versions.com_jakewharton
/**
* https://github.com/JakeWharton/butterknife/
*/
const val butterknife_compiler: String = "com.jakewharton:butterknife-compiler:" +
Versions.com_jakewharton
/**
* https://github.com/JakeWharton/butterknife/
*/
const val butterknife_gradle_plugin: String = "com.jakewharton:butterknife-gradle-plugin:" +
Versions.com_jakewharton
/**
* https://objectbox.io
*/
const val objectbox_android: String = "io.objectbox:objectbox-android:" + Versions.io_objectbox
/**
* https://objectbox.io
*/
const val objectbox_gradle_plugin: String = "io.objectbox:objectbox-gradle-plugin:" +
Versions.io_objectbox
/**
* http://objectbox.io
*/
const val objectbox_kotlin: String = "io.objectbox:objectbox-kotlin:" + Versions.io_objectbox
/**
* https://objectbox.io
*/
const val objectbox_processor: String = "io.objectbox:objectbox-processor:" +
Versions.io_objectbox
/**
* http://objectbox.io
*/
const val objectbox_rxjava: String = "io.objectbox:objectbox-rxjava:" + Versions.io_objectbox
/**
* https://objectbox.io
*/
const val objectbox_windows: String = "io.objectbox:objectbox-windows:" + Versions.io_objectbox
/**
* http://jacoco.org
*/
const val org_jacoco_agent: String = "org.jacoco:org.jacoco.agent:" + Versions.org_jacoco
/**
* http://jacoco.org
*/
const val org_jacoco_ant: String = "org.jacoco:org.jacoco.ant:" + Versions.org_jacoco
/**
* http://mockk.io
*/
const val mockk: String = "io.mockk:mockk:" + Versions.io_mockk
/**
* http://mockk.io
*/
const val mockk_android: String = "io.mockk:mockk-android:" + Versions.io_mockk
/**
* https://developer.android.com/topic/libraries/architecture/index.html
*/
const val android_arch_lifecycle_extensions: String = "android.arch.lifecycle:extensions:" +
Versions.android_arch_lifecycle_extensions
/**
* https://developer.android.com/studio
*/
const val com_android_tools_build_gradle: String = "com.android.tools.build:gradle:" +
Versions.com_android_tools_build_gradle
/**
* https://developer.android.com/testing
*/
const val androidx_test_runner: String = "androidx.test:runner:" + Versions.androidx_test_runner
/**
* https://developer.android.com/testing
*/
const val androidx_test_rules: String = "androidx.test:rules:" + Versions.androidx_test_rules
/**
* https://developer.android.com/testing
*/
const val androidx_test_core: String = "androidx.test:core:" + Versions.androidx_test_core
const val de_fayard_buildsrcversions_gradle_plugin: String =
"de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" +
Versions.de_fayard_buildsrcversions_gradle_plugin
const val com_github_triplet_play_gradle_plugin: String =
"com.github.triplet.play:com.github.triplet.play.gradle.plugin:" +
Versions.com_github_triplet_play_gradle_plugin
/**
* https://kotlinlang.org/
*/
const val kotlin_annotation_processing_gradle: String =
"org.jetbrains.kotlin:kotlin-annotation-processing-gradle:" +
Versions.kotlin_annotation_processing_gradle
/**
* https://kotlinlang.org/
*/
const val kotlin_android_extensions_runtime: String =
"org.jetbrains.kotlin:kotlin-android-extensions-runtime:" +
Versions.kotlin_android_extensions_runtime
/**
* https://kotlinlang.org/
*/
const val kotlin_android_extensions: String = "org.jetbrains.kotlin:kotlin-android-extensions:" +
Versions.kotlin_android_extensions
const val multidex_instrumentation: String = "androidx.multidex:multidex-instrumentation:" +
Versions.multidex_instrumentation
/**
* http://jcp.org/en/jsr/detail?id=250
*/
const val javax_annotation_api: String = "javax.annotation:javax.annotation-api:" +
Versions.javax_annotation_api
/**
* https://kotlinlang.org/
*/
const val kotlin_gradle_plugin: String = "org.jetbrains.kotlin:kotlin-gradle-plugin:" +
Versions.kotlin_gradle_plugin
/**
* https://github.com/square/okhttp
*/
const val logging_interceptor: String = "com.squareup.okhttp3:logging-interceptor:" +
Versions.logging_interceptor
const val ink_page_indicator: String = "com.pacioianu.david:ink-page-indicator:" +
Versions.ink_page_indicator
/**
* https://kotlinlang.org/
*/
const val kotlin_stdlib_jdk7: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:" +
Versions.kotlin_stdlib_jdk7
/**
* http://github.com/square/leakcanary/
*/
const val leakcanary_android: String = "com.squareup.leakcanary:leakcanary-android:" +
Versions.leakcanary_android
/**
* http://tools.android.com
*/
const val constraintlayout: String = "androidx.constraintlayout:constraintlayout:" +
Versions.constraintlayout
Versions.constraintlayout
/**
* https://github.com/mockito/mockito
@ -228,7 +265,7 @@ object Libs {
const val collection_ktx: String = "androidx.collection:collection-ktx:" + Versions.collection_ktx
const val jacoco_android: String = "com.dicedmelon.gradle:jacoco-android:" +
Versions.jacoco_android
Versions.jacoco_android
/**
* https://junit.org/junit5/
@ -242,13 +279,8 @@ object Libs {
*/
const val mockwebserver: String = "com.squareup.okhttp3:mockwebserver:" + Versions.mockwebserver
/**
* https://github.com/bitbar/testdroid-api
*/
const val testdroid_api: String = "com.testdroid:testdroid-api:" + Versions.testdroid_api
const val xfetch2okhttp: String = "androidx.tonyodev.fetch2okhttp:xfetch2okhttp:" +
Versions.xfetch2okhttp
Versions.xfetch2okhttp
/**
* http://assertj.org
@ -265,48 +297,11 @@ object Libs {
*/
const val fragment_ktx: String = "androidx.fragment:fragment-ktx:" + Versions.fragment_ktx
/**
* http://objectbox.io
*/
const val objectbox_android: String = "io.objectbox:objectbox-android:" + Versions.io_objectbox
/**
* https://objectbox.io
*/
const val objectbox_gradle_plugin: String = "io.objectbox:objectbox-gradle-plugin:" +
Versions.io_objectbox
/**
* http://objectbox.io
*/
const val objectbox_kotlin: String = "io.objectbox:objectbox-kotlin:" + Versions.io_objectbox
/**
* https://objectbox.io
*/
const val objectbox_processor: String = "io.objectbox:objectbox-processor:" +
Versions.io_objectbox
/**
* http://objectbox.io
*/
const val objectbox_rxjava: String = "io.objectbox:objectbox-rxjava:" + Versions.io_objectbox
/**
* http://objectbox.io
*/
const val objectbox_windows: String = "io.objectbox:objectbox-windows:" + Versions.io_objectbox
/**
* https://developer.android.com/testing
*/
const val orchestrator: String = "androidx.test:orchestrator:" + Versions.orchestrator
/**
* https://github.com/JakeWharton/butterknife/
*/
const val butterknife: String = "com.jakewharton:butterknife:" + Versions.butterknife
/**
* https://developer.android.com/studio
*/
@ -330,17 +325,7 @@ object Libs {
/**
* http://developer.android.com/tools/extras/support-library.html
*/
const val androidx_annotation: String = "androidx.annotation:annotation:" + Versions.annotation
/**
* http://jacoco.org
*/
const val org_jacoco_agent: String = "org.jacoco:org.jacoco.agent:" + Versions.org_jacoco
/**
* http://jacoco.org
*/
const val org_jacoco_ant: String = "org.jacoco:org.jacoco.ant:" + Versions.org_jacoco
const val annotation: String = "androidx.annotation:annotation:" + Versions.annotation
/**
* http://simple.sourceforge.net
@ -367,16 +352,6 @@ object Libs {
*/
const val core_ktx: String = "androidx.core:core-ktx:" + Versions.core_ktx
/**
* http://mockk.io
*/
const val mockk: String = "io.mockk:mockk:" + Versions.io_mockk
/**
* http://mockk.io
*/
const val mockk_android: String = "io.mockk:mockk-android:" + Versions.io_mockk
/**
* https://github.com/kiwix/kiwix-lib
*/
@ -387,6 +362,8 @@ object Libs {
*/
const val material: String = "com.google.android.material:material:" + Versions.material
const val multidex: String = "androidx.multidex:multidex:" + Versions.multidex
const val barista: String = "com.schibsted.spain:barista:" + Versions.barista
const val xfetch2: String = "androidx.tonyodev.fetch2:xfetch2:" + Versions.xfetch2
@ -396,6 +373,11 @@ object Libs {
*/
const val jsr305: String = "com.google.code.findbugs:jsr305:" + Versions.jsr305
/**
* https://github.com/pinterest/ktlint
*/
const val ktlint: String = "com.pinterest:ktlint:" + Versions.ktlint
/**
* https://github.com/square/okhttp
*/

View File

@ -1,21 +1,4 @@
/*
* Kiwix Android
* Copyright (c) 2019 Kiwix <android.kiwix.org>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
import kotlin.String
import org.gradle.plugin.use.PluginDependenciesSpec
import org.gradle.plugin.use.PluginDependencySpec
@ -29,51 +12,59 @@ import org.gradle.plugin.use.PluginDependencySpec
* YOU are responsible for updating manually the dependency version.
*/
object Versions {
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.6.1"
const val com_github_triplet_play_gradle_plugin: String = "2.4.1" // available: "2.4.2"
const val android_arch_lifecycle_extensions: String = "1.1.1"
const val com_android_tools_build_gradle: String = "3.5.0"
const val androidx_multidex_multidex: String = "2.0.1"
const val butterknife_gradle_plugin: String = "10.2.0"
const val multidex_instrumentation: String = "2.0.0"
const val androidx_test_espresso: String = "3.1.1" // available: "3.2.0"
const val com_squareup_retrofit2: String = "2.5.0" // available: "2.6.2"
const val play_services_location: String = "17.0.0"
const val androidx_test_runner: String = "1.2.0"
const val butterknife_compiler: String = "10.2.0"
const val javax_annotation_api: String = "1.3.2"
const val org_jetbrains_kotlin: String = "1.3.50"
const val androidx_test_rules: String = "1.2.0"
const val logging_interceptor: String = "3.12.1" // available: "4.2.0"
const val androidx_test_core: String = "1.2.0"
const val ink_page_indicator: String = "1.3.0"
const val leakcanary_android: String = "2.0-alpha-2"
const val com_google_dagger: String = "2.21" // available: "2.24"
const val com_google_dagger: String = "2.21" // available: "2.25.2"
const val com_yahoo_squidb: String = "2.0.0" // available: "3.2.3"
const val com_jakewharton: String = "10.2.0"
const val io_objectbox: String = "2.3.4" // available: "2.4.1"
const val org_jacoco: String = "0.7.9"
const val io_mockk: String = "1.9" // available: "1.9.3"
const val android_arch_lifecycle_extensions: String = "1.1.1"
const val com_android_tools_build_gradle: String = "3.5.2"
const val androidx_test_runner: String = "1.2.0"
const val androidx_test_rules: String = "1.2.0"
const val androidx_test_core: String = "1.2.0"
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"
const val com_github_triplet_play_gradle_plugin: String = "2.5.0" // available: "2.6.1"
const val kotlin_annotation_processing_gradle: String = "1.3.60"
const val kotlin_android_extensions_runtime: String = "1.3.60"
const val kotlin_android_extensions: String = "1.3.60"
const val multidex_instrumentation: String = "2.0.0"
const val javax_annotation_api: String = "1.3.2"
const val kotlin_gradle_plugin: String = "1.3.60"
const val logging_interceptor: String = "3.12.1" // available: "4.2.2"
const val ink_page_indicator: String = "1.3.0"
const val kotlin_stdlib_jdk7: String = "1.3.60"
const val leakcanary_android: String = "2.0-alpha-2"
const val constraintlayout: String = "1.1.3"
const val mockito_android: String = "2.24.5" // available: "3.0.0"
const val mockito_android: String = "2.24.5" // available: "3.1.0"
const val collection_ktx: String = "1.1.0"
@ -81,65 +72,59 @@ object Versions {
const val junit_jupiter: String = "5.4.2" // available: "5.5.2"
const val ktlint_gradle: String = "8.2.0"
const val ktlint_gradle: String = "9.1.1"
const val mockwebserver: String = "3.6.0" // available: "4.2.0"
const val testdroid_api: String = "2.71" // available: "2.81"
const val mockwebserver: String = "3.6.0" // available: "4.2.2"
const val xfetch2okhttp: String = "3.1.4"
const val assertj_core: String = "3.11.1" // available: "3.13.2"
const val assertj_core: String = "3.11.1" // available: "3.14.0"
const val core_testing: String = "2.0.1" // available: "2.1.0"
const val fragment_ktx: String = "1.0.0" // available: "1.1.0"
const val io_objectbox: String = "2.3.4"
const val fragment_ktx: String = "1.1.0"
const val orchestrator: String = "1.1.0" // available: "1.2.0"
const val butterknife: String = "10.2.0"
const val lint_gradle: String = "26.5.2"
const val lint_gradle: String = "26.5.0"
const val testing_ktx: String = "1.1.0"
const val testing_ktx: String = "1.1.1"
const val threetenabp: String = "1.1.1" // available: "1.2.1"
const val uiautomator: String = "2.2.0"
const val annotation: String = "1.0.0" // available: "1.1.0"
const val org_jacoco: String = "0.7.9"
const val annotation: String = "1.1.0"
const val simple_xml: String = "2.7.1"
const val appcompat: String = "1.0.2" // available: "1.1.0"
const val appcompat: String = "1.1.0"
const val rxandroid: String = "2.1.0" // available: "2.1.1"
const val cardview: String = "1.0.0"
const val core_ktx: String = "1.0.2" // available: "1.1.0"
const val io_mockk: String = "1.9" // available: "1.9.3"
const val core_ktx: String = "1.1.0"
const val kiwixlib: String = "8.1.0"
const val material: String = "1.0.0"
const val multidex: String = "2.0.1"
const val barista: String = "2.7.1" // available: "3.2.0"
const val xfetch2: String = "3.1.4"
const val jsr305: String = "3.0.2"
const val okhttp: String = "3.12.1" // available: "4.2.0"
const val ktlint: String = "0.33.0" // available: "0.35.0"
const val rxjava: String = "2.2.5" // available: "2.2.12"
const val okhttp: String = "3.12.1" // available: "4.2.2"
const val aapt2: String = "3.5.0-5435860"
const val rxjava: String = "2.2.5" // available: "2.2.15"
const val aapt2: String = "3.5.2-5435860"
const val junit: String = "1.1.1"
@ -148,7 +133,7 @@ object Versions {
* See issue 19: How to update Gradle itself?
* https://github.com/jmfayard/buildSrcVersions/issues/19
*/
const val gradleLatestVersion: String = "5.6.2"
const val gradleLatestVersion: String = "6.0.1"
}
/**
@ -157,4 +142,4 @@ object Versions {
*/
val PluginDependenciesSpec.buildSrcVersions: PluginDependencySpec
inline get() =
id("de.fayard.buildSrcVersions").version(Versions.de_fayard_buildsrcversions_gradle_plugin)
id("de.fayard.buildSrcVersions").version(Versions.de_fayard_buildsrcversions_gradle_plugin)

View File

@ -147,7 +147,7 @@ class AllProjectConfigurer {
implementation(Libs.appcompat)
implementation(Libs.material)
implementation(Libs.constraintlayout)
implementation(Libs.androidx_multidex_multidex)
implementation(Libs.multidex)
implementation(Libs.okhttp)
implementation(Libs.logging_interceptor)
implementation(Libs.retrofit)

View File

@ -85,7 +85,7 @@ class AppConfigurer {
androidTestImplementation(Libs.espresso_web)
androidTestImplementation(Libs.espresso_intents)
androidTestImplementation(Libs.espresso_contrib)
androidTestImplementation(Libs.androidx_annotation)
androidTestImplementation(Libs.annotation)
androidTestImplementation(Libs.junit)
androidTestImplementation(Libs.junit_jupiter)
androidTestImplementation(Libs.androidx_test_runner)