Version bump restore 11.0.0 with CI fix (#875)

Some additions are added on top of the referenced PR in the commit.
This is a force-pushed commit to keep the latest version bump to 11.0.0
------
Added the possibility to strictly reference to `main` and `main-xxx` branches to spin up builds.
Major fixes are inherent to the `firefox-ios` path added to the `check_marketing_version.sh` script as well as some `yml` CI files for both GitHub Actions and CircleCI.
We are also referencing an empty Production file (git ignored) to make easy for the CI script to inject the required production-only configs.

Author: Davic Farache

.circleci/config.yml

@@ -92,11 +92,12 @@ workflows:
           filters:
             branches:
               only:
-                - /^.*main.*/
-          name: Deploy release version over Testflight if MARKETING_VERION file updated
+                - main
+                - /^main-\d+$/
+          name: Deploy release version over Testflight if MARKETING_VERSION file updated
           config-path: .circleci/deploy-release.yml
           mapping: |
-            Client/Configuration/Common.xcconfig deploy-release true
+            firefox-ios/Client/Configuration/Common.xcconfig deploy-release true
       - build-and-deploy-testflight-beta:
           name: Deploy beta version over Testflight
           filters:
@@ -109,5 +110,5 @@ workflows:
           filters:
             branches:
               only: 
-                - /^.*mob-3113-firefox-upgrade-133.*/
+                - main
           context: napps

.circleci/deploy-release.yml

@@ -34,7 +34,7 @@ jobs:
           command: for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts
       - run:
           name: extract Production XCConfig
-          command: echo "$PRODUCTION_XCCONFIG" | base64 --decode > Client/Configuration/Production.xcconfig
+          command: echo "$PRODUCTION_XCCONFIG" | base64 --decode > firefox-ios/Client/Configuration/Production.xcconfig
       - run:
           name: Execute bootstrap
           command: ./bootstrap.sh

.github/workflows/merge_tests.yml

@@ -2,7 +2,7 @@ name: Merge Unit Tests
 
 on:
   pull_request:
-    branches: [ main, mob-3113-firefox-upgrade-133 ]
+    branches: [main]
 
 jobs:
   execute_merge_tests:

.github/workflows/snapshot_tests.yml

@@ -3,7 +3,7 @@ name: Snapshot Tests
 on:
   pull_request:
     paths:
-      - 'Client/Configuration/Common.xcconfig'
+      - 'firefox-ios/Client/Configuration/Common.xcconfig'
 
 jobs:
   execute_snapshot_tests:

.github/workflows/swift_lint.yml

@@ -1,7 +1,7 @@
 name: SwiftLint
 on:
   pull_request:
-    branches: [ main, mob-3113-firefox-upgrade-133 ]
+    branches: [main]
 jobs:
   build:
     runs-on: ubuntu-latest

check_marketing_version.sh

@@ -11,15 +11,15 @@
 #!/bin/bash
 
 # Get the current branch's MARKETING_VERSION
-CURRENT_VERSION=$(grep 'MARKETING_VERSION' Client/Configuration/Common.xcconfig | cut -d ' ' -f3)
+CURRENT_VERSION=$(grep 'MARKETING_VERSION' firefox-ios/Client/Configuration/Common.xcconfig | cut -d ' ' -f3)
 
 if [ -n "$CIRCLECI" ]; then
   # CircleCI: Compare against the previous commit on the same branch
   echo "Running on CircleCI, checking against $CIRCLE_BRANCH~1"
 
   # Check if there is a previous commit available
   if git rev-parse "$CIRCLE_BRANCH~1" >/dev/null 2>&1; then
-    OLD_VERSION=$(git show "$CIRCLE_BRANCH~1:Client/Configuration/Common.xcconfig" | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
+    OLD_VERSION=$(git show "$CIRCLE_BRANCH~1:firefox-ios/Client/Configuration/Common.xcconfig" | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
   else
     echo "No previous commit found on $CIRCLE_BRANCH. Assuming the current version."
     OLD_VERSION=$CURRENT_VERSION
@@ -33,7 +33,7 @@ elif [ -n "$GITHUB_ACTIONS" ]; then
   git fetch origin main || { echo "Failed to fetch main branch"; exit 1; }
 
   # Get the MARKETING_VERSION from the main branch
-  OLD_VERSION=$(git show origin/main:Client/Configuration/Common.xcconfig | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
+  OLD_VERSION=$(git show origin/main:firefox-ios/Client/Configuration/Common.xcconfig | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
   if [ $? -ne 0 ]; then
     echo "Failed to retrieve MARKETING_VERSION from main branch"
     exit 1

fastlane/Fastfile

@@ -13,6 +13,7 @@ target_name = "Client"
 target_folder_path = "firefox-ios/#{target_name}"
 project_path = "#{target_folder_path}.xcodeproj"
 pbx_project_file = "#{project_path}/project.pbxproj"
+testflight_archive_args = "GCC_TREAT_WARNINGS_AS_ERRORS='NO' SWIFT_TREAT_WARNINGS_AS_ERRORS='NO' VERSIONING_SYSTEM='apple-generic' CURRENT_PROJECT_VERSION='0' FUSE_BUILD_SCRIPT_PHASES='NO'"
 
 if ENV['IS_CIRCLECI']
   import_build_tools(
@@ -122,7 +123,8 @@ platform :ios do
     ci_run_build_number = ENV["CIRCLE_BUILD_NUM"]
 
     udpated_build_number = increment_build_number(
-      build_number: ci_run_build_number
+      build_number: ci_run_build_number,
+      xcodeproj: project_path
     )
 
     match(
@@ -131,10 +133,21 @@ platform :ios do
       readonly: true
     )
 
+    build_app(
+      scheme: "Ecosia",
+      project: project_path,
+      configuration: "Release",
+      export_method: "app-store",
+      xcargs: testflight_archive_args,
+      skip_archive: true
+    )
+
     gym(
       scheme: "Ecosia",
+      project: project_path,      
       export_method: "app-store",
-      configuration: "Release"
+      configuration: "Release",
+      xcargs: testflight_archive_args
     )
 
     inject_appstore_connect_api

fastlane/Pluginfile

@@ -2,7 +2,6 @@
 #
 # Ensure this file is checked in to source control!
 
-gem 'fastlane-plugin-appcenter'
 gem 'fastlane-plugin-xcconfig'
 gem 'fastlane-plugin-browserstack'
 gem 'fastlane-plugin-firebase_app_distribution'

firefox-ios/Client.xcodeproj/project.pbxproj

@@ -2768,6 +2768,7 @@
 		2C6045859589979C43AF09E0 /* jv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = jv; path = jv.lproj/ClearPrivateDataConfirm.strings; sourceTree = "<group>"; };
 		2C6C90822C614A16007D9B43 /* EcosiaSnapshotTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EcosiaSnapshotTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		2C6E44099EACF7BE5438CEB6 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Today.strings; sourceTree = "<group>"; };
+		2C7518AA2D8F025800B12F1F /* Production.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Production.xcconfig; path = Configuration/Production.xcconfig; sourceTree = "<group>"; };
 		2C8C07761E7800EA00DC1237 /* FindInPageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FindInPageTests.swift; sourceTree = "<group>"; };
 		2C9144B0B15218D8A0FCD538 /* es-AR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-AR"; path = "es-AR.lproj/ClearPrivateData.strings"; sourceTree = "<group>"; };
 		2C97EC701E72C80E0092EC18 /* TopTabsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TopTabsTest.swift; sourceTree = "<group>"; };
@@ -14070,6 +14071,7 @@
 		E60961841B62B7E100DD640F /* Configuration */ = {
 			isa = PBXGroup;
 			children = (
+				2C7518AA2D8F025800B12F1F /* Production.xcconfig */,
 				2C2F32172D46AA2C00977F55 /* EcosiaTesting.ShareTo.xcconfig */,
 				2C2F32182D46AA2C00977F55 /* EcosiaTesting.WidgetKit.xcconfig */,
 				2C2F32012D46A53000977F55 /* EcosiaTesting.xcconfig */,
@@ -24183,7 +24185,6 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				INFOPLIST_FILE = WidgetKit/Info.plist;
-				MARKETING_VERSION = 0.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(MOZ_BUNDLE_ID).WidgetKit";
 				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc com.ecosia.ecosiaapp.firefox.WidgetKit";
 				SKIP_INSTALL = NO;
@@ -24715,7 +24716,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -24776,7 +24777,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -25030,7 +25031,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -25091,7 +25092,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -25125,7 +25126,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -25186,7 +25187,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -25220,7 +25221,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -25275,7 +25276,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -25308,7 +25309,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -25369,7 +25370,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -25403,7 +25404,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -25464,7 +25465,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -25813,7 +25814,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -25946,7 +25947,6 @@
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 33YMRSYD2L;
 				INFOPLIST_FILE = WidgetKit/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 0.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development com.ecosia.ecosiaapp.WidgetKit";
 				SKIP_INSTALL = NO;
@@ -25988,7 +25988,6 @@
 				CODE_SIGN_STYLE = Manual;
 				INFOPLIST_FILE = WidgetKit/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 0.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.ecosia.ecosiaapp.WidgetKit";
 				SKIP_INSTALL = NO;
@@ -26004,7 +26003,6 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				INFOPLIST_FILE = WidgetKit/Info.plist;
-				MARKETING_VERSION = 0.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc com.ecosia.ecosiaapp.firefox.WidgetKit";
 				SKIP_INSTALL = NO;

firefox-ios/Client/Configuration/Common.xcconfig

@@ -35,4 +35,4 @@ DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = 1;
 DYLIB_INSTALL_NAME_BASE = @rpath
 PRODUCT_BUNDLE_IDENTIFIER = org.mozilla.ios.$(PRODUCT_NAME)
-MARKETING_VERSION = 10.6.1
+MARKETING_VERSION = 11.0.0