Merge pull request #90 from ngs/develop

v2.2.1

CI2Go/Info.plist

@@ -3288,7 +3288,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

CI2Go/View Controllers/LoginViewController.swift

@@ -44,7 +44,7 @@ class LoginViewController: UIViewController, WKNavigationDelegate {
                     return
                 }
                 let isCircle = Hostname(url: navigationAction.request.url)?.isCircleCI == true
-                webView.alpha = isCircle ? 0 : 1
+                webView.alpha = isCircle ? 0.2 : 1
                 webView.isUserInteractionEnabled = !isCircle
                 navigationItem.rightBarButtonItem = UIBarButtonItem(
                     activityIndicatorStyle: ColorScheme.current.activityIndicatorViewStyle)

CI2GoTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

CI2GoTodayExtension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

CI2GoTodayExtension/TodayViewController.swift

@@ -42,11 +42,7 @@ class TodayViewController: UIViewController {
         if let cache = [Build].fromCache() {
             diffCalculator.sectionedValues = SectionedValues<Int, Build>([(0, cache)])
         }
-        if let date = [Build].cacheFile.modifiedDate {
-            updatedTimeLabel.text = "Last update " + dateFormatter.string(from: date)
-        } else {
-            updatedTimeLabel.text = ""
-        }
+        updateLastUpdateLabel(date: [Build].cacheFile.modifiedDate)
     }
 
     @IBAction func refresh(_ sender: Any) {
@@ -67,7 +63,7 @@ class TodayViewController: UIViewController {
         guard
             let activeDisplayMode = activeDisplayMode ?? self.extensionContext?.widgetActiveDisplayMode,
             !builds.isEmpty else {
-            return
+                return
         }
         let width = width ?? preferredContentSize.width
 
@@ -114,12 +110,19 @@ class TodayViewController: UIViewController {
             DispatchQueue.main.async {
                 self.diffCalculator.sectionedValues = SectionedValues<Int, Build>([(0, newBuilds)])
                 self.updatePreferredContentSize()
-                self.updatedTimeLabel.text = "Last update: " + self.dateFormatter.string(from: Date())
+                self.updateLastUpdateLabel(date: Date())
                 completionHandler?(.newData)
             }
             }.resume()
     }
 
+    func updateLastUpdateLabel(date: Date?) {
+        if let date = date {
+            updatedTimeLabel.text = "Last update " + dateFormatter.string(from: date)
+        } else {
+            updatedTimeLabel.text = ""
+        }
+    }
 }
 
 extension TodayViewController: NCWidgetProviding {

CI2GoUITests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

CI2GoWatch/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>

CI2GoWatchExtension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

Cartfile.resolved

@@ -5,6 +5,6 @@ github "icanzilb/TaskQueue" "1.1.1"
 github "jdg/MBProgressHUD" "1.1.0"
 github "jflinter/Dwifft" "0.8"
 github "kishikawakatsumi/KeychainAccess" "v3.1.1"
-github "krzyzanowskim/CryptoSwift" "0.10.0"
+github "krzyzanowskim/CryptoSwift" "0.11.0"
 github "ngs/pusher-websocket-swift" "41d16860bfe27997d9079280e18fb38c88979e14"
 github "nvzqz/FileKit" "v5.1.0"

Gemfile.lock

@@ -16,7 +16,7 @@ GEM
     CFPropertyList (3.0.0)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    atomos (0.1.2)
+    atomos (0.1.3)
     babosa (1.0.2)
     claide (1.0.2)
     coderay (1.1.2)
@@ -46,7 +46,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.3)
-    fastlane (2.99.0)
+    fastlane (2.101.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -61,7 +61,7 @@ GEM
       faraday_middleware (~> 0.9)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.21.2, < 0.22.0)
+      google-api-client (>= 0.21.2, < 0.24.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
@@ -85,34 +85,29 @@ GEM
     fastlane-plugin-coveralls (1.0.1)
       xccoveralls (= 1.0.0)
     gh_inspector (1.1.3)
-    google-api-client (0.21.2)
+    google-api-client (0.23.4)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.6.2)
+    googleauth (0.6.4)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
-      os (~> 0.9)
+      os (>= 0.9, < 2.0)
       signet (~> 0.7)
     highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     json (2.1.0)
     jwt (2.1.0)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
     memoist (0.16.0)
     method_source (0.9.0)
-    mime-types (3.1)
+    mime-types (3.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.5.1)
@@ -121,7 +116,7 @@ GEM
     multipart-post (2.0.0)
     nanaimo (0.2.6)
     naturally (2.2.0)
-    os (0.9.6)
+    os (1.0.0)
     plist (3.4.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
@@ -156,8 +151,8 @@ GEM
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
     tins (1.16.3)
-    tty-cursor (0.5.0)
-    tty-screen (0.6.4)
+    tty-cursor (0.6.0)
+    tty-screen (0.6.5)
     tty-spinner (0.8.0)
       tty-cursor (>= 0.5.0)
     uber (0.1.0)
@@ -190,4 +185,4 @@ DEPENDENCIES
   xcov!
 
 BUNDLED WITH
-   1.16.1
+   1.16.3

fastlane/Fastfile

@@ -30,7 +30,10 @@ platform :ios do
     xcode_select ENV['XCODE_PATH'] if ENV['XCODE_PATH']
     build_app(
       export_method: 'ad-hoc',
-      output_directory: './build/adhoc'
+      output_directory: './build/adhoc',
+      export_options: {
+        iCloudContainerEnvironment: 'Production'
+      }
     )
   end
 
@@ -115,6 +118,11 @@ platform :ios do
     increment_version_number bump_type: 'minor'
   end
 
+  desc 'Increment patch version'
+  lane :increment_patch_version do
+    increment_version_number bump_type: 'patch'
+  end
+
   desc 'Upload Coverage data to Coveralls'
   lane :send_coveralls do
     coveralls(

fastlane/README.md

@@ -76,6 +76,11 @@ Take screenshots
 fastlane ios increment_minor_version
 ```
 Increment minor version
+### ios increment_patch_version
+```
+fastlane ios increment_patch_version
+```
+Increment patch version
 ### ios send_coveralls
 ```
 fastlane ios send_coveralls

fastlane/metadata/en-US/release_notes.txt

@@ -1,2 +1,2 @@
-- Build Artifacts are now downloaded to iCloud Drive
-- Change Application Icon on changing color scheme
+- Make web view translucent while retrieving CircleCI token
+- Update labelling