Fixed dependencies

Author: tobihagemann

CryptomatorCryptoLib.xcodeproj/project.pbxproj

@@ -9,10 +9,10 @@
 /* Begin PBXBuildFile section */
 		4A7C213C2451F2AC00DE81E6 /* CryptomatorCryptoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A7C21322451F2AC00DE81E6 /* CryptomatorCryptoLib.framework */; };
 		4A7C21432451F2AD00DE81E6 /* CryptomatorCryptoLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A7C21352451F2AC00DE81E6 /* CryptomatorCryptoLib.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		742023E72555A4A200822899 /* Base32 in Frameworks */ = {isa = PBXBuildFile; productRef = 742023E62555A4A200822899 /* Base32 */; };
 		74F0F754248FC89B00B4C26D /* CryptoError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74F0F753248FC89B00B4C26D /* CryptoError.swift */; };
 		74F0F75A2490C1EB00B4C26D /* CryptoSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74F0F7592490C1EB00B4C26D /* CryptoSupport.swift */; };
 		74F9352A251F44E0001F4ADA /* CryptoSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 74F93529251F44E0001F4ADA /* CryptoSwift */; };
-		74F9352F251F44FE001F4ADA /* SwiftBase32 in Frameworks */ = {isa = PBXBuildFile; productRef = 74F9352E251F44FE001F4ADA /* SwiftBase32 */; };
 		9E35C4EB24576A3D0006E50C /* CryptorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E35C4EA24576A3D0006E50C /* CryptorTests.swift */; };
 		9E44EEA624599C6900A37B01 /* AesSiv.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E44EEA524599C6900A37B01 /* AesSiv.swift */; };
 		9E44EEA92459AB1500A37B01 /* AesSivTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E44EEA724599C7800A37B01 /* AesSivTests.swift */; };
@@ -56,7 +56,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				74F9352F251F44FE001F4ADA /* SwiftBase32 in Frameworks */,
+				742023E72555A4A200822899 /* Base32 in Frameworks */,
 				74F9352A251F44E0001F4ADA /* CryptoSwift in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -164,7 +164,7 @@
 			name = CryptomatorCryptoLib;
 			packageProductDependencies = (
 				74F93529251F44E0001F4ADA /* CryptoSwift */,
-				74F9352E251F44FE001F4ADA /* SwiftBase32 */,
+				742023E62555A4A200822899 /* Base32 */,
 			);
 			productName = CryptoLib;
 			productReference = 4A7C21322451F2AC00DE81E6 /* CryptomatorCryptoLib.framework */;
@@ -218,7 +218,7 @@
 			mainGroup = 4A7C21282451F2AC00DE81E6;
 			packageReferences = (
 				74F93528251F44E0001F4ADA /* XCRemoteSwiftPackageReference "CryptoSwift" */,
-				74F9352D251F44FE001F4ADA /* XCRemoteSwiftPackageReference "Base32" */,
+				742023E52555A4A200822899 /* XCRemoteSwiftPackageReference "Base32" */,
 			);
 			productRefGroup = 4A7C21332451F2AC00DE81E6 /* Products */;
 			projectDirPath = "";
@@ -347,8 +347,8 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					"SWIFT_PACKAGE=1",
 					"DEBUG=1",
-					"$(inherited)",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -409,6 +409,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = "SWIFT_PACKAGE=1";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -548,35 +549,35 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		74F93528251F44E0001F4ADA /* XCRemoteSwiftPackageReference "CryptoSwift" */ = {
+		742023E52555A4A200822899 /* XCRemoteSwiftPackageReference "Base32" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/krzyzanowskim/CryptoSwift.git";
+			repositoryURL = "https://github.com/norio-nomura/Base32.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 1.3.0;
+				minimumVersion = 0.8.0;
 			};
 		};
-		74F9352D251F44FE001F4ADA /* XCRemoteSwiftPackageReference "Base32" */ = {
+		74F93528251F44E0001F4ADA /* XCRemoteSwiftPackageReference "CryptoSwift" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/cryptomator/Base32.git";
+			repositoryURL = "https://github.com/krzyzanowskim/CryptoSwift.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 0.8.0;
+				minimumVersion = 1.3.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		742023E62555A4A200822899 /* Base32 */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 742023E52555A4A200822899 /* XCRemoteSwiftPackageReference "Base32" */;
+			productName = Base32;
+		};
 		74F93529251F44E0001F4ADA /* CryptoSwift */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 74F93528251F44E0001F4ADA /* XCRemoteSwiftPackageReference "CryptoSwift" */;
 			productName = CryptoSwift;
 		};
-		74F9352E251F44FE001F4ADA /* SwiftBase32 */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 74F9352D251F44FE001F4ADA /* XCRemoteSwiftPackageReference "Base32" */;
-			productName = SwiftBase32;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 4A7C21292451F2AC00DE81E6 /* Project object */;

CryptomatorCryptoLib.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -20,11 +20,11 @@ let package = Package(
 		.library(name: "CryptomatorCryptoLib", targets: ["CryptomatorCryptoLib"])
 	],
 	dependencies: [
-		.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMinor(from: "1.3.0")),
-		.package(url: "https://github.com/norio-nomura/Base32.git", .upToNextMinor(from: "0.8.0"))
+		.package(url: "https://github.com/norio-nomura/Base32.git", .upToNextMinor(from: "0.8.0")),
+		.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMinor(from: "1.3.0"))
 	],
 	targets: [
-		.target(name: "CryptomatorCryptoLib", dependencies: ["CryptoSwift", "Base32"]),
+		.target(name: "CryptomatorCryptoLib", dependencies: ["Base32", "CryptoSwift"]),
 		.testTarget(name: "CryptomatorCryptoLibTests", dependencies: ["CryptomatorCryptoLib"])
 	],
 	swiftLanguageVersions: [.v5]