Merge branch 'release/2.0.3'

cryptomator · Dec 22, 2021 · 95bd789 · 95bd789
2 parents 8d451f0 + b1a89d1
commit 95bd789
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/Cryptomator.xcodeproj/project.pbxproj b/Cryptomator.xcodeproj/project.pbxproj
@@ -2629,7 +2629,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.0.2;
+				MARKETING_VERSION = 2.0.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -2691,7 +2691,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.0.2;
+				MARKETING_VERSION = 2.0.3;
 				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";

diff --git a/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/cryptomator/cloud-access-swift.git",
         "state": {
           "branch": null,
-          "revision": "c4597ccf64ffc5cc4d75dde879a0cee6a71fc2e3",
-          "version": "1.1.1"
+          "revision": "a033fc732b5c7baa2dbc6134591e6fd5345c620e",
+          "version": "1.1.2"
         }
       },
       {

diff --git a/FileProviderExtension/Info.plist b/FileProviderExtension/Info.plist
@@ -20,6 +20,11 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

diff --git a/FileProviderExtensionUI/Info.plist b/FileProviderExtensionUI/Info.plist
@@ -20,6 +20,11 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPrincipalClass</key>

diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
@@ -1 +1,2 @@
-Welcome to the new Cryptomator for iOS app! This new app is fully integrated into the Files app of iOS. Happy crypting!
+- Fixed upload errors in Google Drive (#134)
+- Fixed support of self-signed certificates and HTTP for WebDAV connections (#133)
diff --git a/fastlane/metadata/de-DE/release_notes.txt b/fastlane/metadata/de-DE/release_notes.txt
@@ -1 +1,2 @@
-Willkommen bei der neuen Cryptomator für iOS-App! Diese neue App ist vollständig in die App „Dateien“ von iOS integriert. Viel Spaß beim Verschlüsseln!
+- Upload-Fehler in Google Drive behoben (#134)
+- Unterstützung von selbstsignierten Zertifikaten und HTTP für WebDAV-Verbindungen behoben (#133)
diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt
@@ -1 +1,2 @@
-Welcome to the new Cryptomator for iOS app! This new app is fully integrated into the Files app of iOS. Happy crypting!
+- Fixed upload errors in Google Drive (#134)
+- Fixed support of self-signed certificates and HTTP for WebDAV connections (#133)