mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-08 23:07:26 -04:00
#2267 Increase Library versions - bump versions - dagger lint fixes
This commit is contained in:
parent
aaad8ad449
commit
233881ceec
@ -34,19 +34,16 @@ import org.kiwix.kiwixmobile.zim_manager.MountPointProducer
|
|||||||
object KiwixModule {
|
object KiwixModule {
|
||||||
@Provides
|
@Provides
|
||||||
@KiwixScope
|
@KiwixScope
|
||||||
@JvmStatic
|
|
||||||
internal fun provideLocationManager(context: Context): LocationManager =
|
internal fun provideLocationManager(context: Context): LocationManager =
|
||||||
context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
|
context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
@KiwixScope
|
@KiwixScope
|
||||||
@JvmStatic
|
|
||||||
fun provideWifiManager(context: Context): WifiManager =
|
fun provideWifiManager(context: Context): WifiManager =
|
||||||
context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
|
context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
@KiwixScope
|
@KiwixScope
|
||||||
@JvmStatic
|
|
||||||
internal fun provideFat32Checker(
|
internal fun provideFat32Checker(
|
||||||
sharedPreferenceUtil: SharedPreferenceUtil,
|
sharedPreferenceUtil: SharedPreferenceUtil,
|
||||||
mountPointProducer: MountPointProducer
|
mountPointProducer: MountPointProducer
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
import kotlin.String
|
|
||||||
import org.gradle.plugin.use.PluginDependenciesSpec
|
import org.gradle.plugin.use.PluginDependenciesSpec
|
||||||
import org.gradle.plugin.use.PluginDependencySpec
|
import org.gradle.plugin.use.PluginDependencySpec
|
||||||
|
|
||||||
@ -20,15 +19,15 @@ object Versions {
|
|||||||
|
|
||||||
const val org_jetbrains_kotlin: String = "1.3.72"
|
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_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 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"
|
const val org_jacoco: String = "0.7.9"
|
||||||
|
|
||||||
@ -82,11 +81,11 @@ object Versions {
|
|||||||
|
|
||||||
const val rxandroid: String = "2.1.1"
|
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"
|
const val multidex: String = "2.0.1"
|
||||||
|
|
||||||
@ -96,7 +95,7 @@ object Versions {
|
|||||||
|
|
||||||
const val jsr305: String = "3.0.2"
|
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"
|
const val rxjava: String = "2.2.19"
|
||||||
|
|
||||||
@ -120,4 +119,4 @@ object Versions {
|
|||||||
*/
|
*/
|
||||||
val PluginDependenciesSpec.buildSrcVersions: PluginDependencySpec
|
val PluginDependenciesSpec.buildSrcVersions: PluginDependencySpec
|
||||||
inline get() =
|
inline get() =
|
||||||
id("de.fayard.buildSrcVersions").version(Versions.de_fayard_buildsrcversions_gradle_plugin)
|
id("de.fayard.buildSrcVersions").version(Versions.de_fayard_buildsrcversions_gradle_plugin)
|
||||||
|
@ -40,15 +40,12 @@ abstract class ActivityModule {
|
|||||||
@ActivityScope
|
@ActivityScope
|
||||||
abstract fun bindDialogShower(alertDialogShower: AlertDialogShower): DialogShower
|
abstract fun bindDialogShower(alertDialogShower: AlertDialogShower): DialogShower
|
||||||
|
|
||||||
@Module
|
|
||||||
companion object {
|
companion object {
|
||||||
@JvmStatic
|
|
||||||
@Provides
|
@Provides
|
||||||
@ActivityScope
|
@ActivityScope
|
||||||
fun providesMainPresenter(dataSource: DataSource): MainContract.Presenter =
|
fun providesMainPresenter(dataSource: DataSource): MainContract.Presenter =
|
||||||
MainPresenter(dataSource)
|
MainPresenter(dataSource)
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
@Provides
|
@Provides
|
||||||
@ActivityScope
|
@ActivityScope
|
||||||
fun providesMainMenuFactory(activity: Activity, zimReaderContainer: ZimReaderContainer):
|
fun providesMainMenuFactory(activity: Activity, zimReaderContainer: ZimReaderContainer):
|
||||||
|
@ -39,7 +39,6 @@ import javax.inject.Singleton
|
|||||||
|
|
||||||
@Module
|
@Module
|
||||||
object DownloaderModule {
|
object DownloaderModule {
|
||||||
@JvmStatic
|
|
||||||
@Provides
|
@Provides
|
||||||
@Singleton
|
@Singleton
|
||||||
fun providesDownloader(
|
fun providesDownloader(
|
||||||
@ -48,19 +47,16 @@ object DownloaderModule {
|
|||||||
kiwixService: KiwixService
|
kiwixService: KiwixService
|
||||||
): Downloader = DownloaderImpl(downloadRequester, downloadDao, kiwixService)
|
): Downloader = DownloaderImpl(downloadRequester, downloadDao, kiwixService)
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
@Provides
|
@Provides
|
||||||
@Singleton
|
@Singleton
|
||||||
fun providesDownloadRequester(fetch: Fetch, sharedPreferenceUtil: SharedPreferenceUtil):
|
fun providesDownloadRequester(fetch: Fetch, sharedPreferenceUtil: SharedPreferenceUtil):
|
||||||
DownloadRequester = FetchDownloadRequester(fetch, sharedPreferenceUtil)
|
DownloadRequester = FetchDownloadRequester(fetch, sharedPreferenceUtil)
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
@Provides
|
@Provides
|
||||||
@Singleton
|
@Singleton
|
||||||
fun provideFetch(fetchConfiguration: FetchConfiguration): Fetch =
|
fun provideFetch(fetchConfiguration: FetchConfiguration): Fetch =
|
||||||
Fetch.getInstance(fetchConfiguration)
|
Fetch.getInstance(fetchConfiguration)
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
@Provides
|
@Provides
|
||||||
@Singleton
|
@Singleton
|
||||||
fun provideFetchConfiguration(
|
fun provideFetchConfiguration(
|
||||||
@ -77,7 +73,6 @@ object DownloaderModule {
|
|||||||
setNotificationManager(fetchNotificationManager)
|
setNotificationManager(fetchNotificationManager)
|
||||||
}.build().also(Impl::setDefaultInstanceConfiguration)
|
}.build().also(Impl::setDefaultInstanceConfiguration)
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
@Provides
|
@Provides
|
||||||
@Singleton
|
@Singleton
|
||||||
fun provideOkHttpDownloader() = OkHttpDownloader(
|
fun provideOkHttpDownloader() = OkHttpDownloader(
|
||||||
@ -87,7 +82,6 @@ object DownloaderModule {
|
|||||||
.build()
|
.build()
|
||||||
)
|
)
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
@Provides
|
@Provides
|
||||||
@Singleton
|
@Singleton
|
||||||
fun provideFetchDownloadNotificationManager(context: Context):
|
fun provideFetchDownloadNotificationManager(context: Context):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user