Merge branch 'release/2.0.0-rc1'

CryptomatorCommon/Package.swift

@@ -8,17 +8,8 @@
 //  Copyright © 2021 Skymatic GmbH. All rights reserved.
 //
 
-import Foundation
 import PackageDescription
 
-let swiftSettings: [SwiftSetting]?
-if ProcessInfo.processInfo.environment["TESTFLIGHT"] == "1" {
-	print("Enabled TestFlight environment")
-	swiftSettings = [.define("TESTFLIGHT")]
-} else {
-	swiftSettings = nil
-}
-
 let package = Package(
 	name: "CryptomatorCommon",
 	platforms: [
@@ -44,21 +35,18 @@ let package = Package(
 			dependencies: [
 				"CryptomatorCommonCore",
 				"CryptomatorCloudAccess"
-			],
-			swiftSettings: swiftSettings
+			]
 		),
 		.target(
 			name: "CryptomatorCommonCore",
 			dependencies: [
 				"CocoaLumberjackSwift",
 				"CryptomatorCloudAccessCore"
-			],
-			swiftSettings: swiftSettings
+			]
 		),
 		.testTarget(
 			name: "CryptomatorCommonCoreTests",
-			dependencies: ["CryptomatorCommonCore"],
-			swiftSettings: swiftSettings
+			dependencies: ["CryptomatorCommonCore"]
 		)
 	]
 )

CryptomatorCommon/Sources/CryptomatorCommonCore/CryptomatorUserDefaults.swift

@@ -45,11 +45,9 @@ public class CryptomatorUserDefaults {
 	}
 
 	private func key(from property: String) -> String {
-		#if TESTFLIGHT
+		#warning("TestFlight environment is enabled")
 		return "\(property)-TestFlight"
-		#else
-		return property
-		#endif
+//		return property
 	}
 }
 

fastlane/Fastfile

@@ -26,7 +26,6 @@ platform :ios do
 
   desc "Submit a new internal beta build to TestFlight"
   lane :beta do
-    ENV["TESTFLIGHT"] = "1"
     gym(scheme: "Cryptomator", clean: true)
     changelog = File.read("changelog.txt")
     pilot(changelog: changelog, distribute_external: false, groups: ["App Store Connect Users"], skip_waiting_for_build_processing: true)