diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml index ab26be3810..8f2a0c0668 100644 --- a/metadata/org.mozilla.fennec_fdroid.yml +++ b/metadata/org.mozilla.fennec_fdroid.yml @@ -12670,6 +12670,54 @@ Builds: build: $$MozBuild$$/build.sh ndk: r21d + - versionName: 110.0.1 + versionCode: 1100100 + commit: v110.0.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@components-v110.0.1 + - FirefoxAndroidAS@v108.0.8 + - MozAppServices@v96.2.1 + - MozBuild@9fd0ae6394266956addd94dec4faa6a214e6fb5c + - MozFennec@FIREFOX_110_0_RELEASE + - MozGlean@v51.8.2 + - MozGleanAS@v51.8.2 + - rustup@1.25.2 + - wasi-sdk@wasi-sdk-16 + prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$ + build: $$MozBuild$$/build.sh + ndk: r21d + + - versionName: 110.0.1 + versionCode: 1100120 + commit: v110.0.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@components-v110.0.1 + - FirefoxAndroidAS@v108.0.8 + - MozAppServices@v96.2.1 + - MozBuild@9fd0ae6394266956addd94dec4faa6a214e6fb5c + - MozFennec@FIREFOX_110_0_RELEASE + - MozGlean@v51.8.2 + - MozGleanAS@v51.8.2 + - rustup@1.25.2 + - wasi-sdk@wasi-sdk-16 + prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$ + build: $$MozBuild$$/build.sh + ndk: r21d + MaintainerNotes: |4- Version code scheme: @@ -12702,5 +12750,5 @@ MaintainerNotes: |4- ArchivePolicy: 4 versions AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 109.2.0 -CurrentVersionCode: 1092020 +CurrentVersion: 110.0.1 +CurrentVersionCode: 1100120 diff --git a/srclibs/FirefoxAndroidAS.yml b/srclibs/FirefoxAndroidAS.yml new file mode 100644 index 0000000000..a6a53b0211 --- /dev/null +++ b/srclibs/FirefoxAndroidAS.yml @@ -0,0 +1,5 @@ +RepoType: git +Repo: https://github.com/mozilla-mobile/firefox-android.git +Prepare: | + sed -i -e '/com.google.firebase/d' android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt || sed -i -e '/com.google.firebase/d' android-components/buildSrc/src/main/java/Dependencies.kt + rm -R android-components/components/lib/push-firebase