mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-12 08:58:51 -04:00
Merge pull request #2511 from kiwix/feature/macgills/2299-bump-libraries
#2299 Upgrade to Kotlin 1.4.0
This commit is contained in:
commit
17b71ab75c
@ -326,7 +326,7 @@ object Libs {
|
||||
Versions.xfetch2okhttp
|
||||
|
||||
/**
|
||||
* http://assertj.org
|
||||
* https://assertj.github.io/doc/
|
||||
*/
|
||||
const val assertj_core: String = "org.assertj:assertj-core:" + Versions.assertj_core
|
||||
|
||||
|
@ -1,4 +1,3 @@
|
||||
import kotlin.String
|
||||
import org.gradle.plugin.use.PluginDependenciesSpec
|
||||
import org.gradle.plugin.use.PluginDependencySpec
|
||||
|
||||
@ -12,35 +11,35 @@ import org.gradle.plugin.use.PluginDependencySpec
|
||||
* YOU are responsible for updating manually the dependency version.
|
||||
*/
|
||||
object Versions {
|
||||
const val org_jetbrains_kotlinx_kotlinx_coroutines: String = "1.3.9"
|
||||
const val org_jetbrains_kotlinx_kotlinx_coroutines: String = "1.4.1"
|
||||
|
||||
const val androidx_test_espresso: String = "3.2.0" // available: "3.3.0"
|
||||
const val androidx_test_espresso: String = "3.3.0"
|
||||
|
||||
const val com_squareup_retrofit2: String = "2.9.0"
|
||||
|
||||
const val com_squareup_okhttp3: String = "4.9.0"
|
||||
|
||||
const val org_jetbrains_kotlin: String = "1.3.72" // available: "1.4.10"
|
||||
const val org_jetbrains_kotlin: String = "1.4.20"
|
||||
|
||||
const val androidx_navigation: String = "2.3.0"
|
||||
const val androidx_navigation: String = "2.3.1"
|
||||
|
||||
const val com_google_dagger: String = "2.28.3" // available: "2.29.1"
|
||||
const val com_google_dagger: String = "2.29.1"
|
||||
|
||||
const val com_yahoo_squidb: String = "2.0.0" // available: "3.2.3"
|
||||
|
||||
const val com_jakewharton: String = "10.2.2" // available: "10.2.3"
|
||||
const val com_jakewharton: String = "10.2.3"
|
||||
|
||||
const val androidx_test: String = "1.2.0" // available: "1.3.0"
|
||||
const val androidx_test: String = "1.3.0"
|
||||
|
||||
const val io_objectbox: String = "2.7.0" // available: "2.7.1"
|
||||
const val io_objectbox: String = "2.8.1"
|
||||
|
||||
const val org_jacoco: String = "0.7.9"
|
||||
|
||||
const val io_mockk: String = "1.10.0" // available: "1.10.2"
|
||||
const val io_mockk: String = "1.10.2"
|
||||
|
||||
const val android_arch_lifecycle_extensions: String = "1.1.1"
|
||||
|
||||
const val com_android_tools_build_gradle: String = "4.0.1" // available: "4.0.2"
|
||||
const val com_android_tools_build_gradle: String = "4.0.1" // available: "4.1.1"
|
||||
|
||||
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"
|
||||
|
||||
@ -50,29 +49,29 @@ object Versions {
|
||||
|
||||
const val ink_page_indicator: String = "1.3.0"
|
||||
|
||||
const val leakcanary_android: String = "2.4" // available: "2.5"
|
||||
const val leakcanary_android: String = "2.5"
|
||||
|
||||
const val constraintlayout: String = "1.1.3" // available: "2.0.2"
|
||||
const val constraintlayout: String = "2.0.4"
|
||||
|
||||
const val collection_ktx: String = "1.1.0"
|
||||
|
||||
const val preference_ktx: String = "1.1.1"
|
||||
|
||||
const val junit_jupiter: String = "5.6.2" // available: "5.7.0"
|
||||
const val junit_jupiter: String = "5.7.0"
|
||||
|
||||
const val xfetch2okhttp: String = "3.1.5"
|
||||
|
||||
const val assertj_core: String = "3.16.1" // available: "3.17.2"
|
||||
const val assertj_core: String = "3.18.1"
|
||||
|
||||
const val core_testing: String = "2.1.0"
|
||||
|
||||
const val fragment_ktx: String = "1.2.5"
|
||||
|
||||
const val lint_gradle: String = "27.0.1" // available: "27.0.2"
|
||||
const val lint_gradle: String = "27.1.1"
|
||||
|
||||
const val testing_ktx: String = "1.1.2"
|
||||
|
||||
const val threetenabp: String = "1.2.4"
|
||||
const val threetenabp: String = "1.3.0"
|
||||
|
||||
const val uiautomator: String = "2.2.0"
|
||||
|
||||
@ -84,11 +83,11 @@ object Versions {
|
||||
|
||||
const val rxandroid: String = "2.1.1"
|
||||
|
||||
const val core_ktx: String = "1.3.1" // available: "1.3.2"
|
||||
const val core_ktx: String = "1.3.2"
|
||||
|
||||
const val kiwixlib: String = "9.4.1"
|
||||
|
||||
const val material: String = "1.2.0" // available: "1.2.1"
|
||||
const val material: String = "1.2.1"
|
||||
|
||||
const val multidex: String = "2.0.1"
|
||||
|
||||
@ -98,22 +97,22 @@ object Versions {
|
||||
|
||||
const val jsr305: String = "3.0.2"
|
||||
|
||||
const val ktlint: String = "0.36.0" // available: "0.39.0"
|
||||
const val ktlint: String = "0.39.0"
|
||||
|
||||
const val rxjava: String = "2.2.19" // available: "2.2.20"
|
||||
const val rxjava: String = "2.2.20"
|
||||
|
||||
const val webkit: String = "1.2.0" // available: "1.3.0"
|
||||
const val webkit: String = "1.3.0"
|
||||
|
||||
const val aapt2: String = "4.0.1-6197926" // available: "4.0.2-6197926"
|
||||
const val aapt2: String = "4.1.1-6503028"
|
||||
|
||||
const val junit: String = "1.1.1" // available: "1.1.2"
|
||||
const val junit: String = "1.1.2"
|
||||
|
||||
/**
|
||||
* Current version: "6.2"
|
||||
* See issue 19: How to update Gradle itself?
|
||||
* https://github.com/jmfayard/buildSrcVersions/issues/19
|
||||
*/
|
||||
const val gradleLatestVersion: String = "6.6.1"
|
||||
const val gradleLatestVersion: String = "6.7.1"
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -58,7 +58,7 @@ abstract class CoreSettingsFragment : BaseFragment() {
|
||||
requireActivity().supportFragmentManager
|
||||
.beginTransaction()
|
||||
.remove(prefsFragment)
|
||||
.commit()
|
||||
.commitNowAllowingStateLoss()
|
||||
super.onDestroyView()
|
||||
}
|
||||
}
|
||||
|
@ -70,7 +70,7 @@ internal class ProcessActivityResultTest {
|
||||
|
||||
@Test
|
||||
fun `invoke with sends filter action with data`() {
|
||||
every { data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)[0] } returns ""
|
||||
every { data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS) } returns arrayListOf("")
|
||||
successfulResult.invokeWith(activity)
|
||||
verify { actions.offer(Filter("")) }
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user