Merge branch 'master' into location-refactor

home-assistant · Jun 11, 2018 · 928a0fb · 928a0fb
2 parents a2dd671 + 6910efd
commit 928a0fb
Show file tree

Hide file tree

Showing 41 changed files with 248 additions and 91 deletions.
diff --git a/APNSAttachmentService/Info.plist b/APNSAttachmentService/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,14 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.5)
+    CFPropertyList (3.0.0)
     activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    atomos (0.1.2)
     babosa (1.0.2)
     claide (1.0.2)
     clamp (0.6.5)
@@ -51,39 +52,41 @@ GEM
     colored (1.2)
     colored2 (3.1.2)
     colorize (0.8.1)
-    commander-fastlane (4.4.5)
+    commander-fastlane (4.4.6)
       highline (~> 1.7.2)
     concurrent-ruby (1.0.5)
     declarative (0.0.10)
     declarative-option (0.1.0)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.1)
+    dotenv (2.4.0)
+    emoji_regex (0.1.1)
     escape (0.0.4)
-    excon (0.59.0)
-    faraday (0.13.1)
+    excon (0.62.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.0)
-    fastlane (2.64.1)
-      CFPropertyList (>= 2.3, < 3.0.0)
+    fastimage (2.1.3)
+    fastlane (2.97.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
       bundler (>= 1.12.0, < 2.0.0)
       colored
-      commander-fastlane (>= 4.4.5, < 5.0.0)
+      commander-fastlane (>= 4.4.6, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (~> 0.1)
       excon (>= 0.45.0, < 1.0.0)
       faraday (~> 0.9)
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 0.9)
       fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.0.1, < 2.0.0)
-      google-api-client (>= 0.13.1, < 0.14.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-api-client (>= 0.21.2, < 0.22.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
@@ -92,27 +95,29 @@ GEM
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
       public_suffix (~> 2.0.0)
-      rubyzip (>= 1.1.0, < 2.0.0)
+      rubyzip (>= 1.2.1, < 2.0.0)
       security (= 0.1.3)
-      slack-notifier (>= 1.3, < 2.0.0)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
       terminal-notifier (>= 1.6.2, < 2.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (~> 0.5.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.5.2, < 2.0.0)
+      xcodeproj (>= 1.5.7, < 2.0.0)
       xcpretty (>= 0.2.4, < 1.0.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-appicon (0.10.0)
+    fastlane-plugin-appicon (0.13.0)
       json
       mini_magick (~> 4.5.1)
     fastlane-plugin-synx (0.1.3)
       synx
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.3)
-    google-api-client (0.13.6)
+    gh_inspector (1.1.3)
+    google-api-client (0.21.2)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.5)
+      googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
@@ -125,7 +130,7 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    highline (1.7.8)
+    highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
@@ -144,21 +149,22 @@ GEM
     mini_magick (4.5.1)
     minitest (5.10.3)
     molinillo (0.5.7)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nanaimo (0.2.3)
+    nanaimo (0.2.5)
     nap (1.1.0)
+    naturally (2.2.0)
     netrc (0.11.0)
     os (0.9.6)
-    plist (3.3.0)
+    plist (3.4.0)
     public_suffix (2.0.5)
     redcarpet (3.4.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.1)
+    retriable (3.1.2)
     rouge (2.0.7)
     ruby-macho (1.1.0)
     rubyzip (1.2.1)
@@ -168,7 +174,10 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    slack-notifier (1.5.1)
+    simctl (1.6.4)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
     synx (0.2.1)
       clamp (~> 0.6)
       colorize (~> 0.7)
@@ -177,20 +186,24 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tty-screen (0.5.1)
+    tty-cursor (0.5.0)
+    tty-screen (0.6.4)
+    tty-spinner (0.8.0)
+      tty-cursor (>= 0.5.0)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
-    unicode-display_width (1.3.0)
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.4.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.3)
-      CFPropertyList (~> 2.3.3)
+    xcodeproj (1.5.9)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.2.5)
     xcpretty (0.2.8)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.0)

diff --git a/HomeAssistant.xcodeproj/project.pbxproj b/HomeAssistant.xcodeproj/project.pbxproj
@@ -2046,7 +2046,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer: Robert Trencheny (43BAGK8JW5)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Robert Trencheny (43BAGK8JW5)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = UTQFCBPQRF;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2108,7 +2108,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Robert Trencheny (UTQFCBPQRF)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Robert Trencheny (UTQFCBPQRF)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = UTQFCBPQRF;
 				ENABLE_NS_ASSERTIONS = NO;

diff --git a/HomeAssistant.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/HomeAssistant.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/HomeAssistant/Resources/Info.plist b/HomeAssistant/Resources/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/HomeAssistantTests/Info.plist b/HomeAssistantTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 </dict>
 </plist>
diff --git a/HomeAssistantUITests/Info.plist b/HomeAssistantUITests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 </dict>
 </plist>
diff --git a/MapNotificationContentExtension/Info.plist b/MapNotificationContentExtension/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

diff --git a/NotificationContentExtension/Info.plist b/NotificationContentExtension/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -11,8 +11,8 @@
 
 # This is the minimum version number required.
 # Update this, if you use features of a newer version
-fastlane_version "2.64.1"
-REQUIRED_XCODE_VERSION = "9.1"
+fastlane_version "2.97.0"
+REQUIRED_XCODE_VERSION = "9.4"
 default_platform :ios
 
 platform :ios do
@@ -31,7 +31,7 @@ platform :ios do
   end
 
   def complete_version_number
-    return version_string(get_version_number, get_build_number)
+    return version_string(get_version_number(target: "HomeAssistant"), get_build_number)
   end
 
   before_all do
@@ -110,7 +110,7 @@ platform :ios do
   lane :bump_build do
     git_pull(only_tags: true)
 
-    increment_version_number(version_number: get_version_number)
+    increment_version_number(version_number: get_version_number(target: "HomeAssistant"))
     increment_build_number
 
     finalize_bump
@@ -144,7 +144,7 @@ platform :ios do
       repository_name: "home-assistant/home-assistant-iOS",
       api_token: ENV["HOMEASSISTANT_GITHUB_API_TOKEN"],
       name: complete_version_number,
-      tag_name: tag_name("testflight", get_version_number, get_build_number),
+      tag_name: tag_name("testflight", get_version_number(target: "HomeAssistant"), get_build_number),
       description: change_log || "Release commit",
       is_prerelease: false
     )
@@ -212,13 +212,10 @@ platform :ios do
     pilot(
       changelog: change_log,
       skip_submission: true,
-      distribute_external: false
+      distribute_external: false,
+      skip_waiting_for_build_processing: true
     )
 
-    if is_ci
-      slack(message: "Uploaded new beta build to TestFlight")
-    end
-
     rocket
   end
 end
diff --git a/fastlane/README.md b/fastlane/README.md
@@ -8,25 +8,11 @@ Make sure you have the latest version of the Xcode command line tools installed:
 xcode-select --install
 ```
 
-## Choose your installation method:
-
-<table width="100%" >
-<tr>
-<th width="33%"><a href="http://brew.sh">Homebrew</a></th>
-<th width="33%">Installer Script</th>
-<th width="33%">RubyGems</th>
-</tr>
-<tr>
-<td width="33%" align="center">macOS</td>
-<td width="33%" align="center">macOS</td>
-<td width="33%" align="center">macOS or Linux with Ruby 2.0.0 or above</td>
-</tr>
-<tr>
-<td width="33%"><code>brew cask install fastlane</code></td>
-<td width="33%"><a href="https://download.fastlane.tools">Download the zip file</a>. Then double click on the <code>install</code> script (or run it in a terminal window).</td>
-<td width="33%"><code>sudo gem install fastlane -NV</code></td>
-</tr>
-</table>
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew cask install fastlane`
 
 # Available Actions
 ## iOS

diff --git a/fastlane/metadata/de-DE/description.txt b/fastlane/metadata/de-DE/description.txt
@@ -1 +1,13 @@
+Another week, another new Home Assistant for iOS build!
 
+- More localization support! We now support Chinese (Traditional and Simplified), Dutch and Spanish. Minor updates were also made to the existing German translation.
+- Add support for granular control of location update triggers (in Settings->Location)
+- Support customization of notification display options (see online docs for this, but allows you to specify badge/alert/sound or any combination of the three for each notification)
+- Add ability to send URL in push notification which opens upon tap
+- Add confirmation dialogs when opening a homeassistant:// URL
+- Re-enable Fabric so I can start tracking crashes again
+- Improve notification permission check
+- Lots of other localization work
+- Bug fixes
+
+Please submit a rating if you haven't already, it's my fuel that keeps me going!
diff --git a/fastlane/metadata/de-DE/keywords.txt b/fastlane/metadata/de-DE/keywords.txt
@@ -1 +1 @@
-
+home automation,open source,alexa,hue,wemo,smarthome,internet of things,push notifications,location
diff --git a/fastlane/metadata/de-DE/name.txt b/fastlane/metadata/de-DE/name.txt
@@ -1 +1 @@
-Home Assistant for iOS
+Home Assistant für iOS
diff --git a/fastlane/metadata/de-DE/privacy_url.txt b/fastlane/metadata/de-DE/privacy_url.txt
@@ -1 +1 @@
-
+https://home-assistant.io/privacy/
diff --git a/fastlane/metadata/de-DE/subtitle.txt b/fastlane/metadata/de-DE/subtitle.txt
@@ -1 +1 @@
-
+Erwecke dein Zuhause
diff --git a/fastlane/metadata/en-US/privacy_url.txt b/fastlane/metadata/en-US/privacy_url.txt
@@ -1 +1 @@
-
+https://home-assistant.io/privacy/