Skip to content

Commit

Permalink
Update to A-S 120.20231014050328 on main (mozilla-mobile#4088)
Browse files Browse the repository at this point in the history
* Update A-S to 120.20231014050328.

* No bug - Update uses of `SuggestionQuery` in Firefox Suggest.

This commit fixes the breaking change introduced in
mozilla/application-services#5867.

* Fixup build breaking from Nimbus pref-key addition

---------

Co-authored-by: MickeyMoz <sebastian@mozilla.com>
Co-authored-by: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Co-authored-by: Lina Butler <lina@yakshaving.ninja>
Co-authored-by: James Hugman <james@hugman.tv>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
6 people committed Oct 16, 2023
1 parent 96cb45a commit 66033ba
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions app/build.gradle
Expand Up @@ -485,6 +485,8 @@ nimbus {
// It will be fetched by Experimenter (the Nimbus experiment website)
// and used to inform experiment configuration.
experimenterManifest = ".experimenter.yaml"
applicationServicesDir = gradle.hasProperty('localProperties.autoPublish.application-services.dir')
? gradle.getProperty('localProperties.autoPublish.application-services.dir') : null
}

tasks.withType(KotlinCompile).configureEach {
Expand Down
Expand Up @@ -56,7 +56,7 @@ class NimbusMessagingHomescreenTest {
@Before
fun setUp() {
// Set up nimbus message
FxNimbusMessaging.features.messaging.withInitializer {
FxNimbusMessaging.features.messaging.withInitializer { _, _ ->
// FML generated objects.
Messaging(
messages = mapOf(
Expand All @@ -82,7 +82,7 @@ class NimbusMessagingHomescreenTest {
}

// Remove some homescreen features not needed for testing
FxNimbus.features.homescreen.withInitializer {
FxNimbus.features.homescreen.withInitializer { _, _ ->
// These are FML generated objects and enums
Homescreen(
sectionsEnabled = mapOf(
Expand Down

0 comments on commit 66033ba

Please sign in to comment.