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.

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

Huu #1456

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open

Huu #1456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
ae9b9e5
updates
akshay-yadav-apple Oct 24, 2019
0651bf0
Use wheel date picker style (#1447)
srinathtm-apple Feb 12, 2021
cb6cc97
Fix broken Apple Forums link
stevemoser Mar 1, 2021
19c6138
Permission Type Updates (#1454)
erik-apple Apr 17, 2021
e9d5de6
Clip step image (#1457)
gavirawson-apple May 20, 2021
3b75f62
Updates to the predefined range of motion task (#1459)
erik-apple May 26, 2021
1443e57
Replace deprecated method call
erik-apple Jun 21, 2021
85c1395
Merge pull request #1461 from erik-apple/update-deprecated-method-in-…
erik-apple Jun 21, 2021
d4ff76f
Silence warning about nullable return types
erik-apple Jun 21, 2021
0ad96d5
Merge pull request #1462 from erik-apple/nullable-return-type
erik-apple Jun 21, 2021
fde1e7e
Use implied answer format for cells
Hengyu Oct 30, 2020
7f119a8
Merge pull request #1338 from Hengyu/hengyu
Pariecemckinney-apple Jun 28, 2021
0e68cdf
Merge pull request #1448 from stevemoser/patch-6
Pariecemckinney-apple Jun 28, 2021
e18a633
Set ORKTaskViewController nav background color (#1469)
cbaker6 Oct 4, 2021
05755a3
initial commit
Pariecemckinney-apple Oct 25, 2021
d10a427
Merge pull request #1471 from Pariecemckinney-apple/pmckinney/taskVCD…
Pariecemckinney-apple Oct 25, 2021
90c68d0
Update project library search paths to compile on apple silicon (#1479)
aplummer-apple Nov 29, 2021
249eee5
IOS15 Fixes (#1487)
Pariecemckinney-apple Feb 17, 2022
743b773
Point RK to IOS 13 (#1499)
Pariecemckinney-apple Apr 25, 2022
13eabb7
merging stable back to main
akshay-yadav-apple Jun 15, 2022
c9880b0
merge stable into main
akshay-yadav-apple Jun 15, 2022
63fcf49
Merge branch 'stable' into 'main' for housekeeping
akshay-yadav-apple Jun 15, 2022
65de4b3
README update
akshay-yadav-apple Jun 15, 2022
29950b6
marker
akshay-yadav-apple Jun 15, 2022
2cc8f9e
Prevent isPasscodeStoredInKeychain crash, correct warnings (#1505)
SwiftArtery Jun 16, 2022
a89059f
2.1.1 Release
Pariecemckinney-apple Oct 26, 2022
b1cc631
propagate tintColor if window not available
cbaker6 Nov 14, 2022
c0f309e
only check for tintColor once in viewControllerForStep
cbaker6 Nov 15, 2022
c106939
Fix tintColor for ORKWebViewStepViewController buttons
cbaker6 Nov 16, 2022
64a0685
make suggested changes
cbaker6 Nov 28, 2022
e71d71c
Point ResearchKit.podspec to 2.1.0
louie-apple Nov 29, 2022
2bc0033
remove deprecated ORKConsent files
louie-apple Nov 29, 2022
1b9daf6
Merge pull request #1530 from ResearchKit/cocoapod_version_bump
louie-apple Nov 29, 2022
c847301
Merge pull request #1531 from ResearchKit/cocoapod_fix
louie-apple Nov 29, 2022
fc67cc9
Merge pull request #1519 from cbaker6/fixTintColor
louie-apple Nov 30, 2022
8f58410
Release 2.2.8
Pariecemckinney-apple Dec 20, 2022
bd60d94
Public release/2.2.9 (#1541)
ronzilla-apple Feb 13, 2023
2fb22a6
Public release/2.2.10 (#1548)
Pariecemckinney-apple May 10, 2023
b8f1559
Public release/2.2.12 (#1555)
Pariecemckinney-apple Nov 1, 2023
c370011
Public Release 2.2.15
louie-apple Dec 5, 2023
a070419
Public Release 2.2.15
louie-apple Dec 5, 2023
fee76c2
Merge branch 'stable' into main
louie-apple Dec 5, 2023
b14e5cf
Public Release 3.0
Pariecemckinney-apple Mar 28, 2024
6c24a7e
ci: Add code integration testing to repo (#1569)
cbaker6 Apr 10, 2024
c71d1a5
Public release 3.0.1
Pariecemckinney-apple May 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 26 additions & 0 deletions .github/workflows/build.yml
@@ -0,0 +1,26 @@
name: Build

on:
push:
branches: [ 'main', 'stable' ]
pull_request:
branches: [ 'main', 'stable' ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
runs-on: macos-14
strategy:
matrix:
destination: ['platform=iOS\ Simulator,OS=17.4,name=iPhone\ 15\ Pro']
scheme: ['ResearchKit']
name: ${{ matrix.scheme }} Unit Tests
steps:
- uses: actions/checkout@v4
- name: Set Xcode Version
run: sudo xcode-select -s /Applications/Xcode_15.3.app
- name: Test
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -verbose -workspace RKWorkspace.xcworkspace -scheme ${{ matrix.scheme }} -destination ${{ matrix.destination }} build test | xcpretty
5 changes: 0 additions & 5 deletions .travis.yml

This file was deleted.

35 changes: 16 additions & 19 deletions CONTRIBUTING.md
Expand Up @@ -6,7 +6,7 @@ codebase. However, other types of contributions are welcome too, in
keeping with the ResearchKit™ framework [best practices](../../wiki/best-practices). For example,
contributions of original free-to-use survey content, back-end integrations,
validation data, and analysis or processing tools are all welcome. Ask
on the [*ResearchKit* Forum](https://forums.developer.apple.com/community/researchkit) or [contact us](https://developer.apple.com/contact/researchkit/) for guidance.
on the [*ResearchKit* Forum](https://developer.apple.com/forums/tags/researchkit) or [contact us](mailto:researchkit@apple.com) for guidance.


Contributing software
Expand All @@ -16,8 +16,7 @@ This page assumes you already know how to check out and build the
code. Contributions to the ResearchKit framework are expected to comply with the
[ResearchKit Contribution Terms and License Policy](#contribution); please familiarize yourself
with this policy prior to submitting a pull request. For any contribution, ensure that you own
the rights or have permission from the copyright holder. (e.g. code, images, surveys, videos
and other content you may include)
the rights or have permission from the copyright holder (e.g. code, images, surveys, videos and other content you may include).

To contribute to ResearchKit:

Expand All @@ -27,7 +26,7 @@ To contribute to ResearchKit:
4. [Run the tests.](#test)
5. [Submit a pull request.](#request)
6. Make any changes requested by the reviewer, and update your pull request as needed.
7. Once accepted, your pull request will be merged into master.
7. Once accepted, your pull request will be merged into main.

Choosing an issue to work on<a name="create"></a>
----------------------------
Expand All @@ -36,13 +35,12 @@ To find an issue to work on, either pick something that you need for
your app, or select one of the issues from our [issue list](../../issues). Or,
consider one of the areas where we'd like to extend ResearchKit:

* Faster 'get started' to a useful app
* More active tasks
* Data analysis for active tasks
* More consent sections
* Back end integrations
* Improving the APIs needed to get started with a ResearchKit project
* New Active Tasks
* Data analysis for Active Tasks
* Backend integrations

If in doubt, bring your idea up on the [*ResearchKit* Forum](https://forums.developer.apple.com/community/researchkit).
If in doubt, bring your idea up on the [ResearchKit Forum](https://developer.apple.com/forums/tags/researchkit).


Creating a personal fork<a name="fork"></a>
Expand All @@ -56,8 +54,7 @@ Develop your changes in your fork<a name="develop"></a>
---------------------------------

Develop your changes using your normal development process. If you
already have code from an existing project, you may need to adjust its
style to more closely match the [ResearchKit framework coding style](./docs-standalone/coding-style-guide.md).
already have code from an existing project, you may need to adjust its style to more closely match the [ResearchKit framework coding style](./docs-standalone/coding-style-guide.md).

New components may need to expose new Public or Private
headers. Public headers are for APIs that are likely to be a stable
Expand All @@ -78,7 +75,7 @@ code to other existing demo apps to exercise your feature.
When adding UI driven components, make sure that they are accessible.
Follow the steps outlined in the [Best Practices](../../wiki/best-practices)
section under Accessibility. Before submitting the pull request, you should
audit your components with Voice Over (or other relevant assistive technologies)
audit your components with VoiceOver (or other relevant assistive technologies)
enabled.

Keep changes that fix different issues separate. For bug fixes,
Expand All @@ -99,11 +96,11 @@ verify that test apps run on both device and simulator.

Where your code affects UI presentation, also test:

* Multiple device form factors (for instance, iPhone 4S, iPhone 5, iPhone 6, iPhone 6 Plus).
* Multiple device form factors (for instance, iPhone SE, iPhone 14, iPhone 15 Pro, iPhone 15 Pro Max).
* Dynamic text, especially at the "Large" setting.
* Rotation between portrait and landscape, where appropriate.

You can use the apps in the `Testing` and `samples` directories to
You can use the `ORKCatalog` app in the `samples` directory to
test your changes.

Submit a pull request<a name="request"></a>
Expand All @@ -120,7 +117,7 @@ After acceptance<a name="after"></a>
----------------

Once your pull request has been accepted, your changes will be merged
to master. You are still responsible for your change after it is
to main. You are still responsible for your change after it is
accepted. Stay in contact, in case bugs are detected that may require
your attention.

Expand All @@ -134,17 +131,17 @@ documentation, or other issues during this process.
Release process
-----------------

The `master` branch is used for work in progress. On `master`:
The `main` branch is used for work in progress. On `main`:

* All test apps should build and run error free.
* Unit tests should all pass.
* Everything should be continuously in working order in English (the
base language).

The project will make periodic releases. When preparing a stable release, we
will branch from `master` to a convergence branch. During this process,
will branch from `main` to a convergence branch. During this process,
changes will be made first to the convergence branch, and then merged into
`master`. On the convergence branch, changes will be made only to:
`main`. On the convergence branch, changes will be made only to:

* Fix high priority issues.
* Update documentation.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
Copyright (c) 2015, Apple Inc. All rights reserved.
Copyright (c) 2015-2024, Apple Inc. All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Expand Down