From 233881ceec8d748b123952b4cecd8e9478da2510 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 7 Aug 2020 10:45:16 +0100 Subject: [PATCH] #2267 Increase Library versions - bump versions - dagger lint fixes --- .../kiwix/kiwixmobile/di/modules/KiwixModule.kt | 3 --- buildSrc/src/main/kotlin/Versions.kt | 17 ++++++++--------- .../core/di/modules/ActivityModule.kt | 3 --- .../core/di/modules/DownloaderModule.kt | 6 ------ 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/di/modules/KiwixModule.kt b/app/src/main/java/org/kiwix/kiwixmobile/di/modules/KiwixModule.kt index ed6318e32..696c0cc08 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/di/modules/KiwixModule.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/di/modules/KiwixModule.kt @@ -34,19 +34,16 @@ import org.kiwix.kiwixmobile.zim_manager.MountPointProducer object KiwixModule { @Provides @KiwixScope - @JvmStatic internal fun provideLocationManager(context: Context): LocationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager @Provides @KiwixScope - @JvmStatic fun provideWifiManager(context: Context): WifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager @Provides @KiwixScope - @JvmStatic internal fun provideFat32Checker( sharedPreferenceUtil: SharedPreferenceUtil, mountPointProducer: MountPointProducer diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 361048a26..4cac37253 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,4 +1,3 @@ -import kotlin.String import org.gradle.plugin.use.PluginDependenciesSpec import org.gradle.plugin.use.PluginDependencySpec @@ -20,15 +19,15 @@ object Versions { const val org_jetbrains_kotlin: String = "1.3.72" - const val com_google_dagger: String = "2.26" // available: "2.28.3" + const val com_google_dagger: String = "2.28.3" const val com_yahoo_squidb: String = "2.0.0" // available: "3.2.3" - const val com_jakewharton: String = "10.2.1" // available: "10.2.2" + const val com_jakewharton: String = "10.2.2" const val androidx_test: String = "1.2.0" - const val io_objectbox: String = "2.6.0" // available: "2.7.0" + const val io_objectbox: String = "2.7.0" const val org_jacoco: String = "0.7.9" @@ -82,11 +81,11 @@ object Versions { const val rxandroid: String = "2.1.1" - const val core_ktx: String = "1.3.0" // available: "1.3.1" + const val core_ktx: String = "1.3.1" - const val kiwixlib: String = "9.2.3" // available: "9.3.1" + const val kiwixlib: String = "9.3.1" - const val material: String = "1.1.0" // available: "1.2.0" + const val material: String = "1.2.0" const val multidex: String = "2.0.1" @@ -96,7 +95,7 @@ object Versions { const val jsr305: String = "3.0.2" - const val ktlint: String = "0.36.0" // available: "0.37.2" + const val ktlint: String = "0.37.2" const val rxjava: String = "2.2.19" @@ -120,4 +119,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) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ActivityModule.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ActivityModule.kt index a9cb6d35d..cb5ecb710 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ActivityModule.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ActivityModule.kt @@ -40,15 +40,12 @@ abstract class ActivityModule { @ActivityScope abstract fun bindDialogShower(alertDialogShower: AlertDialogShower): DialogShower - @Module companion object { - @JvmStatic @Provides @ActivityScope fun providesMainPresenter(dataSource: DataSource): MainContract.Presenter = MainPresenter(dataSource) - @JvmStatic @Provides @ActivityScope fun providesMainMenuFactory(activity: Activity, zimReaderContainer: ZimReaderContainer): diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt index 6b608ce53..ad6ce5ba1 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt @@ -39,7 +39,6 @@ import javax.inject.Singleton @Module object DownloaderModule { - @JvmStatic @Provides @Singleton fun providesDownloader( @@ -48,19 +47,16 @@ object DownloaderModule { kiwixService: KiwixService ): Downloader = DownloaderImpl(downloadRequester, downloadDao, kiwixService) - @JvmStatic @Provides @Singleton fun providesDownloadRequester(fetch: Fetch, sharedPreferenceUtil: SharedPreferenceUtil): DownloadRequester = FetchDownloadRequester(fetch, sharedPreferenceUtil) - @JvmStatic @Provides @Singleton fun provideFetch(fetchConfiguration: FetchConfiguration): Fetch = Fetch.getInstance(fetchConfiguration) - @JvmStatic @Provides @Singleton fun provideFetchConfiguration( @@ -77,7 +73,6 @@ object DownloaderModule { setNotificationManager(fetchNotificationManager) }.build().also(Impl::setDefaultInstanceConfiguration) - @JvmStatic @Provides @Singleton fun provideOkHttpDownloader() = OkHttpDownloader( @@ -87,7 +82,6 @@ object DownloaderModule { .build() ) - @JvmStatic @Provides @Singleton fun provideFetchDownloadNotificationManager(context: Context):