Merge pull request #861 from Infomaniak/fix-beta-text

fix: Only display beta text in TestFlight builds
Infomaniak · Jul 6, 2023 · d51c456 · d51c456
2 parents 075cec1 + a928909
commit d51c456
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.package.resolved b/.package.resolved
@@ -41,7 +41,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Infomaniak/ios-core",
       "state" : {
-        "revision" : "e5fe8e03aa06375f20c8e40f4fae3a6af6e4d75e"
+        "revision" : "ef2811a288a3a4b94dd5d04c5f47ddd771e4176c"
       }
     },
     {

diff --git a/MailCore/Utils/Constants.swift b/MailCore/Utils/Constants.swift
@@ -158,7 +158,9 @@ public enum Constants {
         let appName = Bundle.main.object(forInfoDictionaryKey: "CFBundleName") as! String? ?? "Mail"
         let release = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String? ?? "x.x"
         let build = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as! String? ?? "x"
-        return "\(appName) iOS version \(release)-beta\(build)"
+        let betaRelease = Bundle.main.isRunningInTestFlight ? "beta" : ""
+
+        return "\(appName) iOS version \(release)-\(betaRelease)\(build)"
     }
 
     public static let searchFolderId = "search_folder_id"

diff --git a/Project.swift b/Project.swift
@@ -29,7 +29,7 @@ let project = Project(name: "Mail",
                       packages: [
                           .package(url: "https://github.com/Infomaniak/ios-login", .upToNextMajor(from: "4.0.0")),
                           .package(url: "https://github.com/Infomaniak/ios-dependency-injection", .upToNextMajor(from: "1.1.6")),
-                          .package(url: "https://github.com/Infomaniak/ios-core", .revision("e5fe8e03aa06375f20c8e40f4fae3a6af6e4d75e")),
+                          .package(url: "https://github.com/Infomaniak/ios-core", .revision("ef2811a288a3a4b94dd5d04c5f47ddd771e4176c")),
                           .package(url: "https://github.com/Infomaniak/ios-core-ui", .upToNextMajor(from: "2.3.0")),
                           .package(url: "https://github.com/Infomaniak/ios-notifications", .upToNextMajor(from: "2.1.0")),
                           .package(url: "https://github.com/Infomaniak/ios-create-account", .upToNextMajor(from: "1.1.0")),