Update Mozilla Android Components to 28.0.0-SNAPSHOT.
parent
109c13a126
commit
e3408b12b4
|
@ -5,7 +5,7 @@
|
||||||
package org.mozilla.fenix
|
package org.mozilla.fenix
|
||||||
|
|
||||||
enum class ReleaseChannel {
|
enum class ReleaseChannel {
|
||||||
FenixDebug, FenixNightly, FenixBeta, FenixProduction, FennecProduction;
|
FenixDebug, FenixNightly, FenixBeta, FenixProduction, FennecProduction, FennecBeta, FennecNightly;
|
||||||
|
|
||||||
val isReleased: Boolean
|
val isReleased: Boolean
|
||||||
get() = when (this) {
|
get() = when (this) {
|
||||||
|
@ -27,12 +27,15 @@ enum class ReleaseChannel {
|
||||||
get() = when (this) {
|
get() = when (this) {
|
||||||
FenixProduction -> true
|
FenixProduction -> true
|
||||||
FenixBeta -> true
|
FenixBeta -> true
|
||||||
|
FennecProduction -> true
|
||||||
|
FennecBeta -> true
|
||||||
else -> false
|
else -> false
|
||||||
}
|
}
|
||||||
|
|
||||||
val isNightlyOrDebug: Boolean
|
val isNightlyOrDebug: Boolean
|
||||||
get() = when (this) {
|
get() = when (this) {
|
||||||
FenixNightly -> true
|
FenixNightly -> true
|
||||||
|
FennecNightly -> true
|
||||||
FenixDebug -> true
|
FenixDebug -> true
|
||||||
else -> false
|
else -> false
|
||||||
}
|
}
|
||||||
|
@ -45,6 +48,8 @@ object Config {
|
||||||
"fenixNightly" -> ReleaseChannel.FenixNightly
|
"fenixNightly" -> ReleaseChannel.FenixNightly
|
||||||
"debug" -> ReleaseChannel.FenixDebug
|
"debug" -> ReleaseChannel.FenixDebug
|
||||||
"fennecProduction" -> ReleaseChannel.FennecProduction
|
"fennecProduction" -> ReleaseChannel.FennecProduction
|
||||||
|
"fennecBeta" -> ReleaseChannel.FennecBeta
|
||||||
|
"fennecNightly" -> ReleaseChannel.FennecNightly
|
||||||
|
|
||||||
// Builds for local performance analysis, recording benchmarks, automation, etc.
|
// Builds for local performance analysis, recording benchmarks, automation, etc.
|
||||||
// This should be treated like a released channel because we want to test
|
// This should be treated like a released channel because we want to test
|
||||||
|
|
|
@ -166,7 +166,7 @@ class ActivationPing(private val context: Context) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger.info("ActivationPing - generating ping (has `identifier`: ${hashedId != null})")
|
Logger.info("ActivationPing - generating ping (has `identifier`: ${hashedId != null})")
|
||||||
Pings.activation.send()
|
Pings.activation.submit()
|
||||||
markAsTriggered()
|
markAsTriggered()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ package org.mozilla.fenix
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import mozilla.components.support.migration.FennecMigrator
|
import mozilla.components.support.migration.FennecMigrator
|
||||||
|
import mozilla.components.support.migration.state.MigrationStore
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An application class which knows how to migrate Fennec data.
|
* An application class which knows how to migrate Fennec data.
|
||||||
|
@ -26,12 +27,14 @@ class MigratingFenixApplication : FenixApplication() {
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val migrationStore by lazy { MigrationStore() }
|
||||||
|
|
||||||
override fun setupInMainProcessOnly() {
|
override fun setupInMainProcessOnly() {
|
||||||
migrateGeckoBlocking()
|
migrateGeckoBlocking()
|
||||||
|
|
||||||
super.setupInMainProcessOnly()
|
super.setupInMainProcessOnly()
|
||||||
|
|
||||||
migrator.startMigrationServiceIfNeeded(MigrationService::class.java)
|
migrator.startMigrationIfNeeded(migrationStore, MigrationService::class.java)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun migrateGeckoBlocking() {
|
private fun migrateGeckoBlocking() {
|
||||||
|
@ -48,3 +51,7 @@ class MigratingFenixApplication : FenixApplication() {
|
||||||
fun Context.getMigratorFromApplication(): FennecMigrator {
|
fun Context.getMigratorFromApplication(): FennecMigrator {
|
||||||
return (applicationContext as MigratingFenixApplication).migrator
|
return (applicationContext as MigratingFenixApplication).migrator
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun Context.getMigrationStoreFromApplication(): MigrationStore {
|
||||||
|
return (applicationContext as MigratingFenixApplication).migrationStore
|
||||||
|
}
|
||||||
|
|
|
@ -5,10 +5,12 @@
|
||||||
package org.mozilla.fenix
|
package org.mozilla.fenix
|
||||||
|
|
||||||
import mozilla.components.support.migration.AbstractMigrationService
|
import mozilla.components.support.migration.AbstractMigrationService
|
||||||
|
import mozilla.components.support.migration.state.MigrationStore
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Background service for running the migration from legacy Firefox for Android (Fennec).
|
* Background service for running the migration from legacy Firefox for Android (Fennec).
|
||||||
*/
|
*/
|
||||||
class MigrationService : AbstractMigrationService() {
|
class MigrationService : AbstractMigrationService() {
|
||||||
override val migrator by lazy { getMigratorFromApplication() }
|
override val migrator by lazy { getMigratorFromApplication() }
|
||||||
|
override val store: MigrationStore by lazy { getMigrationStoreFromApplication() }
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,16 +31,16 @@ object Versions {
|
||||||
const val androidx_work = "2.2.0"
|
const val androidx_work = "2.2.0"
|
||||||
const val google_material = "1.1.0-beta01"
|
const val google_material = "1.1.0-beta01"
|
||||||
|
|
||||||
const val mozilla_android_components = "27.0.0-SNAPSHOT"
|
const val mozilla_android_components = "28.0.0-SNAPSHOT"
|
||||||
// Note that android-components also depends on application-services,
|
// Note that android-components also depends on application-services,
|
||||||
// and in fact is our main source of appservices-related functionality.
|
// and in fact is our main source of appservices-related functionality.
|
||||||
// The version number below tracks the application-services version
|
// The version number below tracks the application-services version
|
||||||
// that we depend on directly for the fenix-megazord (and for it's
|
// that we depend on directly for the fenix-megazord (and for it's
|
||||||
// forUnitTest variant), and it's important that it be kept in
|
// forUnitTest variant), and it's important that it be kept in
|
||||||
// sync with the version used by android-components above.
|
// sync with the version used by android-components above.
|
||||||
const val mozilla_appservices = "0.44.0"
|
const val mozilla_appservices = "0.47.0"
|
||||||
|
|
||||||
const val mozilla_glean = "22.1.0"
|
const val mozilla_glean = "23.0.0"
|
||||||
|
|
||||||
const val adjust = "4.18.3"
|
const val adjust = "4.18.3"
|
||||||
const val installreferrer = "1.0"
|
const val installreferrer = "1.0"
|
||||||
|
|
Loading…
Reference in New Issue