Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Add support for GV beta and release builds #3599

Merged
merged 1 commit into from
Jul 2, 2020
Merged

Add support for GV beta and release builds #3599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,11 +492,10 @@ if (findProject(':wavesdk')) {
}

dependencies {
// To see what the latest geckoview-nightly version is go here:
// https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/geckoview-nightly-armeabi-v7a/
armImplementation deps.gecko_view.nightly_armv7a
arm64Implementation deps.gecko_view.nightly_arm64
x86_64Implementation deps.gecko_view.nightly_x86_64
// "nightly" or "beta" or "release"
def branch = "nightly"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if branch should be set in versions.gradle? Probably fine since we need to think about how we are going to handle this for future releases.

arm64Implementation deps.gecko_view."${branch}_arm64"
x86_64Implementation deps.gecko_view."${branch}_x86_64"
}

if (gradle.hasProperty('geckoViewLocalArm') || gradle.hasProperty('geckoViewLocalX86')) {
Expand Down
13 changes: 9 additions & 4 deletions versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ ext.deps = [:]
def versions = [:]
// GeckoView versions can be found here:
// https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/
versions.gecko_view = "79.0.20200625094452"
versions.gecko_view_nightly = "79.0.20200625094452"
versions.gecko_view_beta = "79.0.20200630191632"
versions.gecko_view_release = "78.0.20200630195452"
versions.android_components = "44.0.0"
// Note that android-components also depends on application-services,
// and in fact is our main source of appservices-related functionality.
Expand Down Expand Up @@ -56,9 +58,12 @@ ext.versions = versions
def deps = [:]

def gecko_view = [:]
gecko_view.nightly_armv7a = "org.mozilla.geckoview:geckoview-nightly-armeabi-v7a:$versions.gecko_view"
gecko_view.nightly_arm64 = "org.mozilla.geckoview:geckoview-nightly-arm64-v8a:$versions.gecko_view"
gecko_view.nightly_x86_64 = "org.mozilla.geckoview:geckoview-nightly-x86_64:$versions.gecko_view"
gecko_view.nightly_arm64 = "org.mozilla.geckoview:geckoview-nightly-arm64-v8a:$versions.gecko_view_nightly"
gecko_view.nightly_x86_64 = "org.mozilla.geckoview:geckoview-nightly-x86_64:$versions.gecko_view_nightly"
gecko_view.beta_arm64 = "org.mozilla.geckoview:geckoview-beta-arm64-v8a:$versions.gecko_view_beta"
gecko_view.beta_x86_64 = "org.mozilla.geckoview:geckoview-beta-x86_64:$versions.gecko_view_beta"
gecko_view.release_arm64 = "org.mozilla.geckoview:geckoview-arm64-v8a:$versions.gecko_view_release"
gecko_view.release_x86_64 = "org.mozilla.geckoview:geckoview-x86_64:$versions.gecko_view_release"
deps.gecko_view = gecko_view

def android_components = [:]
Expand Down