From 378c3ac4bfb74ae441fe27eef0fda5a4292e135f Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Sat, 23 Apr 2022 17:50:15 +0100 Subject: [PATCH] Updated dependencies, minor fixes --- .../settingsScreen/SettingsFragment.kt | 6 +++--- .../settingsScreen/SettingsViewModel.kt | 2 +- build.gradle | 14 +++++++------- gradle.properties | 1 - gradle/wrapper/gradle-wrapper.properties | 5 +++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt index f2f3be9d..f5f3196a 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt @@ -135,7 +135,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) { settingsData.dataBtnWeb.clickWithDebounce { // val action = SettingsFragmentDirections.settingsToSources() // findNavController().navigate(action) - viewModel.updateDataFromWeb(emptyList()) + viewModel.updateDataFromWeb() } settingsData.dataBtnFile.clickWithDebounce { contentRequest.launch("*/*") } settingsData.dataBtnClear.clickWithDebounce { viewModel.clearData() } @@ -147,8 +147,8 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) { val radiosFormat = getString(R.string.data_radios) settingsData.dataRadios.text = String.format(radiosFormat, number) } - getNavResult>(R.id.nav_settings, "sources") { sources -> - viewModel.updateDataFromWeb(sources) + getNavResult>(R.id.nav_settings, "sources") { + viewModel.updateDataFromWeb() } } } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt index 2737186d..6226e695 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt @@ -42,7 +42,7 @@ class SettingsViewModel @Inject constructor( repository.updateFromFile(uri) } - fun updateDataFromWeb(sources: List) { + fun updateDataFromWeb() { // settings.saveDataSources(sources) // repository.updateFromWeb(sources) repository.updateFromWebNew() diff --git a/build.gradle b/build.gradle index 2e647875..013f560e 100644 --- a/build.gradle +++ b/build.gradle @@ -2,27 +2,27 @@ buildscript { ext { hilt_version = '2.41' safe_args_version = '2.4.1' - application_version = '7.1.2' + application_version = '7.1.3' library_version = '7.1.2' kotlin_android_version = '1.6.10' core_ktx_version = '1.7.0' core_splashscreen_version = '1.0.0-beta02' constraint_version = '2.1.3' lifecycle_version = '2.4.1' - navigation_version = '2.4.1' + navigation_version = '2.4.2' room_version = '2.4.2' material_version = '1.5.0' osmdroid_version = '6.1.11' json_version = '20220320' compose_version = '1.1.1' activity_compose_version = '1.4.0' - material_adapter_version = '1.1.6' + material_adapter_version = '1.1.7' fragment_test_version = '1.4.1' - leakcanary_version = '2.8.1' + leakcanary_version = '2.9.1' junit_version = '4.13.2' - mockito_version = '4.4.0' - robolectric_version = '4.7.3' - coroutines_test_version = '1.6.0' + mockito_version = '4.5.1' + robolectric_version = '4.8' + coroutines_test_version = '1.6.1-native-mt' androidx_test_version = '1.4.0' androidx_junit_version = '1.1.3' espresso_version = '3.4.0' diff --git a/gradle.properties b/gradle.properties index c76d814d..3c7a8bd3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,4 +21,3 @@ kotlin.code.style=official # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -kapt.use.worker.api=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85f..7f27900d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sun Apr 17 13:48:12 BST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME