Skip to content

Commit

Permalink
Merge pull request #26
Browse files Browse the repository at this point in the history
[OC-51502] Update Xcode: 15.2 → 15.4
  • Loading branch information
cyril-lepottier authored May 16, 2024
2 parents 8e926bc + 7556229 commit bb6fa7f
Show file tree
Hide file tree
Showing 10 changed files with 102 additions and 114 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
unit-test:
name: Check unit test
timeout-minutes: 30
runs-on: macos-13
runs-on: macos-14
steps:
- name: Set Xcode
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
run: sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer


- name: Checkout project
Expand Down
196 changes: 92 additions & 104 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tools/Test/run-unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ DERIVED_DATA_DIR="$PWD/XcodeDerivedData"
xcodebuild test \
-workspace material-carthage-ios.xcworkspace \
-scheme material-carthage-ios \
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' 2>&1 | xcbeautify && exit ${PIPESTATUS[0]}
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' 2>&1 | xcbeautify && exit ${PIPESTATUS[0]}
2 changes: 1 addition & 1 deletion material-carthage-ios.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1010;
LastUpgradeCheck = 1520;
LastUpgradeCheck = 1540;
ORGANIZATIONNAME = OpenClassrooms;
TargetAttributes = {
85C4FABE21DE1904003697D3 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

0 comments on commit bb6fa7f

Please sign in to comment.