Commit 77090ca7 authored by Lauri Eskor's avatar Lauri Eskor

Merge branch 'feature/COVAPP-177-update-sdk-version' into 'icefire-dev'

COVAPP-177

See merge request contact-tracing/dp3t-sdk-ios!4
parents 894cd755 8121859e
name: deploy_to_cocoapods
on:
push:
tags:
- '*'
jobs:
build:
runs-on: macOS-latest
steps:
- uses: actions/checkout@v1
- name: Switch to Xcode 11.5
run: sudo xcode-select --switch /Applications/Xcode_11.5.app
- name: Install Cocoapods
run: gem install cocoapods
- name: Deploy to Cocoapods
run: |
set -eo pipefail
export LIB_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
pod lib lint --allow-warnings
pod trunk push DP3TSDK.podspec --allow-warnings
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
\ No newline at end of file
# Changelog for DP3T-SDK iOS
## Version 1.1.1 (13.08.2020)
- DP3TNetworkingError.HTTPFailureResponse includes raw data
## Version 1.1.0 (17.07.2020)
- adds background refresh task to improve background time
- retrieves keys in background on iOS > 13.6
- expose data if HTTP Code is not expected
- handle case if EN Framework is not available (iOS 14 beta)
- defer schedule background task until EN is authorized
- retrys activation and enabling of ENManager if failed on willEnterForeground
## Version 1.0.2 (03.07.2020)
- defers sync until ENManager is fully initialized
- fixes in background task handling
......
......@@ -2,7 +2,7 @@
Pod::Spec.new do |spec|
spec.name = "DP3TSDK"
spec.version = "1.0.2"
spec.version = ENV['LIB_VERSION'] || '1.1.1'
spec.summary = "Open protocol for COVID-19 proximity tracing using Bluetooth Low Energy on mobile devices"
spec.description = <<-DESC
......
......@@ -74,7 +74,7 @@ DP3T-SDK is available through [Cocoapods](https://cocoapods.org/)
```ruby
pod 'DP3TSDK', => '1.0.2'
pod 'DP3TSDK', => '1.1.1'
```
......
......@@ -56,10 +56,15 @@ class OutstandingPublishOperation: Operation {
continue
}
if runningInBackground {
// skip publish if we are not in foreground since apple does not allow calles to EN.getDiagnosisKeys in background
logger.log("skipping outstanding key %{public}@ because we are not in foreground", op.debugDescription)
continue
if #available(iOS 13.6, *) {
// this was fixed by apple with iOS 13.6 beta 4
// (there is unfortunally no way to negate #available checks)
} else {
if runningInBackground {
// skip publish if we are not in foreground since apple does not allow calles to EN.getDiagnosisKeys in background
logger.log("skipping outstanding key %{public}@ because we are not in foreground", op.debugDescription)
continue
}
}
logger.log("handling outstanding Publish %@", op.debugDescription)
......
......@@ -28,7 +28,7 @@ private var instance: DP3TSDK!
/// DP3TTracing
public enum DP3TTracing {
/// The current version of the SDK
public static let frameworkVersion: String = "1.0.2"
public static let frameworkVersion: String = "1.1.1"
/// sets global parameter values which are used throughout the sdk
public static var parameters: DP3TParameters {
......
......@@ -5,6 +5,7 @@
| Date | Author | Description |
| :--------- | :-------- | :-------------------------------------------- |
| 03.06.2020 | Olev Abel | Initial draft modified from Android document. |
| 12.08.2020 | Lauri Eskor | Use 'master' branch from DP-3T library repo. |
## Goal
......@@ -32,7 +33,7 @@ For the first draft we will use the Icefire development environment and the `ice
git pull
```
3. Create a work branch based on the `icefire-dev` for pulling in upstream changes
......@@ -41,7 +42,7 @@ For the first draft we will use the Icefire development environment and the `ice
git checkout -b feature/JIRA-TASK-NR-sync
```
4. Make sure the `develop` branch is connected to the develop branch at the DP-3T official repository. Look at the `.git/config` file and see if the remote is defined and is develop using that remote:
4. Make sure the `develop` branch is connected to the master branch at the DP-3T official repository. Look at the `.git/config` file and see if the remote is defined and is develop using that remote:
```
[remote "dpt3"]
......@@ -52,21 +53,21 @@ For the first draft we will use the Icefire development environment and the `ice
merge = refs/heads/develop
```
5. OPTIONAL: If the remote for `develop` branch is not correct you can change it
```bash
git checkout develop
# Define a new remote called dpt3
git remote add dpt3 git@github.com:DP-3T/dp3t-sdk-ios.git
# Fetch the develop branch from the new remote
git fetch dpt3 develop
# Define a new remote called dp3t
git remote add dp3t git@github.com:DP-3T/dp3t-sdk-ios.git
# Fetch the master branch from the new remote
git fetch dp3t master
# Set the new remote to be used by develop branch
git branch develop --set-upstream-to dpt3/develop
git branch develop --set-upstream-to dpt3/master
```
6. Pull all changes to the `develop` branch
......@@ -77,7 +78,7 @@ For the first draft we will use the Icefire development environment and the `ice
git pull
```
7. Merge changes from `develop` to `feature/JIRA-TASK-NR-sync` branch
......@@ -88,7 +89,7 @@ For the first draft we will use the Icefire development environment and the `ice
git merge develop
```
8. Make sure the updates made last time are in place and correct. See "Updates" above.
......@@ -102,4 +103,4 @@ For the first draft we will use the Icefire development environment and the `ice
13. Create a merge request to merge the `feature/JIRA-TASK-NR-sync` branch to `icefire-dev`
14. Merge after it has been reviewed.
\ No newline at end of file
14. Merge after it has been reviewed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment