Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Lift to upstream ResearchKit 2.2.15 #14

Merged
merged 11 commits into from
Jan 26, 2024
Merged

Lift to upstream ResearchKit 2.2.15 #14

merged 11 commits into from
Jan 26, 2024

Conversation

philippzagar
Copy link

@philippzagar philippzagar commented Jan 26, 2024 •
edited

Lift to upstream ResearchKit 2.2.15

♻️ Current situation & Problem

The current used ResearchKit version of our fork is 2.2.12, which is not up to date with the published ResearchKit in 2.2.15.
Furthermore, as described in #13, we currently don't validate within the CI if ResearchKit compiles with active Swift / C++ interop.

⚙️ Release Notes

  • Lift to ResearchKit 2.2.15
  • Test within CI if ResearchKit compiles with active Swift / C++ interop

📚 Documentation

Documented CI approach

✅ Testing

Built code (in C++ interop mode) via CI pipeline

Code of Conduct & Contributing Guidelines

By submitting creating this pull request, you agree to follow our Code of Conduct and Contributing Guidelines:

louie-apple and others added 7 commits November 29, 2022 11:48
@louie-apple
Point ResearchKit.podspec to 2.1.0
e71d71c
@louie-apple
Merge pull request ResearchKit#1530 from ResearchKit/cocoapod_version…
1b9daf6 
…_bump

Point ResearchKit.podspec to 2.1.0
@Pariecemckinney-apple
Public release/2.2.12 (ResearchKit#1555)
b8f1559 
- Fixed `ORKHealthKitQuantityTypeAnswerFormat`issues
- Improved `ORKReviewStep` initialization
- Introduced a new property called `shouldAutomaticallyAdjustImageTintColor` on `ORKStep` to automatically adopt dark mode version of an image
- Added `ORKSESQuestionResult` to Table View Providers
- ORKCatalog Improvements
- ORKImageSelectionView improvements
- Bumped version to 2.2.12
@louie-apple
Public Release 2.2.15
c370011 
- Various ORKTextChoiceOther and ORKChoiceOtherViewCell improvements 
- Bumped version to 2.2.15
- Bumped Cocoapod version to 2.2.15
@louie-apple
Public Release 2.2.15
a070419 
Various ORKTextChoiceOther and ORKChoiceOtherViewCell improvements
Bumped version to 2.2.15
Bumped Cocoapod version to 2.2.15
@louie-apple
Merge branch 'stable' into main
fee76c2
@philippzagar
Merge remote-tracking branch 'ResearchKit/main' into feat/lift-to-rk-…
04b420a 
…2.2.15
@philippzagar philippzagar added the enhancement New feature or request label Jan 26, 2024
@philippzagar philippzagar self-assigned this Jan 26, 2024
@philippzagar philippzagar mentioned this pull request Jan 26, 2024
Merged
1 task
@philippzagar philippzagar marked this pull request as ready for review January 26, 2024 07:55
@philippzagar
Copy link
Author

@PSchmiedmayer Please also adjust the merge checks of the repo

PSchmiedmayer
PSchmiedmayer approved these changes Jan 26, 2024
View reviewed changes
Copy link
Member

@PSchmiedmayer PSchmiedmayer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for updating this to the latest version of the upstream ResearchKit repo! 👍

@PSchmiedmayer
Copy link
Member

@philippzagar I adjusted the merge checks.

One thing that I was thinking was maybe adding a GitHub Note (in the formatting we have in some READMEs of our other repos) that notes how this repo is different from the main RK repo? I could see this right before the badges.

Maybe something like:

NOTE:
This repository is a fork of the ResearchKit project by Apple, adding support for:

  • The Swift Package Manager & the usage as a binary dependency speeding up build times ...
  • Successful building using Swift's C++ Interoperability ...

Feel free to add and adapt this as you want to; serves more as a placeholder and idea.

philippzagar added a commit to StanfordBDHG/.github that referenced this pull request Jan 26, 2024
@philippzagar
Enable C++ interop archiving (#49)
a684ff9 
# Enable C++ interop archiving

## ♻️ Current situation & Problem
Currently, the reusable workflow doesn't enable compilation with active
Swift / C++ interop mode.


## ⚙️ Release Notes 
- Enable the creation of XCArchives with active Swift / C++ interop mode
via workflow parameter.


## 📚 Documentation
--


## ✅ Testing
Tested with the ResearchKit repo in
StanfordBDHG/ResearchKit#14


### Code of Conduct & Contributing Guidelines 

By submitting creating this pull request, you agree to follow our [Code
of
Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md):
- [x] I agree to follow the [Code of
Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md).
@philippzagar
Copy link
Author

philippzagar commented Jan 26, 2024 •
edited

@philippzagar I adjusted the merge checks.

One thing that I was thinking was maybe adding a GitHub Note (in the formatting we have in some READMEs of our other repos) that notes how this repo is different from the main RK repo? I could see this right before the badges.

Maybe something like:

NOTE:
This repository is a fork of the ResearchKit project by Apple, adding support for:

  • The Swift Package Manager & the usage as a binary dependency speeding up build times ...
  • Successful building using Swift's C++ Interoperability ...

Feel free to add and adapt this as you want to; serves more as a placeholder and idea.

Great idea @PSchmiedmayer, I think we have enough diff to upstream that this definitely makes sense!
I looked through the diff we currently have to upstream ResearchKit and the main two points (SPM support via binary target as well as C++ interop) were already stated by you. All the rest is not really noteworthy. Feel free to check out the README!

@philippzagar
Copy link
Author

@PSchmiedmayer You also need to merge the PR as not all commits from upstream were signed.

@PSchmiedmayer
Copy link
Member

Thank you @philippzagar; I will merge the PR 👍

@PSchmiedmayer PSchmiedmayer merged commit 5491342 into main Jan 26, 2024
4 checks passed
@PSchmiedmayer PSchmiedmayer deleted the feat/lift-to-rk-2.2.15 branch January 26, 2024 20:15
@philippzagar philippzagar mentioned this pull request Jan 26, 2024
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PSchmiedmayer PSchmiedmayer PSchmiedmayer approved these changes

Assignees

@philippzagar philippzagar

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@philippzagar @PSchmiedmayer @louie-apple @Pariecemckinney-apple