Skip to content

Commit

Permalink
Update to ResearchKit v1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
p2 committed Oct 13, 2016
1 parent b895f29 commit c84e82c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions C3PRO.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -808,7 +808,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Changelog
## 1.8 (_not yet released_)

- Full conversion to Swift 3.0, still on FHIR v1.0.2 (DSTU-2)
- Update to ResearchKit v1.4
- Now requires iOS 9 or newer


## 1.2 (2016-08-10) _not supported_
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import C3PRO

#### Versions

The `master` branch requires Xcode 8 and _should_ always be compatible with the latest version released, it's on `Swift 3.0` and `FHIR DSTU-2`.
The `master` branch requires Xcode 8 and _should_ always be compatible with the latest released version.
It's on `Swift 3.0` and `FHIR DSTU-2`.

The `develop` branch may contain new developments and have different requirements, it's currently on `Swift 3` and `FHIR 1.6.0 (STU-3)`.
**It is highly suggested that you use the `develop` branch with the FHIR STU-3 ballot version at this time!**
Expand All @@ -41,7 +42,7 @@ This framework combines several versioned technologies, here's an overview over
-----------|---------|-------------|-------|----------------
**2.0** | 3.0 | 1.x | 1.7.0 | STU-3
**1.9** | 3.0 | 1.3.1 | 1.6.0 | STU-3 Ballot
**1.8** | 3.0 | 1.3.1 | 1.0.2 | DSTU-2
**1.8** | 3.0 | 1.4 | 1.0.2 | DSTU-2
**1.2** | 2.2 | 1.3 | 1.4.0 | _not supported_
**1.1** | 2.2 | 1.3 | 1.0.2 |
**1.0.1** | 2.2 | 1.3 | 1.0.2 |
Expand Down
2 changes: 1 addition & 1 deletion ResearchKit
Submodule ResearchKit updated 296 files

0 comments on commit c84e82c

Please sign in to comment.