Skip to content

Commit

Permalink
Merge pull request #25
Browse files Browse the repository at this point in the history
[OC-49321] Update Xcode: 13.4.1 → 15.2
  • Loading branch information
cyril-lepottier authored Jan 15, 2024
2 parents 51e0cac + 969c0db commit 953c7f4
Show file tree
Hide file tree
Showing 12 changed files with 126 additions and 119 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-12
runs-on: macos-13
steps:
- name: Set Xcode
run: sudo xcode-select -s /Applications/Xcode_13.4.1.app/Contents/Developer
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer


- name: Checkout project
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,6 @@ SPEC CHECKSUMS:
MotionAnimator: 5f99d7c9592928c0f28a66283eda9c3b657dc480
MotionInterchange: 13adae439b377e31d1674cc165539d50e1d1566a

PODFILE CHECKSUM: 0141ba5770fc775392586d1fa3a0ed861e93f036
PODFILE CHECKSUM: 84f05debd72d8f4d455930d927253fcc3b1490d6

COCOAPODS: 1.11.3
2 changes: 1 addition & 1 deletion Pods/Manifest.lock

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

210 changes: 104 additions & 106 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 13,OS=15.5' 2>&1 | xcbeautify && exit ${PIPESTATUS[0]}
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' 2>&1 | xcbeautify && exit ${PIPESTATUS[0]}
13 changes: 11 additions & 2 deletions material-carthage-ios.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -177,8 +177,9 @@
85C4FAB621DE1904003697D3 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1010;
LastUpgradeCheck = 1240;
LastUpgradeCheck = 1520;
ORGANIZATIONNAME = OpenClassrooms;
TargetAttributes = {
85C4FABE21DE1904003697D3 = {
Expand Down Expand Up @@ -358,6 +359,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -423,6 +425,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand Down Expand Up @@ -454,13 +457,16 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
INFOPLIST_FILE = "material-carthage-ios/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
PRODUCT_BUNDLE_IDENTIFIER = "com.openclassrooms.material-carthage-ios";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand All @@ -480,13 +486,16 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
INFOPLIST_FILE = "material-carthage-ios/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
PRODUCT_BUNDLE_IDENTIFIER = "com.openclassrooms.material-carthage-ios";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
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 = "1340"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

0 comments on commit 953c7f4

Please sign in to comment.