Merge branch 'release/v0.8.2'

element-hq · Mar 11, 2019 · 69b391c · 69b391c
2 parents a764718 + 018c2ad
commit 69b391c
Show file tree

Hide file tree

Showing 107 changed files with 1,577 additions and 579 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -0,0 +1,64 @@
+# rule identifiers to exclude from running
+disabled_rules:
+  - trailing_whitespace
+  - todo
+  - conditional_binding_cascade
+  - mark
+  - vertical_whitespace
+  - syntactic_sugar
+  - unused_closure_parameter
+  - closure_parameter_position
+  - redundant_string_enum_value
+  - large_tuple
+  - shorthand_operator
+  - vertical_parameter_alignment
+  - identifier_name  
+
+# some rules are only opt-in
+opt_in_rules:  
+  - force_unwrapping
+  - private_action
+  - explicit_init
+
+# paths to include during linting. `--path` is ignored if present.
+included:
+  - Riot
+
+# paths to ignore during linting. Takes precedence over `included`.
+excluded:
+  - Carthage
+  - Pods
+  - Riot/Generated/  
+
+line_length:
+  warning: 250
+  error: 1000
+
+file_length:
+  warning: 700
+  error: 1000
+
+type_body_length:
+  warning: 700
+  error: 1000
+
+function_parameter_count:
+  warning: 7
+  error: 10
+
+cyclomatic_complexity:
+  ignores_case_statements: true
+  warning: 20
+  error: 25
+
+function_body_length:
+  warning: 100
+  error: 150
+
+# naming rules can set warnings/errors for min_length and max_length
+# additionally they can set excluded names
+type_name:
+  min_length: 3 # only warning
+  max_length: # warning and error
+    warning: 150
+    error: 1000
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,34 @@
+Changes in 0.8.3 (2019-xx-xx)
+===============================================
+
+
+
+Changes in 0.8.2 (2019-03-11)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version ([v0.9.6](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.9.6).
+ * Maintenance: Update cocopoads and pods. Automatic update to Swift4.2.
+ * Add app store description as app string resource to make them available for translation on weblate (#2201).
+ * Update deprecated contact availability checks (#2222).
+ * RoomVC: Remove the beta warning modal when enabling e2e in a room (#2239).
+ * RoomVC: Use accent color (green) for the ongoing conference call banner.
+ * Fastlane: Update to Xcode 10.1 (#2202).
+ * Use SwiftLint to enforce Swift style and conventions (PR #2300).
+ * Fix SWIFT_VERSION configuration in post install hook of Podfile (PR #2302).
+ * Authentication: support SSO by using the fallback URL (#2307).
+ * Authentication: .well-known support (#2117).
+ * Reskin: Colorise users displaynames (#2287).
+
+Bug fix:
+ * Reskin: status bar text is no more readable on iPad (#2276).
+ * Reskin: Text in badges should be white in dark theme (#2283).
+ * Reskin: HomeVC: use notices colors for badges background in section headers (#2292).
+ * Crash in Settings in 0.8.1 (#2295).
+ * Quickly tapping on a URL in a message highlights the message rather than opening the URL (#728).
+ * 3D touching a link can lock the app (#1818).
+ * Do not display key backup UI if the user has no e2e rooms (#2304).
+
 Changes in 0.8.1 (2019-02-19)
 ===============================================
 

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "xcode-install"
 gem "fastlane"
-gem "cocoapods", '~>1.5.3'
+gem "cocoapods", '~>1.6.0'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,45 +2,45 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.0)
-    activesupport (4.2.10)
+    activesupport (4.2.11)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     atomos (0.1.3)
     babosa (1.0.2)
     claide (1.0.2)
-    cocoapods (1.5.3)
+    cocoapods (1.6.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.3)
+      cocoapods-core (= 1.6.1)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.2.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.3)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.8.1, < 2.0)
+    cocoapods-core (1.6.1)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.1)
+    cocoapods-deintegrate (1.0.3)
+    cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
+    cocoapods-stats (1.1.0)
     cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
@@ -49,39 +49,41 @@ GEM
     colored2 (3.1.2)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     declarative (0.0.10)
     declarative-option (0.1.0)
+    digest-crc (0.4.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.5.0)
-    emoji_regex (0.1.1)
+    dotenv (2.7.1)
+    emoji_regex (1.0.1)
     escape (0.0.4)
     excon (0.62.0)
-    faraday (0.15.3)
+    faraday (0.15.4)
       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_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.4)
-    fastlane (2.105.2)
+    fastimage (2.1.5)
+    fastlane (2.116.1)
       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)
+      bundler (>= 1.12.0, < 3.0.0)
       colored
       commander-fastlane (>= 4.4.6, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (~> 0.1)
+      emoji_regex (>= 0.1, < 2.0)
       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.1.2, < 2.0.0)
       google-api-client (>= 0.21.2, < 0.24.0)
+      google-cloud-storage (>= 1.15.0, < 2.0.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
@@ -103,7 +105,7 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-versioning (0.3.4)
-    fourflusher (2.0.1)
+    fourflusher (2.2.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     google-api-client (0.23.9)
@@ -114,10 +116,19 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.9)
-    googleauth (0.6.6)
+    google-cloud-core (1.3.0)
+      google-cloud-env (~> 1.0)
+    google-cloud-env (1.0.5)
+      faraday (~> 0.11)
+    google-cloud-storage (1.16.0)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.23)
+      google-cloud-core (~> 1.2)
+      googleauth (>= 0.6.2, < 0.10.0)
+    googleauth (0.6.7)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.12)
+      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
@@ -127,7 +138,7 @@ GEM
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    json (2.2.0)
     jwt (2.1.0)
     memoist (0.16.0)
     mime-types (3.2.2)
@@ -144,18 +155,18 @@ GEM
     naturally (2.2.0)
     netrc (0.11.0)
     os (1.0.0)
-    plist (3.4.0)
+    plist (3.5.0)
     public_suffix (2.0.5)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
-    ruby-macho (1.3.1)
+    ruby-macho (1.4.0)
     rubyzip (1.2.2)
     security (0.1.3)
-    signet (0.10.0)
+    signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -170,20 +181,20 @@ GEM
     thread_safe (0.3.6)
     tty-cursor (0.6.0)
     tty-screen (0.6.5)
-    tty-spinner (0.8.0)
-      tty-cursor (>= 0.5.0)
+    tty-spinner (0.9.0)
+      tty-cursor (~> 0.6.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
     word_wrap (1.0.0)
-    xcode-install (2.4.4)
+    xcode-install (2.5.0)
       claide (>= 0.9.1, < 1.1.0)
       fastlane (>= 2.1.0, < 3.0.0)
-    xcodeproj (1.6.0)
+    xcodeproj (1.8.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -198,10 +209,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.5.3)
+  cocoapods (~> 1.6.0)
   fastlane
   fastlane-plugin-versioning
   xcode-install
 
 BUNDLED WITH
-   1.16.4
+   1.17.3
diff --git a/Podfile b/Podfile
@@ -4,12 +4,10 @@ platform :ios, "9.0"
 # Use frameforks to allow usage of pod written in Swift (like PiwikTracker)
 use_frameworks!
 
-source 'https://github.com/CocoaPods/Specs.git'
-
 
 # Different flavours of pods to MatrixKit
 # The current MatrixKit pod version
-$matrixKitVersion = '0.9.5'
+$matrixKitVersion = '0.9.6'
 
 # The develop branch version
 #$matrixKitVersion = 'develop'
@@ -79,7 +77,8 @@ abstract_target 'RiotPods' do
     pod 'zxcvbn-ios'
 
     # Tools
-    pod 'SwiftGen', '~> 6.0'
+    pod 'SwiftGen', '~> 6.1'
+    pod 'SwiftLint', '~> 0.30.1'
 
     target "Riot" do
         import_MatrixKit
@@ -104,8 +103,13 @@ post_install do |installer|
         # Plus the app does not enable it
         target.build_configurations.each do |config|
             config.build_settings['ENABLE_BITCODE'] = 'NO'
-            config.build_settings['SWIFT_VERSION'] = '4.0'     # Required for PiwikTracker. Should be removed
+
+            # Required for PiwikTracker as `swift_version` is not defined in podspec. Should be removed
+            if target.name.include? 'PiwikTracker'
+                config.build_settings['SWIFT_VERSION'] = '4.0'
+            end
         end
+
     end
 end