Skip to content

Commit 18f901f

Browse files
d4r1091d4r1091
committed
Version bump restore 11.0.0 with CI fix (#875)
And addition added later via force push to fix the project path + Common.xcconfig path as well as some build settings fixes.
1 parent 3814901 commit 18f901f

File tree

9 files changed

+49
-30
lines changed

9 files changed

+49
-30
lines changed

‎.circleci/config.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,12 @@ workflows:
9292
filters:
9393
branches:
9494
only:
95-
- /^.*main.*/
96-
name: Deploy release version over Testflight if MARKETING_VERION file updated
95+
- main
96+
- /^main-\d+$/
97+
name: Deploy release version over Testflight if MARKETING_VERSION file updated
9798
config-path: .circleci/deploy-release.yml
9899
mapping: |
99-
Client/Configuration/Common.xcconfig deploy-release true
100+
firefox-ios/Client/Configuration/Common.xcconfig deploy-release true
100101
- build-and-deploy-testflight-beta:
101102
name: Deploy beta version over Testflight
102103
filters:
@@ -109,5 +110,5 @@ workflows:
109110
filters:
110111
branches:
111112
only:
112-
- /^.*mob-3113-firefox-upgrade-133.*/
113+
- /^.*main.*/
113114
context: napps

‎.circleci/deploy-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
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
3535
- run:
3636
name: extract Production XCConfig
37-
command: echo "$PRODUCTION_XCCONFIG" | base64 --decode > Client/Configuration/Production.xcconfig
37+
command: echo "$PRODUCTION_XCCONFIG" | base64 --decode > firefox-ios/Client/Configuration/Production.xcconfig
3838
- run:
3939
name: Execute bootstrap
4040
command: ./bootstrap.sh

‎.github/workflows/merge_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Merge Unit Tests
22

33
on:
44
pull_request:
5-
branches: [ main, mob-3113-firefox-upgrade-133 ]
5+
branches: [main]
66

77
jobs:
88
execute_merge_tests:

‎.github/workflows/snapshot_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Snapshot Tests
33
on:
44
pull_request:
55
paths:
6-
- 'Client/Configuration/Common.xcconfig'
6+
- 'firefox-ios/Client/Configuration/Common.xcconfig'
77

88
jobs:
99
execute_snapshot_tests:

‎.github/workflows/swift_lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: SwiftLint
22
on:
33
pull_request:
4-
branches: [ main, mob-3113-firefox-upgrade-133 ]
4+
branches: [main]
55
jobs:
66
build:
77
runs-on: ubuntu-latest

‎check_marketing_version.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
#!/bin/bash
1212

1313
# Get the current branch's MARKETING_VERSION
14-
CURRENT_VERSION=$(grep 'MARKETING_VERSION' Client/Configuration/Common.xcconfig | cut -d ' ' -f3)
14+
CURRENT_VERSION=$(grep 'MARKETING_VERSION' firefox-ios/Client/Configuration/Common.xcconfig | cut -d ' ' -f3)
1515

1616
if [ -n "$CIRCLECI" ]; then
1717
# CircleCI: Compare against the previous commit on the same branch
1818
echo "Running on CircleCI, checking against $CIRCLE_BRANCH~1"
1919

2020
# Check if there is a previous commit available
2121
if git rev-parse "$CIRCLE_BRANCH~1" >/dev/null 2>&1; then
22-
OLD_VERSION=$(git show "$CIRCLE_BRANCH~1:Client/Configuration/Common.xcconfig" | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
22+
OLD_VERSION=$(git show "$CIRCLE_BRANCH~1:firefox-ios/Client/Configuration/Common.xcconfig" | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
2323
else
2424
echo "No previous commit found on $CIRCLE_BRANCH. Assuming the current version."
2525
OLD_VERSION=$CURRENT_VERSION
@@ -33,7 +33,7 @@ elif [ -n "$GITHUB_ACTIONS" ]; then
3333
git fetch origin main || { echo "Failed to fetch main branch"; exit 1; }
3434

3535
# Get the MARKETING_VERSION from the main branch
36-
OLD_VERSION=$(git show origin/main:Client/Configuration/Common.xcconfig | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
36+
OLD_VERSION=$(git show origin/main:firefox-ios/Client/Configuration/Common.xcconfig | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
3737
if [ $? -ne 0 ]; then
3838
echo "Failed to retrieve MARKETING_VERSION from main branch"
3939
exit 1

‎fastlane/Fastfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ platform :ios do
9090
)
9191
gym(
9292
scheme: "Ecosia",
93+
project: project_path,
9394
export_method: "app-store",
9495
configuration: "Development_TestFlight"
9596
)
@@ -119,10 +120,9 @@ platform :ios do
119120
name: 'MARKETING_VERSION'
120121
)
121122

122-
ci_run_build_number = ENV["CIRCLE_BUILD_NUM"]
123-
124-
udpated_build_number = increment_build_number(
125-
build_number: ci_run_build_number
123+
increment_build_number(
124+
build_number: ENV["CIRCLE_BUILD_NUM"],
125+
xcodeproj: project_path
126126
)
127127

128128
match(
@@ -133,6 +133,7 @@ platform :ios do
133133

134134
gym(
135135
scheme: "Ecosia",
136+
project: project_path,
136137
export_method: "app-store",
137138
configuration: "Release"
138139
)

‎firefox-ios/Client.xcodeproj/project.pbxproj

+31-14
Original file line numberDiff line numberDiff line change
@@ -24119,6 +24119,7 @@
2411924119
baseConfigurationReference = 2CB288D02B07C6F300A8FCB3 /* EcosiaBeta.xcconfig */;
2412024120
buildSettings = {
2412124121
CODE_SIGN_ENTITLEMENTS = Ecosia/Entitlements/EcosiaBeta.entitlements;
24122+
CURRENT_PROJECT_VERSION = 1;
2412224123
INFOPLIST_FILE = Client/Info.plist;
2412324124
OTHER_LDFLAGS = (
2412424125
"$(inherited)",
@@ -24127,6 +24128,7 @@
2412724128
);
2412824129
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
2412924130
VALIDATE_WORKSPACE = YES;
24131+
VERSIONING_SYSTEM = "apple-generic";
2413024132
};
2413124133
name = Development_Firebase;
2413224134
};
@@ -24374,6 +24376,7 @@
2437424376
baseConfigurationReference = 2C2F32012D46A53000977F55 /* EcosiaTesting.xcconfig */;
2437524377
buildSettings = {
2437624378
CODE_SIGN_ENTITLEMENTS = Ecosia/Entitlements/EcosiaBeta.entitlements;
24379+
CURRENT_PROJECT_VERSION = 1;
2437724380
INFOPLIST_FILE = Client/Info.plist;
2437824381
OTHER_LDFLAGS = (
2437924382
"$(inherited)",
@@ -24382,6 +24385,7 @@
2438224385
);
2438324386
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
2438424387
VALIDATE_WORKSPACE = YES;
24388+
VERSIONING_SYSTEM = "apple-generic";
2438524389
};
2438624390
name = Testing;
2438724391
};
@@ -24715,7 +24719,7 @@
2471524719
buildSettings = {
2471624720
ALWAYS_SEARCH_USER_PATHS = NO;
2471724721
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
24718-
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
24722+
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
2471924723
CLANG_ANALYZER_NONNULL = YES;
2472024724
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2472124725
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -24776,7 +24780,7 @@
2477624780
GENERATE_INFOPLIST_FILE = YES;
2477724781
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
2477824782
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
24779-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
24783+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
2478024784
LD_RUNPATH_SEARCH_PATHS = (
2478124785
"$(inherited)",
2478224786
"@executable_path/Frameworks",
@@ -25030,7 +25034,7 @@
2503025034
buildSettings = {
2503125035
ALWAYS_SEARCH_USER_PATHS = NO;
2503225036
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
25033-
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
25037+
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
2503425038
CLANG_ANALYZER_NONNULL = YES;
2503525039
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2503625040
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -25091,7 +25095,7 @@
2509125095
GENERATE_INFOPLIST_FILE = YES;
2509225096
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
2509325097
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
25094-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
25098+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
2509525099
LD_RUNPATH_SEARCH_PATHS = (
2509625100
"$(inherited)",
2509725101
"@executable_path/Frameworks",
@@ -25125,7 +25129,7 @@
2512525129
buildSettings = {
2512625130
ALWAYS_SEARCH_USER_PATHS = NO;
2512725131
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
25128-
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
25132+
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
2512925133
CLANG_ANALYZER_NONNULL = YES;
2513025134
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2513125135
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -25186,7 +25190,7 @@
2518625190
GENERATE_INFOPLIST_FILE = YES;
2518725191
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
2518825192
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
25189-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
25193+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
2519025194
LD_RUNPATH_SEARCH_PATHS = (
2519125195
"$(inherited)",
2519225196
"@executable_path/Frameworks",
@@ -25220,7 +25224,7 @@
2522025224
buildSettings = {
2522125225
ALWAYS_SEARCH_USER_PATHS = NO;
2522225226
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
25223-
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
25227+
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
2522425228
CLANG_ANALYZER_NONNULL = YES;
2522525229
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2522625230
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -25254,7 +25258,7 @@
2525425258
CODE_SIGN_STYLE = Manual;
2525525259
COPY_PHASE_STRIP = NO;
2525625260
CURRENT_PROJECT_VERSION = 1;
25257-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
25261+
DEBUG_INFORMATION_FORMAT = dwarf;
2525825262
DEFINES_MODULE = YES;
2525925263
DEVELOPMENT_TEAM = "";
2526025264
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -25266,6 +25270,7 @@
2526625270
ENABLE_USER_SCRIPT_SANDBOXING = YES;
2526725271
GCC_C_LANGUAGE_STANDARD = gnu17;
2526825272
GCC_NO_COMMON_BLOCKS = YES;
25273+
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
2526925274
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
2527025275
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
2527125276
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -25275,7 +25280,7 @@
2527525280
GENERATE_INFOPLIST_FILE = YES;
2527625281
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
2527725282
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
25278-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
25283+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
2527925284
LD_RUNPATH_SEARCH_PATHS = (
2528025285
"$(inherited)",
2528125286
"@executable_path/Frameworks",
@@ -25295,6 +25300,7 @@
2529525300
SWIFT_COMPILATION_MODE = wholemodule;
2529625301
SWIFT_EMIT_LOC_STRINGS = YES;
2529725302
SWIFT_INSTALL_OBJC_HEADER = NO;
25303+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
2529825304
SWIFT_VERSION = 5.0;
2529925305
TARGETED_DEVICE_FAMILY = "1,2";
2530025306
VALIDATE_PRODUCT = YES;
@@ -25308,7 +25314,7 @@
2530825314
buildSettings = {
2530925315
ALWAYS_SEARCH_USER_PATHS = NO;
2531025316
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
25311-
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
25317+
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
2531225318
CLANG_ANALYZER_NONNULL = YES;
2531325319
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2531425320
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -25369,7 +25375,7 @@
2536925375
GENERATE_INFOPLIST_FILE = YES;
2537025376
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
2537125377
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
25372-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
25378+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
2537325379
LD_RUNPATH_SEARCH_PATHS = (
2537425380
"$(inherited)",
2537525381
"@executable_path/Frameworks",
@@ -25403,7 +25409,7 @@
2540325409
buildSettings = {
2540425410
ALWAYS_SEARCH_USER_PATHS = NO;
2540525411
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
25406-
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
25412+
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
2540725413
CLANG_ANALYZER_NONNULL = YES;
2540825414
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2540925415
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -25464,7 +25470,7 @@
2546425470
GENERATE_INFOPLIST_FILE = YES;
2546525471
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Mozilla. All rights reserved.";
2546625472
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
25467-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
25473+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
2546825474
LD_RUNPATH_SEARCH_PATHS = (
2546925475
"$(inherited)",
2547025476
"@executable_path/Frameworks",
@@ -25993,6 +25999,7 @@
2599325999
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.ecosia.ecosiaapp.WidgetKit";
2599426000
SKIP_INSTALL = NO;
2599526001
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
26002+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
2599626003
};
2599726004
name = Release;
2599826005
};
@@ -26107,9 +26114,10 @@
2610726114
baseConfigurationReference = 2CB288D32B07C6F400A8FCB3 /* Ecosia.xcconfig */;
2610826115
buildSettings = {
2610926116
CODE_SIGN_ENTITLEMENTS = Ecosia/Entitlements/Ecosia.entitlements;
26117+
CURRENT_PROJECT_VERSION = 1;
2611026118
DEBUG_INFORMATION_FORMAT = dwarf;
2611126119
EAGER_LINKING = YES;
26112-
FUSE_BUILD_SCRIPT_PHASES = YES;
26120+
FUSE_BUILD_SCRIPT_PHASES = NO;
2611326121
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
2611426122
INFOPLIST_FILE = Client/Info.plist;
2611526123
OTHER_LDFLAGS = (
@@ -26120,6 +26128,7 @@
2612026128
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
2612126129
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
2612226130
VALIDATE_WORKSPACE = YES;
26131+
VERSIONING_SYSTEM = "apple-generic";
2612326132
};
2612426133
name = Release;
2612526134
};
@@ -26148,6 +26157,7 @@
2614826157
SKIP_INSTALL = NO;
2614926158
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
2615026159
SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/Client/Client-Bridging-Header.h";
26160+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
2615126161
VALIDATE_WORKSPACE = YES;
2615226162
};
2615326163
name = Release;
@@ -26175,6 +26185,7 @@
2617526185
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.ecosia.ecosiaapp.ShareTo";
2617626186
SKIP_INSTALL = NO;
2617726187
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
26188+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
2617826189
};
2617926190
name = Release;
2618026191
};
@@ -26356,6 +26367,7 @@
2635626367
baseConfigurationReference = 2CB288D12B07C6F300A8FCB3 /* EcosiaBetaDebug.xcconfig */;
2635726368
buildSettings = {
2635826369
CODE_SIGN_ENTITLEMENTS = Ecosia/Entitlements/EcosiaBeta.entitlements;
26370+
CURRENT_PROJECT_VERSION = 1;
2635926371
INFOPLIST_FILE = Client/Info.plist;
2636026372
OTHER_LDFLAGS = (
2636126373
"$(inherited)",
@@ -26364,6 +26376,7 @@
2636426376
);
2636526377
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
2636626378
VALIDATE_WORKSPACE = YES;
26379+
VERSIONING_SYSTEM = "apple-generic";
2636726380
};
2636826381
name = BetaDebug;
2636926382
};
@@ -26590,6 +26603,7 @@
2659026603
baseConfigurationReference = 2CB288D02B07C6F300A8FCB3 /* EcosiaBeta.xcconfig */;
2659126604
buildSettings = {
2659226605
CODE_SIGN_ENTITLEMENTS = Ecosia/Entitlements/EcosiaBeta.entitlements;
26606+
CURRENT_PROJECT_VERSION = 1;
2659326607
INFOPLIST_FILE = Client/Info.plist;
2659426608
OTHER_LDFLAGS = (
2659526609
"$(inherited)",
@@ -26598,6 +26612,7 @@
2659826612
);
2659926613
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
2660026614
VALIDATE_WORKSPACE = YES;
26615+
VERSIONING_SYSTEM = "apple-generic";
2660126616
};
2660226617
name = Development_TestFlight;
2660326618
};
@@ -26779,6 +26794,7 @@
2677926794
baseConfigurationReference = 2CB288CF2B07C6F300A8FCB3 /* EcosiaDebug.xcconfig */;
2678026795
buildSettings = {
2678126796
CODE_SIGN_ENTITLEMENTS = Ecosia/Entitlements/Ecosia.entitlements;
26797+
CURRENT_PROJECT_VERSION = 1;
2678226798
INFOPLIST_FILE = Client/Info.plist;
2678326799
OTHER_LDFLAGS = (
2678426800
"$(inherited)",
@@ -26787,6 +26803,7 @@
2678726803
);
2678826804
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
2678926805
VALIDATE_WORKSPACE = YES;
26806+
VERSIONING_SYSTEM = "apple-generic";
2679026807
};
2679126808
name = Debug;
2679226809
};

‎firefox-ios/Client/Configuration/Common.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ DYLIB_COMPATIBILITY_VERSION = 1;
3535
DYLIB_CURRENT_VERSION = 1;
3636
DYLIB_INSTALL_NAME_BASE = @rpath
3737
PRODUCT_BUNDLE_IDENTIFIER = org.mozilla.ios.$(PRODUCT_NAME)
38-
MARKETING_VERSION = 10.6.1
38+
MARKETING_VERSION = 11.0.0

0 commit comments

Comments
 (0)