From 316d3e0899949715dc64ac12853d93c89a94c6eb Mon Sep 17 00:00:00 2001 From: manuroe Date: Mon, 16 Nov 2020 10:31:32 +0100 Subject: [PATCH] `bundle update` to use the latest cocoapods version With cocoapods 1.10.0 and Realm 10.1.2, we are full compliant with arm64 simulator. We do not need any trick anymore --- CHANGES.rst | 1 + Gemfile | 2 +- Gemfile.lock | 46 +++++++++++++++++++++++----------------------- INSTALL.md | 2 +- Podfile | 3 --- Podfile.lock | 24 ++++++++++++------------ 6 files changed, 38 insertions(+), 40 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 133a89025..1dbe14e59 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -19,6 +19,7 @@ Changes to be released in next version ⚠️ API Changes * Xcode 12 is now mandatory to build the project. + * CocoaPods 1.10.0 is mandatory. * Remove MXDecryptionFailureDelegate in flavor of agnostic MXAnalyticsDelegate. 🗣 Translations diff --git a/Gemfile b/Gemfile index 4d6ef2604..1f57bb8b0 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "xcode-install" gem "fastlane" -gem "cocoapods", '~>1.9.3' +gem "cocoapods", '~>1.10.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 index d3d6c08e9..bee81988c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (4.2.11.3) - i18n (~> 0.7) + activesupport (5.2.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.4) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) aws-eventstream (1.1.0) - aws-partitions (1.385.0) - aws-sdk-core (3.109.1) + aws-partitions (1.393.0) + aws-sdk-core (3.109.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -23,7 +23,7 @@ GEM aws-sdk-kms (1.39.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.1) + aws-sdk-s3 (1.84.1) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -31,15 +31,14 @@ GEM aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.0.3) - cocoapods (1.9.3) - activesupport (>= 4.0.2, < 5) + cocoapods (1.10.0) + addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.3) + cocoapods-core (= 1.10.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-downloader (>= 1.4.0, < 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.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) @@ -49,21 +48,22 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.3) - activesupport (>= 4.0.2, < 6) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.0) + activesupport (> 5.0, < 6) + addressable (~> 2.6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) + public_suffix typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.1.0) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) @@ -80,7 +80,7 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) - emoji_regex (3.0.0) + emoji_regex (3.2.1) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) @@ -94,7 +94,7 @@ GEM faraday_middleware (1.0.0) faraday (~> 1.0) fastimage (2.2.0) - fastlane (2.164.0) + fastlane (2.167.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) aws-sdk-s3 (~> 1.0) @@ -167,13 +167,13 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.8.5) concurrent-ruby (~> 1.0) jmespath (1.4.0) json (2.3.1) jwt (2.2.2) memoist (0.16.2) - mini_magick (4.10.1) + mini_magick (4.11.0) mini_mime (1.0.2) minitest (5.14.2) molinillo (0.6.6) @@ -216,7 +216,7 @@ GEM tty-cursor (~> 0.7) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.8) thread_safe (~> 0.1) uber (0.1.0) unf (0.1.4) @@ -224,7 +224,7 @@ GEM unf_ext (0.0.7.7) unicode-display_width (1.7.0) word_wrap (1.0.0) - xcode-install (2.6.6) + xcode-install (2.6.7) claide (>= 0.9.1, < 1.1.0) fastlane (>= 2.1.0, < 3.0.0) xcodeproj (1.19.0) @@ -242,7 +242,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.9.3) + cocoapods (~> 1.10.0) fastlane fastlane-plugin-versioning xcode-install diff --git a/INSTALL.md b/INSTALL.md index e949bf4d0..d56abd9e0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -7,7 +7,7 @@ To build Element iOS project you need: - Xcode 12.1+. - [Ruby](https://www.ruby-lang.org/), a dynamic programming language used by several build tools. - [cmake](https://gitlab.kitware.com/cmake/cmake), used to build [cmark](https://github.com/commonmark/cmark) dependency of [MatrixKit](https://github.com/matrix-org/matrix-ios-kit) pod. -- [CocoaPods](https://cocoapods.org) 1.9.3. Manages library dependencies for Xcode projects. +- [CocoaPods](https://cocoapods.org), library dependencies manager for Xcode projects. - [Homebrew](http://brew.sh/) (recommended), is a package manager for macOS that can be used to install cmake. - [bundler](https://bundler.io/) (optional), is also a dependency manager used to manage build tools dependency (CocoaPods, Fastlane). diff --git a/Podfile b/Podfile index c5f460fb9..1dc9c0726 100644 --- a/Podfile +++ b/Podfile @@ -106,9 +106,6 @@ post_install do |installer| # Because the WebRTC pod (included by the JingleCallStack pod) does not support it. # Plus the app does not enable it config.build_settings['ENABLE_BITCODE'] = 'NO' - - # Make Xcode 12 and fastlane(xcodebuild) happy while some pods are not updated - config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" # Force ReadMoreTextView to use Swift 5.2 version (as there is no code changes to perform) if target.name.include? 'ReadMoreTextView' diff --git a/Podfile.lock b/Podfile.lock index c6e4a039c..29f8ca046 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -42,13 +42,13 @@ PODS: - DTFoundation/Core - DTFoundation/UIKit (1.7.16): - DTFoundation/Core - - FlowCommoniOS (1.9.0) + - FlowCommoniOS (1.9.2) - GBDeviceInfo (6.4.0): - GBDeviceInfo/Core (= 6.4.0) - GBDeviceInfo/Core (6.4.0) - GZIP (1.3.0) - HPGrowingTextView (1.1) - - JitsiMeetSDK (2.10.0) + - JitsiMeetSDK (2.10.2) - KeychainAccess (4.2.1) - KituraContracts (1.2.1): - LoggerAPI (~> 1.7) @@ -88,9 +88,9 @@ PODS: - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - OLMKit (~> 3.1.0) - - Realm (~> 5.4.8) + - Realm (~> 10.1.2) - MatrixSDK/JingleCallStack (0.16.20): - - JitsiMeetSDK (= 2.10.0) + - JitsiMeetSDK (= 2.10.2) - MatrixSDK/Core - MatrixSDK/SwiftSupport (0.16.20): - MatrixSDK/Core @@ -100,9 +100,9 @@ PODS: - OLMKit/olmc (3.1.0) - OLMKit/olmcpp (3.1.0) - ReadMoreTextView (3.0.1) - - Realm (5.4.8): - - Realm/Headers (= 5.4.8) - - Realm/Headers (5.4.8) + - Realm (10.1.3): + - Realm/Headers (= 10.1.3) + - Realm/Headers (10.1.3) - Reusable (4.1.1): - Reusable/Storyboard (= 4.1.1) - Reusable/View (= 4.1.1) @@ -193,11 +193,11 @@ SPEC CHECKSUMS: Down: 276f2c3eeeaf30345873bdad25f44b2640fcfa3a DTCoreText: e92f4cf6b36d9d71ce4436d12cf089d74ab0596b DTFoundation: e7781d9fd2f202bfd451fbbf8cab71ce83b46498 - FlowCommoniOS: 2b87d7878b7a2a29c80379c00eeb78aa4590831c + FlowCommoniOS: e9353819a19764c8cafd3fa7efb98b00c9f68e7e GBDeviceInfo: f29249891446a392e64b9c9bbef9554aad2a6beb GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3 HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19 - JitsiMeetSDK: cbbfc8ace742e148a8477f32b8b95ef5578acac6 + JitsiMeetSDK: d7612d73befd3f7f51f989458a816bbd05d0bc8e KeychainAccess: 9b07f665298d13c3a85881bd3171f6f49b8151c1 KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97 @@ -210,7 +210,7 @@ SPEC CHECKSUMS: MatrixSDK: b4a837585997c462761b8faa894cd490e24acb11 OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639 ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d - Realm: 042bbb59227a0159eda397b8a5a49fbd67495ce7 + Realm: 072f4060c99150cb1d35e35ce1dd4dda7d9ddfed Reusable: 53a9acf5c536f229b31b5865782414b508252ddb SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17 SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108 @@ -219,6 +219,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 7077a019c5083aecc61e3aca1790b6ca0d9e8702 +PODFILE CHECKSUM: 54e01237a5fb1c81bde4483fbcd2f162359605d5 -COCOAPODS: 1.9.3 +COCOAPODS: 1.10.0