From a51e6b2cabd095a798d52f96e2be02c7b94dca04 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 22 Dec 2022 13:01:02 -0500
Subject: [PATCH] Update Fennec F-Droid to 108.1.1

Signed-off-by: Tad <tad@spotco.us>
---
 metadata/org.mozilla.fennec_fdroid.yml | 52 +++++++++++++++++++++++++-
 srclibs/FirefoxAndroid.yml             |  2 +-
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml
index cf98e1cdbb..75b6d0814d 100644
--- a/metadata/org.mozilla.fennec_fdroid.yml
+++ b/metadata/org.mozilla.fennec_fdroid.yml
@@ -12526,6 +12526,54 @@ Builds:
     build: $$MozBuild$$/build.sh
     ndk: r21d
 
+  - versionName: 108.1.1
+    versionCode: 1081100
+    commit: v108.1.1
+    timeout: 18000
+    sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 g++ pkg-config libssl-dev python-is-python3
+        python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev
+        libsqlite3-dev
+    output: app/build/outputs/apk/release/app-*-release-unsigned.apk
+    srclibs:
+      - FirefoxAndroid@v108.1.1
+      - MozAndroidComponentsAS@v107.0.2
+      - MozAppServices@v95.0.1
+      - MozBuild@0fc329b3f55965ad9023723bfe611ba6dddf9196
+      - MozFennec@FIREFOX_108_0_1_RELEASE
+      - MozGlean@v51.8.2
+      - MozGleanAS@v51.2.0
+      - rustup@1.25.1
+      - wasi-sdk@wasi-sdk-16
+    prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$
+    build: $$MozBuild$$/build.sh
+    ndk: r21d
+
+  - versionName: 108.1.1
+    versionCode: 1081120
+    commit: v108.1.1
+    timeout: 18000
+    sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 g++ pkg-config libssl-dev python-is-python3
+        python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev
+        libsqlite3-dev
+    output: app/build/outputs/apk/release/app-*-release-unsigned.apk
+    srclibs:
+      - FirefoxAndroid@v108.1.1
+      - MozAndroidComponentsAS@v107.0.2
+      - MozAppServices@v95.0.1
+      - MozBuild@0fc329b3f55965ad9023723bfe611ba6dddf9196
+      - MozFennec@FIREFOX_108_0_1_RELEASE
+      - MozGlean@v51.8.2
+      - MozGleanAS@v51.2.0
+      - rustup@1.25.1
+      - wasi-sdk@wasi-sdk-16
+    prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$
+    build: $$MozBuild$$/build.sh
+    ndk: r21d
+
 MaintainerNotes: |4-
 
     Version code scheme:
@@ -12558,5 +12606,5 @@ MaintainerNotes: |4-
 ArchivePolicy: 4 versions
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 108.1.0
-CurrentVersionCode: 1081020
+CurrentVersion: 108.1.1
+CurrentVersionCode: 1081120
diff --git a/srclibs/FirefoxAndroid.yml b/srclibs/FirefoxAndroid.yml
index a7b53efbb4..a844707ce7 100644
--- a/srclibs/FirefoxAndroid.yml
+++ b/srclibs/FirefoxAndroid.yml
@@ -1,4 +1,4 @@
 RepoType: git
 Repo: https://github.com/mozilla-mobile/firefox-android.git
 Prepare: |
-  sed -i -e '/com.google.firebase/d' android-components/buildSrc/src/main/java/Dependencies.kt && rm -fR android-components/components/lib/push-firebase
+  sed -i -e '/com.google.firebase/d' android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt && rm -fR android-components/components/lib/push-firebase