diff --git a/CI2Go/Info.plist b/CI2Go/Info.plist index c814d1ce..d0315fe1 100644 --- a/CI2Go/Info.plist +++ b/CI2Go/Info.plist @@ -3288,7 +3288,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.2.0 + 2.2.1 CFBundleURLTypes diff --git a/CI2Go/View Controllers/LoginViewController.swift b/CI2Go/View Controllers/LoginViewController.swift index 1dbbd95f..1fe942c0 100644 --- a/CI2Go/View Controllers/LoginViewController.swift +++ b/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) diff --git a/CI2GoTests/Info.plist b/CI2GoTests/Info.plist index 6b54d75b..1463245f 100644 --- a/CI2GoTests/Info.plist +++ b/CI2GoTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.2.0 + 2.2.1 CFBundleVersion 1 diff --git a/CI2GoTodayExtension/Info.plist b/CI2GoTodayExtension/Info.plist index 86a76407..79870a50 100644 --- a/CI2GoTodayExtension/Info.plist +++ b/CI2GoTodayExtension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.2.0 + 2.2.1 CFBundleVersion 1 NSExtension diff --git a/CI2GoTodayExtension/TodayViewController.swift b/CI2GoTodayExtension/TodayViewController.swift index 0a669a47..5d596496 100644 --- a/CI2GoTodayExtension/TodayViewController.swift +++ b/CI2GoTodayExtension/TodayViewController.swift @@ -42,11 +42,7 @@ class TodayViewController: UIViewController { if let cache = [Build].fromCache() { diffCalculator.sectionedValues = SectionedValues([(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([(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 { diff --git a/CI2GoUITests/Info.plist b/CI2GoUITests/Info.plist index 6b54d75b..1463245f 100644 --- a/CI2GoUITests/Info.plist +++ b/CI2GoUITests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.2.0 + 2.2.1 CFBundleVersion 1 diff --git a/CI2GoWatch/Info.plist b/CI2GoWatch/Info.plist index 07156ec9..e481feab 100644 --- a/CI2GoWatch/Info.plist +++ b/CI2GoWatch/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.2.0 + 2.2.1 CFBundleVersion 1 UISupportedInterfaceOrientations diff --git a/CI2GoWatchExtension/Info.plist b/CI2GoWatchExtension/Info.plist index 91278625..c3866666 100644 --- a/CI2GoWatchExtension/Info.plist +++ b/CI2GoWatchExtension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.2.0 + 2.2.1 CFBundleVersion 1 CLKComplicationPrincipalClass diff --git a/Cartfile.resolved b/Cartfile.resolved index fbeb90b7..52688aa3 100644 --- a/Cartfile.resolved +++ b/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" diff --git a/Gemfile.lock b/Gemfile.lock index bd62a3ea..cdfc4437 100644 --- a/Gemfile.lock +++ b/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,20 +85,19 @@ 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) @@ -106,13 +105,9 @@ GEM 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 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d22197b3..60e68ff0 100644 --- a/fastlane/Fastfile +++ b/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( diff --git a/fastlane/README.md b/fastlane/README.md index 64c96b76..52930396 100644 --- a/fastlane/README.md +++ b/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 diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt index 1055fb7e..fca43dfe 100644 --- a/fastlane/metadata/en-US/release_notes.txt +++ b/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