Merge branch 'release/2.4.7'

cryptomator · Feb 16, 2023 · 558cf43 · 558cf43
2 parents 546aaaa + 7b33119
commit 558cf43
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 21 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -41,7 +41,9 @@ body:
         - Dropbox
         - Google Drive
         - OneDrive
+        - pCloud
         - WebDAV
+        - S3
         - Other File Provider
     validations:
       required: false

diff --git a/Cryptomator.xcodeproj/project.pbxproj b/Cryptomator.xcodeproj/project.pbxproj
@@ -2306,8 +2306,8 @@
 			);
 			mainGroup = 4A5E5B202453119100BD6298;
 			packageReferences = (
-				4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt.git" */,
-				4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect.git" */,
+				4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt" */,
+				4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
 			);
 			productRefGroup = 4A5E5B2A2453119100BD6298 /* Products */;
 			projectDirPath = "";
@@ -2976,7 +2976,6 @@
 		};
 		4A9172722619F16C003C4043 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			productRef = 4A9172712619F16C003C4043;
 		};
 		4A9BED69268F379300721BAA /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
@@ -3260,7 +3259,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.4.6;
+				MARKETING_VERSION = 2.4.7;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3322,7 +3321,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.4.6;
+				MARKETING_VERSION = 2.4.7;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";
@@ -3350,6 +3349,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cryptomator.ios.fileprovider-ui";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "37305fac-36be-4fe5-97bd-941e51187d50";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development org.cryptomator.ios.fileprovider-ui";
 				SKIP_INSTALL = YES;
 			};
@@ -3370,6 +3370,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cryptomator.ios.fileprovider-ui";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "de89cc0f-597d-413e-84e3-2108c3bb4841";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.cryptomator.ios.fileprovider-ui";
 				SKIP_INSTALL = YES;
 			};
@@ -3391,6 +3392,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios.fileprovider;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "b02d124e-86ef-431a-bf4c-f1203aa86ff5";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development org.cryptomator.ios.fileprovider";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "FileProviderExtension/FileProviderExtension-Bridging-Header.h";
@@ -3414,6 +3416,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios.fileprovider;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "a9384f4d-7dbd-4b66-b79b-be9c7cf0bebc";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.cryptomator.ios.fileprovider";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "FileProviderExtension/FileProviderExtension-Bridging-Header.h";
@@ -3437,6 +3440,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios.intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "526da0c4-3ad8-4563-beca-e13c19f3724d";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development org.cryptomator.ios.intents";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -3460,6 +3464,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios.intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "364c065c-fadb-43fc-8c5d-b5cd7b9278bf";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.cryptomator.ios.intents";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -3481,6 +3486,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "4e48538a-4159-41f0-8f58-3b6a1b25e374";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development org.cryptomator.ios";
 			};
 			name = Debug;
@@ -3500,6 +3506,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "1e4ece37-8d7d-4cdb-ad79-61ca52e40a64";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.cryptomator.ios";
 			};
 			name = Release;
@@ -3660,15 +3667,15 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt.git" */ = {
+		4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/tikhop/TPInAppReceipt.git";
 			requirement = {
 				kind = upToNextMinorVersion;
 				minimumVersion = 3.3.0;
 			};
 		};
-		4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect.git" */ = {
+		4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/siteline/SwiftUI-Introspect.git";
 			requirement = {
@@ -3681,7 +3688,7 @@
 /* Begin XCSwiftPackageProductDependency section */
 		4A1521E327C55EA2006C96B2 /* TPInAppReceipt */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt.git" */;
+			package = 4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt" */;
 			productName = TPInAppReceipt;
 		};
 		4A33092C282EC23400876A3E /* CryptomatorCommonCore */ = {
@@ -3698,7 +3705,7 @@
 		};
 		4AED9A6E286B38DA00352951 /* Introspect */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect.git" */;
+			package = 4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
 			productName = Introspect;
 		};
 /* End XCSwiftPackageProductDependency section */

diff --git a/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/cryptomator/cloud-access-swift.git",
         "state": {
           "branch": null,
-          "revision": "e4618d8783b6569c6ee53c1ad78af7dc849a9b2e",
-          "version": "1.7.2"
+          "revision": "f714b246aa64e75593c503dc1261049eccc81ca4",
+          "version": "1.7.3"
         }
       },
       {

diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
@@ -1,2 +1,3 @@
-- Fixed random crashes when downloading/uploading files via WebDAV (#299, #301)
-- Fixed use of apostrophes in vault names (or their containing path) in Google Drive (#296)
+- Fixed random crashes when downloading files via Google Drive (#306)
+
+Unfortunately, the new download progress indication that we added in 2.4.4 caused some issues we didn't anticipate. So we've removed this feature from Google Drive for now. We may revisit it in a future release.
diff --git a/fastlane/config/freemium/metadata/de-DE/release_notes.txt b/fastlane/config/freemium/metadata/de-DE/release_notes.txt
@@ -1,2 +1,3 @@
-- Zufällige Abstürze beim Herunterladen/Hochladen von Dateien über WebDAV behoben (#299, #301)
-- Nutzung von Apostrophen in Tresornamen (oder dem darin enthaltenen Pfad) in Google Drive behoben (#296)
+- Zufällige Abstürze beim Herunterladen von Dateien über Google Drive behoben (#306)
+
+Leider hat die neue Anzeige des Download-Fortschritts, die wir in der Version 2.4.4 hinzugefügt haben, einige Probleme verursacht, die wir nicht erwartet hatten. Daher haben wir diese Funktion vorerst aus Google Drive entfernt. Möglicherweise werden wir sie in einer zukünftigen Version wieder einbauen.
diff --git a/fastlane/config/freemium/metadata/en-US/release_notes.txt b/fastlane/config/freemium/metadata/en-US/release_notes.txt
@@ -1,2 +1,3 @@
-- Fixed random crashes when downloading/uploading files via WebDAV (#299, #301)
-- Fixed use of apostrophes in vault names (or their containing path) in Google Drive (#296)
+- Fixed random crashes when downloading files via Google Drive (#306)
+
+Unfortunately, the new download progress indication that we added in 2.4.4 caused some issues we didn't anticipate. So we've removed this feature from Google Drive for now. We may revisit it in a future release.
diff --git a/fastlane/config/premium/metadata/de-DE/release_notes.txt b/fastlane/config/premium/metadata/de-DE/release_notes.txt
@@ -1,2 +1,3 @@
-- Zufällige Abstürze beim Herunterladen/Hochladen von Dateien über WebDAV behoben (#299, #301)
-- Nutzung von Apostrophen in Tresornamen (oder dem darin enthaltenen Pfad) in Google Drive behoben (#296)
+- Zufällige Abstürze beim Herunterladen von Dateien über Google Drive behoben (#306)
+
+Leider hat die neue Anzeige des Download-Fortschritts, die wir in der Version 2.4.4 hinzugefügt haben, einige Probleme verursacht, die wir nicht erwartet hatten. Daher haben wir diese Funktion vorerst aus Google Drive entfernt. Möglicherweise werden wir sie in einer zukünftigen Version wieder einbauen.
diff --git a/fastlane/config/premium/metadata/en-US/release_notes.txt b/fastlane/config/premium/metadata/en-US/release_notes.txt
@@ -1,2 +1,3 @@
-- Fixed random crashes when downloading/uploading files via WebDAV (#299, #301)
-- Fixed use of apostrophes in vault names (or their containing path) in Google Drive (#296)
+- Fixed random crashes when downloading files via Google Drive (#306)
+
+Unfortunately, the new download progress indication that we added in 2.4.4 caused some issues we didn't anticipate. So we've removed this feature from Google Drive for now. We may revisit it in a future release.