Skip to content

Commit 960fe03

Browse files
Merge branch 'master' into bugfix/MBL-19695-NonUpdaing-Calendars-Filter-Screen
2 parents 56a72f0 + 5b644be commit 960fe03

361 files changed

Lines changed: 2420 additions & 1535 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bitrise/bitrise.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ workflows:
1919
# write your script here
2020
sudo systemsetup -settimezone America/Denver
2121
title: Set System Time to America
22-
- activate-ssh-key: {}
2322
- git::https://github.com/instructure/steps-verify-pr.git@master:
2423
title: Verify PR
2524
- git-clone:
@@ -36,7 +35,7 @@ workflows:
3635
echo "BITRISE_SCHEME set to: All"
3736
echo "BITRISE_CONFIGURATION set to: Adhoc"
3837
title: Set Scheme and Configuration for Secrets Setup
39-
- git::git@github.com:instructure/steps-canvas-ios-secrets.git@master:
38+
- git::https://github.com/instructure/steps-canvas-ios-secrets.git@master:
4039
title: Canvas iOS Secrets
4140
- script@1:
4241
title: XcodeGen

.bitrise/pr_adhoc/workflow_pr_adhoc_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ workflows:
102102
- comment-on-github-pull-request@0:
103103
inputs:
104104
- body: $PR_BUILDS_COMMENT
105-
- personal_access_token: $GITHUB_API_TOKEN
105+
- personal_access_token: $GIT_HTTP_PASSWORD
106106
- update_comment_tag: bitrise_adhoc_builds
107107
is_always_run: false
108108
triggers:

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# More details are here: https://help.github.com/articles/about-codeowners/
55

66
# These owners will be the default owners for everything in the repo.
7-
* @vargaat @rh12 @suhaibabsi-inst
7+
* @vargaat @rh12 @suhaibabsi-inst @petkybenedek
88

99
# Horizon
1010
/Horizon/ @szabinst @ktheory @JacksonHowe @Ahmed-Naguib93

.github/workflows/claude-code-review.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737

3838
- name: Run Claude Code Review
3939
id: claude-review
40+
continue-on-error: true
4041
uses: anthropics/claude-code-action@v1
4142
with:
4243
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}

CLAUDE-unit-tests.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ final class StudentAssignmentListItemTests: CoreTestCase {
232232
- **Set all properties to nil** in tearDown to prevent memory leaks and state leaks
233233
- **Reset global state** in tearDown if setUp modified it:
234234
- Clean up any global state that was set up
235+
- Example: use `Clock.mockNow(date)` in setUp and `Clock.reset()` in tearDown to pin the current date (`Core/Core/Common/CommonModels/AppEnvironment/Clock.swift`)
235236
- **Declaration**: Declare properties as implicitly unwrapped optionals (`!`) so they can be set in setUp
236237

237238
### Grouping with MARKs

CLAUDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ The workspace root contains the following key projects:
6464
- Ensure the code compiles and runs without errors
6565
- After creating new files or modifying project settings, run `make sync` to update Xcode projects via XcodeGen
6666
- When writing tests, make sure the tests pass
67-
- When you are asked to write tests, follow the conventions outlined in CLAUDE-unit-tests.md
67+
- When you are asked to write or modify tests, follow the conventions outlined in CLAUDE-unit-tests.md
6868

Canvas.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Canvas.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 21 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Core/Core/Common/CommonUI/Fonts/FontExtensions.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ public extension Font {
8181
return .custom(name, size: fontName.fontSize, relativeTo: fontName.style)
8282
}
8383
}
84+
85+
static func scaledNamedFont(_ name: UIFont.Name) -> Font {
86+
Font(UIFont.scaledNamedFont(name))
87+
}
8488
}
8589

8690
extension UIFont.Name {

Core/Core/Common/CommonUI/InstUI/Styles/Elevation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extension InstUI.Styles {
2727
case cardLarge
2828
case pill
2929

30-
var cornerRadius: CGFloat {
30+
public var cornerRadius: CGFloat {
3131
switch self {
3232
case .cardSmall: 6
3333
case .cardLarge: 24

0 commit comments

Comments
 (0)