uploadcare
diff --git a/‎.github/workflows/test.yml
+2-2 b/‎.github/workflows/test.yml
+2-2
diff --git a/‎Demo/Demo.xcodeproj/project.pbxproj
+7-4 b/‎Demo/Demo.xcodeproj/project.pbxproj
+7-4
diff --git a/‎Demo/Demo/Models/CollaboratorViewData.swift
+2-1 b/‎Demo/Demo/Models/CollaboratorViewData.swift
+2-1
diff --git a/‎Demo/Demo/Modules/FilesListStore.swift
+23-7 b/‎Demo/Demo/Modules/FilesListStore.swift
+23-7
diff --git a/‎Demo/Demo/SceneDelegate.swift
+4-7 b/‎Demo/Demo/SceneDelegate.swift
+4-7
diff --git a/‎Demo/Demo/ViewModels/GroupsListViewModel.swift
+14-18 b/‎Demo/Demo/ViewModels/GroupsListViewModel.swift
+14-18
diff --git a/‎Demo/Demo/ViewModels/ProjectInfoViewModel.swift
+6-14 b/‎Demo/Demo/ViewModels/ProjectInfoViewModel.swift
+6-14
diff --git a/‎Demo/Demo/Views/FilesList/FilesListView.swift
+22-40 b/‎Demo/Demo/Views/FilesList/FilesListView.swift
+22-40
diff --git a/‎Demo/Demo/Views/GroupsList/GroupFileList.swift
+15-21 b/‎Demo/Demo/Views/GroupsList/GroupFileList.swift
+15-21
diff --git a/‎Demo/Demo/Views/GroupsList/GroupsListView.swift
+7-3 b/‎Demo/Demo/Views/GroupsList/GroupsListView.swift
+7-3
@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.5.3
 
     - name: Swift build for iOS
       run: swift build -c release -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios13.0-simulator"
@@ -31,7 +31,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.5.3
 
     - name: Build Carthage target ${{matrix.target}}
       run: xcodebuild build -project Uploadcare.xcodeproj -scheme ${{matrix.target}} -configuration Release
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -64,7 +64,6 @@
 		24AA61DC247C5B1C000BABA9 /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
 		24BAB4382549E4070075E79A /* PickerType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PickerType.swift; sourceTree = "<group>"; };
 		24BAB43B2549E42D0075E79A /* UploadState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadState.swift; sourceTree = "<group>"; };
-		24BAB4402549E4DA0075E79A /* APIStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIStore.swift; sourceTree = "<group>"; };
 		24BAB4442549E53A0075E79A /* GroupsListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupsListViewModel.swift; sourceTree = "<group>"; };
 		24BAB4472549E5AC0075E79A /* FilesListStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilesListStore.swift; sourceTree = "<group>"; };
 		24BAB44A2549E6270075E79A /* ImageStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageStore.swift; sourceTree = "<group>"; };
@@ -173,7 +172,6 @@
 		24BAB43E2549E4930075E79A /* Modules */ = {
 			isa = PBXGroup;
 			children = (
-				24BAB4402549E4DA0075E79A /* APIStore.swift */,
 				24BAB4472549E5AC0075E79A /* FilesListStore.swift */,
 				24BAB44A2549E6270075E79A /* ImageStore.swift */,
 				24BAB44D2549E65A0075E79A /* RandomTransformator.swift */,
@@ -253,8 +251,9 @@
 		243A711E242CEAA200CA229B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1140;
-				LastUpgradeCheck = 1210;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "Uploadcare, Inc";
 				TargetAttributes = {
 					243A7125242CEAA200CA229B = {
@@ -476,7 +475,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.uploadcare.Demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -502,7 +503,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.uploadcare.Demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 
@@ -8,8 +8,9 @@
 
 import Foundation
 
-struct CollaboratorViewData {
+struct CollaboratorViewData: Identifiable, Hashable {
 	// MARK: - Public properties
+	let id = UUID()
 	var name: String
 	var email: String
 }
@@ -39,18 +39,34 @@ class FilesListStore: ObservableObject {
 	}
 
 	// MARK: - Public methods
-	func load(_ completionHandler: @escaping (Result<FilesList, RESTAPIError>) -> Void) {
+	func load() async throws {
+		guard let list = list else { fatalError("No list object") }
+		list.results.removeAll()
+
 		let query = PaginationQuery()
 			.limit(5)
 			.ordering(.dateTimeUploadedDESC)
-		
-		self.list?.get(withQuery: query, completionHandler)
+
+		try await list.get(withQuery: query)
+		DispatchQueue.main.async {
+			list.results.forEach { self.files.append(FileViewData( file: $0)) }
+		}
 	}
-	
-	func loadNext(_ completionHandler: @escaping (Result<FilesList, RESTAPIError>) -> Void) {
-		self.list?.nextPage(completionHandler)
+
+	func loadNext() async throws {
+		guard let list = list else { fatalError("No list object") }
+		try await list.nextPage()
+		DispatchQueue.main.async {
+			list.results.forEach({ self.files.append(FileViewData( file: $0)) })
+		}
 	}
-	
+
+	func deleteFiles(at offsets: IndexSet) async throws {
+		let uuids = offsets.map { self.files[$0].file.uuid }
+		try await uploadcare?.deleteFiles(withUUIDs: uuids)
+		DispatchQueue.main.async { self.files.remove(atOffsets: offsets) }
+	}
+
 	func uploadFiles(_ urls: [URL], completionHandler: @escaping ([String])->Void) {
 		self.filesQueue = urls
 		var fileIds: [String] = []
 
@@ -24,9 +24,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 		// If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
 		// This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
 
-		// Create the SwiftUI view that provides the window contents.
-		let contentView = MainView()
-
 		// Use a UIHostingController as window root view controller.
 		if let windowScene = scene as? UIWindowScene {
 		    let window = UIWindow(windowScene: windowScene)
@@ -37,11 +34,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 			)
 
 			let apiStore = APIStore(uploadcare: uploadcare)
+
+			// Create the SwiftUI view that provides the window contents.
+			let contentView = MainView().environmentObject(apiStore)
 
-		    window.rootViewController = UIHostingController(
-				rootView: contentView
-					.environmentObject(apiStore)
-			)
+		    window.rootViewController = UIHostingController(rootView: contentView)
 		    self.window = window
 		    window.makeKeyAndVisible()
 		}
 
@@ -29,30 +29,26 @@ class GroupsListViewModel: ObservableObject {
 
 // MARK: - Public methods
 extension GroupsListViewModel {
-	func loadData() {
+	func loadData() async throws {
+		guard let list else { return }
 		let query = GroupsListQuery()
 			.limit(5)
 			.ordering(.datetimeCreatedDESC)
-		
-		self.list?.get(withQuery: query) { [weak self] result in
-			switch result {
-			case .failure(let error):
-				DLog(error)
-			case .success(let list):
-				self?.groups.removeAll()
-				list.results.forEach { self?.groups.append(GroupViewData(group: $0)) }
+
+		let newData = try await list.get(withQuery: query)
+		DispatchQueue.main.async { [weak self] in
+			self?.groups.removeAll()
+			newData.results.forEach {
+				self?.groups.append(GroupViewData(group: $0))
 			}
 		}
 	}
-	
-	func loadMoreIfNeed() {
-		self.list?.nextPage { [weak self] result in
-			switch result {
-			case .failure(let error):
-				DLog(error)
-			case .success(let list):
-				list.results.forEach({ self?.groups.append(GroupViewData(group: $0)) })
-			}
+
+	func loadMoreIfNeed() async throws {
+		guard let list else { return }
+		let newData = try await list.nextPage()
+		DispatchQueue.main.async { [weak self] in
+			newData.results.forEach({ self?.groups.append(GroupViewData(group: $0)) })
 		}
 	}
 }
@@ -32,7 +32,7 @@ class ProjectInfoViewModel: ObservableObject {
 
 	// MARK: - Private properties
 	private var uploadcare: Uploadcare?
-	@Published private var projectData: Project?
+	private var projectData: Project?
 
 	// MARK: - Init
 	init(projectData: Project? = nil, uploadcare: Uploadcare? = nil) {
@@ -42,20 +42,12 @@ class ProjectInfoViewModel: ObservableObject {
 }
 
 extension ProjectInfoViewModel {
-	func loadData(onComplete: @escaping ()->Void) {
-		guard let api = uploadcare else {
-			onComplete()
-			return
-		}
+	func loadData() async throws {
+		guard let api = uploadcare else { return }
+		let project = try await api.getProjectInfo()
 
-		api.getProjectInfo { result in
-			switch result {
-			case .failure(let error):
-				DLog(error)
-			case .success(let project):
-				self.projectData = project
-				onComplete()
-			}
+		DispatchQueue.main.async { [weak self] in
+			self?.projectData = project
 		}
 	}
 }
@@ -127,7 +127,6 @@ struct FilesListView: View {
 				}
 				EditButton()
             }
-            
         )
         .navigationBarTitle(Text("List of files"))
 	}
@@ -147,56 +146,39 @@ struct FilesListView: View {
 
 	func loadMoreIfNeed() {
 		self.isLoading = true
-		filesListStore.loadNext { result in
-			defer { self.isLoading = false }
+		Task {
+			defer { DispatchQueue.main.async { self.isLoading = false } }
 
-			switch result {
-			case .failure(let error):
-				self.alertMessage = error.detail
-				self.isShowingAlert.toggle()
-				DLog(error)
-			case .success(let list):
-                DispatchQueue.main.async {
-                    list.results.forEach({ self.filesListStore.files.append(FileViewData( file: $0)) })
-                }
+			do {
+				try await filesListStore.loadNext()
+			} catch let error {
+				DispatchQueue.main.async {
+					self.alertMessage = (error as? RESTAPIError)?.detail ?? error.localizedDescription
+					self.isShowingAlert.toggle()
+				}
 			}
 		}
 	}
 
 	func delete(at offsets: IndexSet) {
-        offsets.forEach { (index) in
-            let fileView = filesListStore.files[index]
-            let uuid = fileView.file.uuid
-            
-            self.api.uploadcare?.deleteFile(withUUID: uuid) { result in
-				switch result {
-				case .failure(let error):
-					DLog(error)
-				case .success(_):
-					break
-				}
-            }
-        }
-        
-		filesListStore.files.remove(atOffsets: offsets)
+		Task {
+			try await self.filesListStore.deleteFiles(at: offsets)
+		}
 	}
 
 	func loadData() {
 		filesListStore.uploadcare = self.api.uploadcare
-		filesListStore.load { result in
-			defer { self.isLoading = false }
+		Task {
+			defer { DispatchQueue.main.async { self.isLoading = false } }
 
-			switch result {
-			case .failure(let error):
-				self.alertMessage = error.detail
-				self.isShowingAlert.toggle()
-				DLog(error)
-			case .success(let list):
-				self.didLoadData = true
-                DispatchQueue.main.async {
-                    self.filesListStore.files.removeAll()
-                    list.results.forEach { self.filesListStore.files.append(FileViewData( file: $0)) }
-                }
+			do {
+				try await self.filesListStore.load()
+				DispatchQueue.main.async { self.didLoadData = true }
+			} catch let error {
+				DispatchQueue.main.async {
+					self.alertMessage = (error as? RESTAPIError)?.detail ?? error.localizedDescription
+					self.isShowingAlert.toggle()
+				}
 			}
 		}
 	}
 
@@ -37,7 +37,7 @@ struct GroupFileList: View {
 		.onAppear {
 			guard self.didLoadData == false else { return }
 			self.didLoadData = true
-			self.loadData()
+			Task { try await self.loadData() }
 		}
 		.alert(isPresented: $isShowingAlert) {
 			Alert(
@@ -49,31 +49,25 @@ struct GroupFileList: View {
 		.navigationBarTitle(Text("Files in group"))
     }
 
-	func loadData() {
-		self.api.uploadcare?.groupInfo(withUUID: self.viewData.group.id) { result in
-			defer { self.isLoading = false }
+	func loadData() async throws {
+		defer {
+			DispatchQueue.main.async {
+				self.isLoading = false
+			}
+		}
 
-			switch result {
-			case .failure(let error):
-				self.alertMessage = error.detail
-				self.isShowingAlert.toggle()
-				DLog(error)
-			case .success(let group):
+		do {
+			guard let group = try await self.api.uploadcare?.groupInfo(withUUID: self.viewData.group.id) else { return }
+			DispatchQueue.main.async {
 				self.filesListStore.files.removeAll()
 				group.files?.forEach { self.filesListStore.files.append(FileViewData( file: $0)) }
 			}
+		} catch {
+			DispatchQueue.main.async {
+				self.alertMessage = (error as? RESTAPIError)?.detail ?? "Error"
+				DLog(error)
+			}
 		}
-//		filesListStore.uploadcare = self.api.uploadcare
-//		filesListStore.load { (list, error) in
-//			defer { self.isLoading = false }
-//			if let error = error {
-//				self.alertMessage = error.detail
-//				self.isShowingAlert.toggle()
-//				return print(error)
-//			}
-//			self.filesListStore.files.removeAll()
-//			list?.results.forEach { self.filesListStore.files.append(FileViewData( file: $0)) }
-//		}
 	}
 }
 
 
@@ -19,14 +19,18 @@ struct GroupsListView: View {
 						GroupRowView(groupData: group)
 						.onAppear {
 							if group.group.id == viewModel.groups.last?.group.id {
-								viewModel.loadMoreIfNeed()
+								Task {
+									try await viewModel.loadMoreIfNeed()
+								}
 							}
 						}
 					}
 				}
 			}
-		}.onAppear { [self] in
-			viewModel.loadData()
+		}.onAppear {
+			Task {
+				try await viewModel.loadData()
+			}
         }.navigationBarTitle(Text("List of groups"))
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@`
`8`	`8`
`9`	`9`	`import Foundation`
`10`	`10`
`11`		`-struct CollaboratorViewData {`
	`11`	`+struct CollaboratorViewData: Identifiable, Hashable {`
`12`	`12`	`// MARK: - Public properties`
	`13`	`+ let id = UUID()`
`13`	`14`	`var name: String`
`14`	`15`	`var email: String`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,18 @@ struct GroupsListView: View {`
`19`	`19`	`GroupRowView(groupData: group)`
`20`	`20`	`.onAppear {`
`21`	`21`	`if group.group.id == viewModel.groups.last?.group.id {`
`22`		`- viewModel.loadMoreIfNeed()`
	`22`	`+ Task {`
	`23`	`+ try await viewModel.loadMoreIfNeed()`
	`24`	`+ }`
`23`	`25`	`}`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`	`}`
`27`	`29`	`}`
`28`		`- }.onAppear { [self] in`
`29`		`- viewModel.loadData()`
	`30`	`+ }.onAppear {`
	`31`	`+ Task {`
	`32`	`+ try await viewModel.loadData()`
	`33`	`+ }`
`30`	`34`	`}.navigationBarTitle(Text("List of groups"))`
`31`	`35`	`}`
`32`	`36`	`}`