From 0b80aba038703af94d156606275e7c6223dc7735 Mon Sep 17 00:00:00 2001 From: Thom Chiovoloni Date: Tue, 16 Apr 2019 08:13:34 -0700 Subject: [PATCH] Bump application-services version and initialize networking in the megazord --- app/src/main/java/org/mozilla/fenix/FenixApplication.kt | 7 +++++-- buildSrc/src/main/java/Dependencies.kt | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt index e9663c19c..ecf5a44eb 100644 --- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt +++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt @@ -13,6 +13,7 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.async import kotlinx.coroutines.runBlocking import kotlinx.coroutines.Deferred +import mozilla.components.concept.fetch.Client import mozilla.components.lib.fetch.httpurlconnection.HttpURLConnectionClient import mozilla.components.service.fretboard.Fretboard import mozilla.components.service.fretboard.source.kinto.KintoExperimentSource @@ -162,8 +163,10 @@ open class FenixApplication : Application() { // As a workaround, use reflections to conditionally initialize the megazord in case it's present. return try { val megazordClass = Class.forName("mozilla.appservices.FenixMegazord") - val megazordInitMethod = megazordClass.getDeclaredMethod("init") - megazordInitMethod.invoke(megazordClass) + val megazordInitMethod = megazordClass.getDeclaredMethod("init", Lazy::class.java) + // https://github.com/mozilla-mobile/android-components/issues/2715 + val client: Lazy = lazy { HttpURLConnectionClient() } + megazordInitMethod.invoke(megazordClass, client) true } catch (e: ClassNotFoundException) { Logger.info("mozilla.appservices.FenixMegazord not found; skipping megazord init.") diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index e5c22401b..dcfb750b0 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -24,9 +24,9 @@ private object Versions { const val androidx_navigation = "2.1.0-alpha02" const val androidx_recyclerview = "1.1.0-alpha04" - const val appservices_gradle_plugin = "0.4.2" + const val appservices_gradle_plugin = "0.4.4" const val mozilla_android_components = "0.50.0-SNAPSHOT" - const val mozilla_appservices = "0.23.0" + const val mozilla_appservices = "0.25.2" const val test_tools = "1.0.2" const val espresso_core = "2.2.2"