Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b73c0c3
fix: resolve issue 581
Demian-Yushyn Jul 30, 2025
cc0e655
fix: update adjustments
Demian-Yushyn Jul 30, 2025
84a2156
fix: add timeout constant
Demian-Yushyn Jul 30, 2025
cd349b3
fix: adjust naming
Demian-Yushyn Jul 30, 2025
5aa8e55
fix: update connectivity
Demian-Yushyn Jul 30, 2025
64c59a1
fix: remove unused functions and hardcoded variables
Demian-Yushyn Jul 31, 2025
b4fcf31
fix: Removed unused functions and hardcoded variables
Demian-Yushyn Jul 31, 2025
253341d
Merge remote-tracking branch 'origin/fix/issue-581' into fix/issue-581
Demian-Yushyn Jul 31, 2025
6121c2a
fix: issue 581
Demian-Yushyn Jul 31, 2025
b26c3d7
fix: progress on issue 581
Demian-Yushyn Jul 31, 2025
f21a460
fix: apply updates
Demian-Yushyn Jul 31, 2025
14441a6
fix: update wi DI Config, thread fixes
Demian-Yushyn Jul 31, 2025
327bb30
fix: connectivity logic update
Demian-Yushyn Jul 31, 2025
a9074d0
fix: cacheValidity change
Demian-Yushyn Jul 31, 2025
dabc744
fix: unit tests update
Demian-Yushyn Aug 6, 2025
48d55bc
fix: removed team and coma
Demian-Yushyn Aug 6, 2025
786fa30
fix: removed extra comas
Demian-Yushyn Aug 6, 2025
a7475cd
Merge branch 'develop' into fix/issue-581
IvanStepanok Sep 16, 2025
0fce30b
fix: unit tests
Demian-Yushyn Sep 16, 2025
635c716
Merge branch 'develop' into fix/issue-581
Demian-Yushyn Oct 29, 2025
ad3f260
fix: removed state object warning
Demian-Yushyn Oct 29, 2025
39ace76
fix: update config
Demian-Yushyn Oct 29, 2025
8465734
Merge pull request #2 from raccoongang/fix/issue-581
IvanStepanok Nov 10, 2025
7196747
Merge branch 'openedx:develop' into develop
Demian-Yushyn Jan 28, 2026
b852394
Merge branch 'openedx:develop' into develop
Demian-Yushyn Feb 4, 2026
d702e00
Merge branch 'openedx:develop' into develop
Demian-Yushyn Mar 19, 2026
0e0a008
feat: update swiftlint config
IvanStepanok Apr 27, 2026
071b981
Merge branch 'openedx:develop' into develop
IvanStepanok Jul 8, 2026
d14e1a6
Merge branch 'openedx:develop' into develop
Demian-Yushyn Oct 5, 2026
b476f6a
chore: migrate from CocoaPods to Swift Package Manager
Demian-Yushyn Oct 6, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ jobs:

- name: SwiftLint
run: |
export PODS_ROOT=$(pwd)/Pods
"${PODS_ROOT}/SwiftLint/swiftlint" --reporter sarif > swiftlint.report.sarif
BuildTools/bin/swiftlint --reporter sarif > swiftlint.report.sarif

- name: Prepare swiftlint.report.sarif
if: success() || failure()
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ xcuserdata/
*.xcuserdata/*
/OpenEdX.xcodeproj/xcuserdata/
/OpenEdX.xcworkspace/xcuserdata/
/OpenEdX.xcworkspace/xcshareddata/swiftpm/Package.resolved

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
Expand Down
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ opt_in_rules: # some rules are only opt-in
excluded: # paths to ignore during linting. Takes precedence over `included`.
- Carthage
- DerivedData
- build
- Pods
- DerivedData
- Core/CoreTests
Expand Down
177 changes: 65 additions & 112 deletions AppDates/AppDates.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

This file was deleted.

201 changes: 77 additions & 124 deletions Authorization/Authorization.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions BuildTools/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/bin/
/.swiftpm/
28 changes: 28 additions & 0 deletions BuildTools/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// swift-tools-version:5.9

// Command-line tools used by the Xcode build phases, fastlane and CI.
// Each one is the prebuilt release binary of an exact version, verified by its checksum.
// After changing a version here, run `make bootstrap` to fetch it.

import PackageDescription

let package = Package(
name: "BuildTools",
targets: [
.binaryTarget(
name: "swiftlint",
url: "https://github.com/realm/SwiftLint/releases/download/0.57.0/SwiftLintBinary-macos.artifactbundle.zip",
checksum: "a1bbafe57538077f3abe4cfb004b0464dcd87e8c23611a2153c675574b858b3a"
),
.binaryTarget(
name: "swiftgen",
url: "https://github.com/SwiftGen/SwiftGen/releases/download/6.6.3/swiftgen-6.6.3.artifactbundle.zip",
checksum: "caf1feaf93dd32bc5037f0b6ded8d0f4fe28ab5d2f6e5c3edf2572006ba0b7eb"
),
.binaryTarget(
name: "mockolo",
url: "https://github.com/uber/mockolo/releases/download/2.5.0/mockolo.artifactbundle.zip",
checksum: "107825279e5c7c2f8ef021320d8054e0b36fcb9e634d02d2ff1bde6d8b460722"
)
]
)
41 changes: 41 additions & 0 deletions BuildTools/bootstrap.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/bin/bash

# Fetches the tools pinned in BuildTools/Package.swift and links them into BuildTools/bin,
# where the Xcode build phases, fastlane and CI run them from.
# Usage: make bootstrap

set -euo pipefail

cd "$(dirname "${BASH_SOURCE[0]}")"

TOOLS=(swiftlint swiftgen mockolo)

# Prints the executable of the given tool for this Mac, read from the info.json of its artifact bundle.
executable_path() {
local tool="$1" triple info index path triples
triple="$(uname -m)-apple-macosx"
while IFS= read -r info; do
index=0
while path=$(plutil -extract "artifacts.${tool}.variants.${index}.path" raw -o - "${info}" 2>/dev/null); do
triples=$(plutil -extract "artifacts.${tool}.variants.${index}.supportedTriples" json -o - "${info}")
if [[ "${triples}" == *"\"${triple}\""* ]]; then
echo "$(dirname "${info}")/${path}"
return 0
fi
index=$((index + 1))
done
done < <(find .build/artifacts -path '*.artifactbundle/info.json' -not -path '*/extract/*')
return 1
}

swift package resolve

mkdir -p bin
for tool in "${TOOLS[@]}"; do
if ! executable=$(executable_path "${tool}") || [[ ! -x "${executable}" ]]; then
echo "error: ${tool} was not found in the resolved artifacts of BuildTools/Package.swift" >&2
exit 1
fi
ln -sfn "../${executable}" "bin/${tool}"
echo "BuildTools/bin/${tool} -> ${executable}"
done
13 changes: 0 additions & 13 deletions Core/Core.xcodeproj.xcworkspace/contents.xcworkspacedata

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading