-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added xcode 15 support #11
base: portrait-watchface
Are you sure you want to change the base?
Conversation
@c2p-cmd thank you for your update! It seems that the PR contains commits from ongoing PR #3 . You can choose any of these (A or B). A. change the base branch (target branch) to (If you wish, I can do |
Hey thanks for the response in this case A would be great since I would need support for Portraits Face. |
if config.base_configuration_reference && Integer(xcode_base_version) >= 15 | ||
xcconfig_path = config.base_configuration_reference.real_path | ||
xcconfig = File.read(xcconfig_path) | ||
xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this workaround should not be needed as CocoaPods 1.13.0 handles the change.
https://github.com/CocoaPods/CocoaPods/releases/tag/1.13.0
could you try with CocoaPods 1.13.0+ removing the workaround?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have tried on a higher version on a separate machine, but it is still needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've checked with cocoapods 1.13.0 and the result clears DT_TOOLCHAIN_DIR
. Thus we should use cocoapods 1.13.0. Podfile workaround appended in this PR no longer needed.
check the diff is like this:
-COCOAPODS: 1.12.1
+COCOAPODS: 1.13.0
also include these:
--- a/Pods/Target Support Files/Pods-WatchFaceDumper/Pods-WatchFaceDumper-frameworks.sh
+++ b/Pods/Target Support Files/Pods-WatchFaceDumper/Pods-WatchFaceDumper-frameworks.sh
@@ -18,7 +18,7 @@ echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
-SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
+SWIFT_STDLIB_PATH="${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✨ nice app icon! but I think it should be separated from Xcode 15 support PR. (or possibly does it be required for Xcode 15??)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To export a copy needed an app icon. Thus put this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks. I will include the icon in this PR.
@c2p-cmd thanks for your second try. Before I can merge the PR, two changes are needed.
|
Sure will do it 👍 |
Have updated the PodFile to make sure it builds in Xcode 15