From 98529abefe2dc85504cc05890965f2d05a223ccd Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Wed, 27 Feb 2019 15:13:04 +0100 Subject: [PATCH 1/4] In podfile post install set explicit SWIFT_VERSION only for PiwikTracker --- Podfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Podfile b/Podfile index 2377b2a22..496f17a81 100644 --- a/Podfile +++ b/Podfile @@ -105,8 +105,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 From 2bfa2a2b862ab772186bd39beb086c2625a76e32 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Wed, 27 Feb 2019 15:16:51 +0100 Subject: [PATCH 2/4] Remove not needed official podspec source from Podfile. As written in the doc "The official CocoaPods source is implicit". --- Podfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Podfile b/Podfile index 496f17a81..ca5ffda02 100644 --- a/Podfile +++ b/Podfile @@ -4,8 +4,6 @@ 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 From 3147a142a07bd1043f66e862ab0696905c999054 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Wed, 27 Feb 2019 15:17:04 +0100 Subject: [PATCH 3/4] Update podfile.lock checksum --- Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile.lock b/Podfile.lock index 7b874f889..026cab9c0 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -165,6 +165,6 @@ SPEC CHECKSUMS: WebRTC: f2a6203584745fe53532633397557876b5d71640 zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c -PODFILE CHECKSUM: e35dd68cbd07be4c9dcf9e481000dd4498982e8a +PODFILE CHECKSUM: 3176215a897b46c2a49fe45e93d0a8b1f8a7b973 COCOAPODS: 1.6.1 From b292d799a31a48130933d37c83e6d78070083a3f Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Wed, 27 Feb 2019 15:34:25 +0100 Subject: [PATCH 4/4] Update changes --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index f17ec7adc..e606b7911 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,6 +9,7 @@ Improvements: * RoomVC: Remove the beta warning modal when enabling e2e in a room (#2239). * 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). Bug fix: * Reskin: status bar text is no more readable on iPad (#2276).