Skip to content

Commit

Permalink
Merge branch 'master' into converstion-quota-dropbox
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrien-coye
adrien-coye committed Feb 7, 2025
2 parents a169257 + 202c576 commit 3c4af77
Show file tree
Hide file tree
Showing 12 changed files with 79 additions and 85 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/checkout@v2
- name: Create test env
env:
ENV_PATH: "kDriveTests/Env.swift"
ENV_PATH: "kDriveTestShared/Env.swift"
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
USER_ID: ${{ secrets.USER_ID }}
INVITE_USER_ID: ${{ secrets.INVITE_USER_ID }}
Expand All @@ -30,6 +30,8 @@ jobs:
touch $ENV_PATH
echo -e "enum Env {\n static let token = \"$ACCESS_TOKEN\"\n\n static let driveId = 420132\n\n static let userId = $USER_ID\n\n static let inviteUserId = $INVITE_USER_ID\n\n static let inviteMail = \"$INVITE_EMAIL\"\n\n static let inviteTeam = 0\n\n static let commonDocumentsId = 3\n}" > $ENV_PATH
- name: Build
run: tuist install && tuist build --generate kDrive
- name: Test
run: tuist test kDrive --test-targets kDriveTests/DriveApiTests
run: tuist install && tuist generate && tuist build --clean kDrive
- name: Test Local
run: tuist generate && tuist test kDriveTests
- name: Test API
run: tuist generate && tuist test kDriveAPITests --test-targets kDriveAPITests/DriveApiTests
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,4 @@ release/
kDriveTests/Env.swift
kDriveAPITests/Env.swift
kDriveUITests/Env.swift
kDriveTestShared/Env.swift
2 changes: 1 addition & 1 deletion .mise.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tools]
tuist = '4.12.1'
tuist = '4.41.0'
periphery = '2.21.1'
swiftformat = '0.54.5'
swiftlint = '0.57.0'
Expand Down
66 changes: 48 additions & 18 deletions Project.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ import ProjectDescription
import ProjectDescriptionHelpers

let project = Project(name: "kDrive",
packages: [],
options: .options(
automaticSchemesOptions: .enabled(
targetSchemesGrouping: .notGrouped
)
),
targets: [
.target(name: "kDrive",
destinations: Constants.destinations,
Expand All @@ -48,13 +52,17 @@ let project = Project(name: "kDrive",
.target(name: "kDriveCore"),
.target(name: "kDriveShareExtension"),
.target(name: "kDriveActionExtension"),
.external(name: "FloatingPanel"),
.external(name: "Lottie"),
.external(name: "CocoaLumberjackSwift"),
.external(name: "CocoaLumberjack"),
.external(name: "DropDown"),
.external(name: "FloatingPanel"),
.external(name: "Highlightr"),
.external(name: "HorizonCalendar"),
.external(name: "Kvitto"),
.external(name: "Highlightr"),
.external(name: "Lottie"),
.external(name: "MarkdownKit"),
.external(name: "RealmSwift"),
.external(name: "Realm"),
.sdk(name: "StoreKit", type: .framework, status: .required)
],
settings: .settings(base: Constants.baseSettings),
Expand All @@ -76,7 +84,16 @@ let project = Project(name: "kDrive",
"kDriveTests/**/*.json"
],
dependencies: [
.target(name: "kDrive")
.target(name: "kDrive"),
.target(name: "kDriveCore"),
.external(name: "Alamofire"),
.external(name: "InfomaniakCoreCommonUI"),
.external(name: "InfomaniakCoreUIKit"),
.external(name: "InfomaniakCore"),
.external(name: "InfomaniakDI"),
.external(name: "InfomaniakLogin"),
.external(name: "RealmSwift"),
.external(name: "Realm")
],
settings: .settings(base: Constants.testSettings)),
.target(name: "kDriveAPITests",
Expand All @@ -90,7 +107,13 @@ let project = Project(name: "kDrive",
"kDriveTestShared/**"
],
dependencies: [
.target(name: "kDrive")
.target(name: "kDrive"),
.target(name: "kDriveCore"),
.external(name: "InfomaniakCore"),
.external(name: "InfomaniakDI"),
.external(name: "InfomaniakLogin"),
.external(name: "RealmSwift"),
.external(name: "Realm")
],
settings: .settings(base: Constants.testSettings)),
.target(name: "kDriveUITests",
Expand Down Expand Up @@ -133,24 +156,25 @@ let project = Project(name: "kDrive",
.external(name: "Alamofire"),
.external(name: "Algorithms"),
.external(name: "Atlantis"),
.external(name: "MQTTNIO"),
.external(name: "InfomaniakCore"),
.external(name: "InfomaniakCoreDB"),
.external(name: "CocoaLumberjackSwift"),
.external(name: "CocoaLumberjack"),
.external(name: "DifferenceKit"),
.external(name: "InfomaniakConcurrency"),
.external(name: "InfomaniakCoreCommonUI"),
.external(name: "InfomaniakCoreDB"),
.external(name: "InfomaniakCoreSwiftUI"),
.external(name: "InfomaniakCoreUIKit"),
.external(name: "InfomaniakLogin"),
.external(name: "InfomaniakCore"),
.external(name: "InfomaniakDI"),
.external(name: "InfomaniakConcurrency"),
.external(name: "RealmSwift"),
.external(name: "InfomaniakLogin"),
.external(name: "Kingfisher"),
.external(name: "DifferenceKit"),
.external(name: "CocoaLumberjackSwift"),
.external(name: "LocalizeKit"),
.external(name: "MaterialOutlinedTextField"),
.external(name: "SwiftRegex"),
.external(name: "MQTTNIO"),
.external(name: "RealmSwift"),
.external(name: "Sentry-Dynamic"),
.external(name: "VersionChecker"),
.external(name: "LocalizeKit")
.external(name: "SwiftRegex"),
.external(name: "VersionChecker")
]),
.target(name: "kDriveFileProvider",
destinations: Constants.destinations,
Expand All @@ -170,7 +194,13 @@ let project = Project(name: "kDrive",
headers: .headers(project: "kDriveFileProvider/**"),
entitlements: "kDriveFileProvider/FileProvider.entitlements",
dependencies: [
.target(name: "kDriveCore")
.target(name: "kDriveCore"),
.external(name: "CocoaLumberjackSwift"),
.external(name: "CocoaLumberjack"),
.external(name: "InfomaniakCore"),
.external(name: "InfomaniakDI"),
.external(name: "InfomaniakLogin"),
.external(name: "RealmSwift")
],
settings: .settings(
base: Constants.fileProviderSettings,
Expand Down
19 changes: 15 additions & 4 deletions Tuist/Package.swift
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
// swift-tools-version: 5.9
import PackageDescription
// swift-tools-version: 5.10
@preconcurrency import PackageDescription

#if TUIST
import ProjectDescription
import ProjectDescriptionHelpers

let packageSettings = PackageSettings(
productTypes: [
"RealmSwift": .staticLibrary,
"Realm": .staticLibrary
"Alamofire": .framework,
"Atlantis": .staticFramework,
"CocoaLumberjackSwift": .framework,
"CocoaLumberjack": .framework,
"InfomaniakDI": .framework,
"InfomaniakLogin": .framework,
"InfomaniakCore": .framework,
"InfomaniakCoreCommonUI": .framework,
"InfomaniakCoreUIKit": .framework,
"Kingfisher": .framework,
"Lottie": .framework,
"RealmSwift": .framework,
"Realm": .framework
]
)

Expand Down
6 changes: 5 additions & 1 deletion Tuist/ProjectDescriptionHelpers/ExtensionTarget.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ public extension Target {
.external(name: "FloatingPanel"),
.external(name: "Lottie"),
.external(name: "DropDown"),
.external(name: "HorizonCalendar")
.external(name: "HorizonCalendar"),
.external(name: "Realm"),
.external(name: "RealmSwift"),
.external(name: "CocoaLumberjack"),
.external(name: "CocoaLumberjackSwift")
],
settings: settings)
}
Expand Down
15 changes: 0 additions & 15 deletions kDriveAPITests/kDriveCore/DriveApiTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -640,21 +640,6 @@ final class DriveApiTests: XCTestCase {

// MARK: Miscellaneous

func testSearchFiles() async throws {
let (testDirectory, file) = try await initOfficeFile(testName: "Search files")
let files = try await currentApiFetcher.searchFiles(
drive: proxyDrive,
query: "officeFile",
fileExtensions: [],
categories: [],
belongToAllCategories: true,
sortType: .newer
).validApiResponse.data
let fileFound = files.contains { $0.id == file.id }
XCTAssertTrue(fileFound, "File created should be in response")
tearDownTest(directory: testDirectory)
}

func testUndoAction() async throws {
let (testDirectory, file) = try await initOfficeFile(testName: "Undo action")
let directory = try await createTestDirectory(name: "test", parentDirectory: testDirectory)
Expand Down
1 change: 0 additions & 1 deletion kDriveCore/VideoPlayer/VideoPlayer.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import AVKit
import Combine
import FloatingPanel
import InfomaniakCore
import InfomaniakDI
import kDriveResources
Expand Down
0 kDriveAPITests/Env.sample.swift → kDriveTestShared/Env.sample.swift
View file
File renamed without changes.
40 changes: 0 additions & 40 deletions kDriveTests/Env.sample.swift
View file

This file was deleted.

2 changes: 1 addition & 1 deletion kDriveTests/StateRestoration/UTSceneRestorationMetadata.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ final class UTSceneRestorationMetadata: XCTestCase {
XCTAssertEqual(metadata["filesIds"] as? [Int], [1337])
XCTAssertEqual(metadata["currentIndex"] as? Int, Int(0))
XCTAssertEqual(metadata["normalFolderHierarchy"] as? Bool, true)
XCTAssertEqual(metadata["presentationOrigin"] as? PresentationOrigin, .activities)
XCTAssertEqual(metadata["presentationOrigin"] as? String, PresentationOrigin.activities.rawValue)
}

@MainActor func testFileDetailViewController() {
Expand Down
2 changes: 2 additions & 0 deletions kDriveTests/kDriveCore/Drive/ITDrive.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ final class ITDrive: XCTestCase {
}

let decoder = JSONDecoder()
decoder.keyDecodingStrategy = .convertFromSnakeCase

// WHEN
do {
Expand All @@ -62,6 +63,7 @@ final class ITDrive: XCTestCase {
}

let decoder = JSONDecoder()
decoder.keyDecodingStrategy = .convertFromSnakeCase

// WHEN
do {
Expand Down

0 comments on commit 3c4af77

Please sign in to comment.