fix: update to v136.0

.gitlab-ci.yml

@@ -11,7 +11,7 @@
 
 variables: &build_variables
   PRODUCTION_BRANCH: main
-  VERSION_NAME: "135.0.1"
+  VERSION_NAME: "136.0.0"
   SB_GAPI_KEY_FILE: /opt/IronFox/sb-gapi.data
   KEYSTORE: /opt/IronFox/signing-key.jks
   BUNDLETOOL: 1.18.0
@@ -77,7 +77,7 @@ build-apk:
     - saas-linux-xlarge-amd64
   parallel:
     matrix:
-      - VERSION_CODE: ["31350100", "31350110", "31350120"]
+      - VERSION_CODE: ["31360000", "31360010", "31360020"]
   variables:
     <<: *build_variables
   <<: *build_setup_steps
@@ -111,7 +111,7 @@ build-apk-set:
   tags:
     - saas-linux-xlarge-amd64
   variables:
-    VERSION_CODE: "31350130"
+    VERSION_CODE: "31360030"
     <<: *build_variables
   <<: *build_setup_steps
   script:

scripts/get_sources.sh

@@ -2,14 +2,14 @@
 
 set -euo pipefail
 
-FIREFOX_TAG="135.0.1"
+FIREFOX_TAG="136.0"
 FIREFOX_RELEASE_PATH="releases/${FIREFOX_TAG}"
 # FIREFOX_RC_BUILD_NAME="build2"
 # FIREFOX_RELEASE_PATH="candidates/${FIREFOX_TAG}-candidates/${FIREFOX_RC_BUILD_NAME}"
 WASI_TAG="wasi-sdk-20"
 GLEAN_TAG="v63.0.0"
 GMSCORE_TAG="v0.3.6.244735"
-APPSERVICES_TAG="release-v135"
+APPSERVICES_TAG="release-v137"
 BUNDLETOOL_TAG="1.18.0"
 
 # Configuration

scripts/prebuild.sh

@@ -58,7 +58,10 @@ if [ ! -d "$ANDROID_NDK" ]; then
 fi
 
 JAVA_VER=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F '.' '{sub("^$", "0", $2); print $1$2}')
-[ "$JAVA_VER" -ge 15 ] || { echo "Java 17 or newer must be set as default JDK"; exit 1; };
+[ "$JAVA_VER" -ge 15 ] || {
+    echo "Java 17 or newer must be set as default JDK"
+    exit 1
+}
 
 if [[ -z "${SB_GAPI_KEY_FILE}" ]]; then
     echo "SB_GAPI_KEY_FILE environment variable has not been specified! Safe Browsing will not be supported in this build."
@@ -254,7 +257,7 @@ popd
 
 pushd "$application_services"
 # Break the dependency on older A-C
-sed -i -e '/android-components = /s/133\.0/135.0.1/' gradle/libs.versions.toml
+sed -i -e '/android-components = /s/135\.0\.1/136.0/' gradle/libs.versions.toml
 echo "rust.targets=linux-x86-64,$rusttarget" >>local.properties
 sed -i -e '/NDK ez-install/,/^$/d' libs/verify-android-ci-environment.sh
 sed -i -e '/content {/,/}/d' build.gradle
@@ -349,13 +352,15 @@ fi
     echo "ac_add_options CXX=\"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++\""
     echo "ac_add_options STRIP=\"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip\""
     echo 'mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj'
-} >> mozconfig
+} >>mozconfig
 
 # Configure
 sed -i -e '/check_android_tools("emulator"/d' build/moz.configure/android-sdk.configure
 
-cat "$patches/preferences/phoenix-android.js" >>mobile/android/app/geckoview-prefs.js
-cat "$patches/preferences/phoenix-extended-android.js" >>mobile/android/app/geckoview-prefs.js
-cat "$patches/preferences/ironfox.js" >>mobile/android/app/geckoview-prefs.js
+{
+    cat "$patches/preferences/phoenix-android.js"
+    cat "$patches/preferences/phoenix-extended-android.js"
+    cat "$patches/preferences/ironfox.js"
+} >>mobile/android/app/geckoview-prefs.js
 
 popd