Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
timbms committed Oct 4, 2020
2 parents 208776a + 25e72e9 commit 087dd1a
Show file tree
Hide file tree
Showing 139 changed files with 3,630 additions and 1,011 deletions.
18 changes: 13 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
---
name: Bug report
about: Create a report to help us improve
name: 🐛 Bug Report
about: If something isn't working as expected
title: ''
labels: ''
assignees: ''

---

**New bug checklist**

- [ ] I updated the iOS openHAB app to the latest [TestFlight](https://testflight.apple.com/join/563WBakc) version.
- [ ] I read the [Contribution Guidelines](https://github.com/openhab/openhab-ios/blob/develop/CONTRIBUTING.md)
- [ ] I searched for [existing GitHub issues](https://github.com/openhab/openhab-ios/issues)

**Describe the bug**
A clear and concise description of what the bug is.

Expand All @@ -24,10 +29,13 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**App (please complete the following information):**
- Version [e.g. 2.1.0(12)]
- Version [e.g. `2.1.0 (12)`]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhoneXR]
- Device: [e.g. `iPhoneXR`]

**openHAB (please complete the following information):**
- Version [e.g. `2.5.8`]

**Additional context**
Add any other context about the problem here.
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: 🚀 Feature Request
url: https://github.com/openhab/openhab-ios/discussions/new?category_id=27710982
about: Share ideas for new features
- name: ❓ Ask a Question
url: https://github.com/openhab/openhab-ios/discussions/new?category_id=27710981
about: Ask the community for help
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/regression.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
name: 😱 Regression
about: If a recent release broke a feature
title: ''
labels: ''
assignees: ''
---

**New regression checklist**

- [ ] I updated the iOS openHAB app to the latest [TestFlight](https://testflight.apple.com/join/563WBakc) version.
- [ ] I read the [Contribution Guidelines](https://github.com/openhab/openhab-ios/blob/develop/CONTRIBUTING.md)
- [ ] I searched for [existing GitHub issues](https://github.com/openhab/openhab-ios/issues)

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**App (please complete the following information):**
- Breaking version: [e.g. `2.1.0 (12)`]
- Last working version: [e.g. `2.2.0 (13)`]

**Smartphone (please complete the following information):**
- Device: [e.g. `iPhoneXR`]

**openHAB (please complete the following information):**
- Version [e.g. `2.5.8`]

**Additional context**
Add any other context about the problem here.
65 changes: 65 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: Publish on TestFlight

on:
push:
branches: [develop]

jobs:
publish_app:
runs-on: macos-latest

steps:
- uses: actions/checkout@v2

- name: Cache cocoapods dependencies
uses: actions/cache@v2
env:
cache-name: cache-cocoapods-dependencies
with:
path: Pods
key: ${{ runner.os }}-pods-${{ env.cache-name }}-${{ hashFiles('**/Podfile.lock') }}
restore-keys: |
${{ runner.os }}-pods-${{ env.cache-name }}-
- name: Setup Cocoapods
uses: maxim-lobanov/[email protected]
with:
podfile-path: Podfile.lock

- name: Check Pods existence
id: check_files
uses: andstor/file-existence-action@v1
with:
files: "Pods"

- name: Install Dependencies
if: steps.check_files.outputs.files_exists == 'false'
run: |
pod install --repo-update
shell: bash

- name: SSH Config
run: echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config

- name: SSH Keys
uses: webfactory/[email protected]
with:
ssh-private-key: |
${{ secrets.MATCH_GIT_PRIVATE_KEY }}
- name: fastlane iOS beta
env:
FASTLANE_USER: ${{ secrets.FASTLANE_USER }}
FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }}
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
SIGNING_IDENTITY: ${{ secrets.SIGNING_IDENTITY }}
OH_CROWDIN_PROJECT_ID: ${{ secrets.OH_CROWDIN_PROJECT_ID }}
OH_CROWDIN_USERNAME: ${{ secrets.OH_CROWDIN_USERNAME }}
OH_CROWDIN_ACCOUNT_KEY: ${{ secrets.OH_CROWDIN_ACCOUNT_KEY }}
LANG: en_US.UTF-8
LC_ALL: en_US.UTF-8
uses: maierj/[email protected]
with:
lane: beta
skip-tracking: true
4 changes: 3 additions & 1 deletion .swiftformat
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# file options
--swiftversion 5.1
--swiftversion 5.3
--exclude Pods
--symlinks ignore

# disabled rules
--disable specifiers # see https://github.com/nicklockwood/SwiftFormat/issues/364
--disable redundantParens
--disable wrapMultilineStatementBraces

# opt-in rules
--enable isEmpty
--enable typeSugar

# format options
--allman false
Expand Down
7 changes: 7 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ opt_in_rules:
- private_action
- prefer_self_type_over_type_of_self
- file_name
- computed_accessors_order
- empty_enum_arguments
- prefer_zero_over_explicit_init
- tuple_pattern
- return_value_from_void_function
- void_function_in_ternary
- only_after_dot

disabled_rules: # rule identifiers to exclude from running
- force_cast
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [Version 2.4.5, Build 1580410454] - 2020-10-04

### Fixed
- SVGKit updated to correctly render SVG - Fix for issue #351
- Update to Xcode 12, Swift 5.3
- Update external dependencies, migrate to FirebaseCrashlytics, remove FirebaseAnalytics
- Update to Kingfisher 5.15.5 - to resolve clash with Alamofire
- Respond to authentication challenge in WebView


## [Version 2.3.24, Build 1580410444] - 2020-05-13

### Changed
Expand Down
Loading

0 comments on commit 087dd1a

Please sign in to comment.