Reverts #1151: Removes unused Flipper library
parent
9591172ee9
commit
13146c2b2a
|
@ -504,10 +504,6 @@ dependencies {
|
||||||
androidTestImplementation Deps.mockito_android
|
androidTestImplementation Deps.mockito_android
|
||||||
testImplementation Deps.mockk
|
testImplementation Deps.mockk
|
||||||
testImplementation Deps.assertk
|
testImplementation Deps.assertk
|
||||||
|
|
||||||
debugImplementation Deps.flipper
|
|
||||||
debugImplementation Deps.soLoader
|
|
||||||
releaseImplementation Deps.flipper_noop
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (project.hasProperty("raptor")) {
|
if (project.hasProperty("raptor")) {
|
||||||
|
|
|
@ -17,12 +17,5 @@
|
||||||
|
|
||||||
<application
|
<application
|
||||||
tools:replace="android:name"
|
tools:replace="android:name"
|
||||||
android:name="org.mozilla.fenix.DebugFenixApplication">
|
android:name="org.mozilla.fenix.DebugFenixApplication"/>
|
||||||
|
|
||||||
<activity android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
|
|
||||||
android:exported="true"/>
|
|
||||||
<service android:name="com.facebook.flipper.plugins.leakcanary.RecordLeakService" />
|
|
||||||
|
|
||||||
</application>
|
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
|
@ -7,14 +7,6 @@ package org.mozilla.fenix
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import com.facebook.flipper.android.AndroidFlipperClient
|
|
||||||
import com.facebook.flipper.android.utils.FlipperUtils
|
|
||||||
import com.facebook.flipper.plugins.inspector.DescriptorMapping
|
|
||||||
import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
|
|
||||||
import com.facebook.flipper.plugins.leakcanary.LeakCanaryFlipperPlugin
|
|
||||||
import com.facebook.flipper.plugins.leakcanary.RecordLeakService
|
|
||||||
import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
|
|
||||||
import com.facebook.soloader.SoLoader
|
|
||||||
import com.squareup.leakcanary.AndroidHeapDumper
|
import com.squareup.leakcanary.AndroidHeapDumper
|
||||||
import com.squareup.leakcanary.HeapDumper
|
import com.squareup.leakcanary.HeapDumper
|
||||||
import com.squareup.leakcanary.LeakCanary
|
import com.squareup.leakcanary.LeakCanary
|
||||||
|
@ -25,23 +17,6 @@ import java.io.File
|
||||||
|
|
||||||
class DebugFenixApplication : FenixApplication() {
|
class DebugFenixApplication : FenixApplication() {
|
||||||
|
|
||||||
override fun onCreate() {
|
|
||||||
SoLoader.init(this, false)
|
|
||||||
|
|
||||||
if (FlipperUtils.shouldEnableFlipper(this)) {
|
|
||||||
AndroidFlipperClient.getInstance(this).apply {
|
|
||||||
addPlugin(InspectorFlipperPlugin(this@DebugFenixApplication,
|
|
||||||
DescriptorMapping.withDefaults()))
|
|
||||||
addPlugin(LeakCanaryFlipperPlugin())
|
|
||||||
addPlugin(SharedPreferencesFlipperPlugin(this@DebugFenixApplication,
|
|
||||||
this@DebugFenixApplication.packageName + "_preferences"))
|
|
||||||
start()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
super.onCreate()
|
|
||||||
}
|
|
||||||
|
|
||||||
private var heapDumper: ToggleableHeapDumper? = null
|
private var heapDumper: ToggleableHeapDumper? = null
|
||||||
|
|
||||||
override fun setupLeakCanary() {
|
override fun setupLeakCanary() {
|
||||||
|
@ -49,7 +24,6 @@ class DebugFenixApplication : FenixApplication() {
|
||||||
val defaultDumper = AndroidHeapDumper(this, leakDirectoryProvider)
|
val defaultDumper = AndroidHeapDumper(this, leakDirectoryProvider)
|
||||||
heapDumper = ToggleableHeapDumper(this, defaultDumper)
|
heapDumper = ToggleableHeapDumper(this, defaultDumper)
|
||||||
LeakCanary.refWatcher(this)
|
LeakCanary.refWatcher(this)
|
||||||
.listenerServiceClass(RecordLeakService::class.java)
|
|
||||||
.heapDumper(heapDumper)
|
.heapDumper(heapDumper)
|
||||||
.buildAndInstall()
|
.buildAndInstall()
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,8 +52,6 @@ object Versions {
|
||||||
const val mockito = "2.24.5"
|
const val mockito = "2.24.5"
|
||||||
const val mockk = "1.9.kotlin12"
|
const val mockk = "1.9.kotlin12"
|
||||||
const val assertk = "0.19"
|
const val assertk = "0.19"
|
||||||
const val flipper = "0.21.0"
|
|
||||||
const val soLoader = "0.5.1"
|
|
||||||
|
|
||||||
const val espresso_version = "3.2.0"
|
const val espresso_version = "3.2.0"
|
||||||
const val mockwebserver = "3.11.0"
|
const val mockwebserver = "3.11.0"
|
||||||
|
@ -197,10 +195,6 @@ object Deps {
|
||||||
const val mockk = "io.mockk:mockk:${Versions.mockk}"
|
const val mockk = "io.mockk:mockk:${Versions.mockk}"
|
||||||
const val assertk = "com.willowtreeapps.assertk:assertk-jvm:${Versions.assertk}"
|
const val assertk = "com.willowtreeapps.assertk:assertk-jvm:${Versions.assertk}"
|
||||||
|
|
||||||
const val flipper = "com.facebook.flipper:flipper:${Versions.flipper}"
|
|
||||||
const val flipper_noop = "com.facebook.flipper:flipper-noop:${Versions.flipper}"
|
|
||||||
const val soLoader = "com.facebook.soloader:soloader:${Versions.soLoader}"
|
|
||||||
|
|
||||||
const val espresso_contrib = "androidx.test.espresso:espresso-contrib:${Versions.espresso_version}"
|
const val espresso_contrib = "androidx.test.espresso:espresso-contrib:${Versions.espresso_version}"
|
||||||
const val espresso_core = "androidx.test.espresso:espresso-core:${Versions.espresso_version}"
|
const val espresso_core = "androidx.test.espresso:espresso-core:${Versions.espresso_version}"
|
||||||
const val espresso_idling_resources = "androidx.test.espresso:espresso-idling-resource:${Versions.espresso_version}"
|
const val espresso_idling_resources = "androidx.test.espresso:espresso-idling-resource:${Versions.espresso_version}"
|
||||||
|
|
Loading…
Reference in New Issue