Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v2.9.0 code 1202 #46

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Release v2.9.0 code 1202 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 9 additions & 1 deletion falcon/app/.swiftlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ excluded: # paths to ignore during linting. Takes precedence over `included`.
- falconUITests
- vendor
- fastlane
warning_threshold: 744
warning_threshold: 1191
swiftlint_version: 0.50.1 # Keep in mind you will need to modify Podfile
line_length: 100
function_parameter_count:
Expand All @@ -21,3 +21,11 @@ custom_rules:
regex: ^\s*throw (?!MuunError)
severity: warning
message: replace with throw MuunError(...)
custom_rules:
force_error_handling:
name: "Avoid try?"
message: "Avoid using `try?` as it suppresses errors silently.."
regex: "try\\?"
severity: error
type_name:
allowed_symbols: "_"
2 changes: 1 addition & 1 deletion falcon/app/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source "https://rubygems.org"

gem 'fastlane', '2.220.0'
gem 'fastlane', '2.226.0'
gem 'cocoapods', '1.15.2'
73 changes: 39 additions & 34 deletions falcon/app/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,21 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.914.0)
aws-sdk-core (3.192.0)
aws-partitions (1.1050.0)
aws-sdk-core (3.218.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
base64
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.79.0)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.147.0)
aws-sdk-core (~> 3, >= 3.192.0)
aws-sdk-kms (1.98.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.180.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.11.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
Expand Down Expand Up @@ -80,16 +81,16 @@ GEM
highline (~> 2.0.0)
concurrent-ruby (1.2.3)
declarative (0.0.20)
digest-crc (0.6.5)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
emoji_regex (3.2.3)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
excon (0.110.0)
faraday (1.10.3)
excon (0.112.0)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -108,17 +109,17 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-multipart (1.1.0)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.3.1)
fastlane (2.220.0)
fastimage (2.4.0)
fastlane (2.226.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand All @@ -134,6 +135,7 @@ GEM
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
Expand All @@ -157,8 +159,10 @@ GEM
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty (~> 0.4.0)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
Expand All @@ -179,7 +183,7 @@ GEM
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.7.0)
google-cloud-core (1.7.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
Expand All @@ -200,29 +204,29 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.5)
http-cookie (1.0.8)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
jmespath (1.6.2)
json (2.6.2)
jwt (2.8.1)
jwt (2.10.1)
base64
mini_magick (4.12.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
minitest (5.16.0)
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.4.0)
multipart-post (2.4.1)
nanaimo (0.3.0)
nap (1.1.0)
naturally (2.2.1)
netrc (0.11.0)
nkf (0.2.0)
optparse (0.5.0)
optparse (0.6.0)
os (1.1.4)
plist (3.7.1)
plist (3.7.2)
public_suffix (4.0.7)
rake (13.2.1)
representable (3.2.0)
Expand All @@ -231,10 +235,10 @@ GEM
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.6)
rouge (2.0.7)
rouge (3.28.0)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
rubyzip (2.4.1)
security (0.1.5)
signet (0.19.0)
addressable (~> 2.8)
Expand All @@ -244,6 +248,7 @@ GEM
simctl (1.6.10)
CFPropertyList
naturally
sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand All @@ -257,7 +262,7 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.24.0)
CFPropertyList (>= 2.3.3, < 4.0)
Expand All @@ -266,8 +271,8 @@ GEM
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty (0.4.0)
rouge (~> 3.28.0)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
zeitwerk (2.6.13)
Expand All @@ -279,7 +284,7 @@ PLATFORMS

DEPENDENCIES
cocoapods (= 1.15.2)
fastlane (= 2.220.0)
fastlane (= 2.226.0)

BUNDLED WITH
2.3.16
36 changes: 26 additions & 10 deletions falcon/app/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,40 @@ source 'https://cdn.cocoapods.org/'
install! 'cocoapods',
:generate_multiple_pod_projects => true

platform :ios, '11.0'
$app_deployment_target = Gem::Version.new('12.0')
platform :ios, $app_deployment_target

target 'Muun' do
use_frameworks! :linkage => :static

pod 'core/all', :path => '../core', :testspecs => ['Tests']
platform :ios, $app_deployment_target

# Animations
pod 'lottie-ios', '3.0.6'

# This dependencies are fixed at core.podspec
# Firebase
pod 'GoogleUtilities'
pod 'Firebase/Core'
pod 'Firebase/Messaging'
pod 'Firebase/Analytics'
pod 'Firebase/Crashlytics'
pod 'Firebase/Crashlytics', '10.24.0'

# GoogleDrive
pod 'GoogleSignIn'
pod 'GoogleAPIClientForREST/Drive'
pod 'GoogleSignIn', '7.1.0'
pod 'GoogleAPIClientForREST/Drive', '3.5.1'
pod 'SwiftLint', '0.50.1' # Keep in mind you will need to modify swiftlint.yml
pod 'SwiftGen', '~> 6.0'

# core
pod 'Dip', '7.0.1'
pod 'GRDB.swift', '4.14.0'
pod 'RxGRDB', '0.18.0'
pod 'RxSwift', '5.0.1'
pod 'RxBlocking', '5.0.1'

# protobuf & gRPC
pod 'SwiftProtobuf', '~> 1.28'
pod 'gRPC-Swift', '~> 1.8.0'

target 'falconTests' do
inherit! :search_paths
end
Expand All @@ -35,14 +45,15 @@ end

target 'falconPushNotifications' do
use_frameworks! :linkage => :static
pod 'FirebaseCrashlytics'
pod 'Firebase'

pod 'core/notifications', :path => '../core'
end

target 'falconUITests' do
use_frameworks! :linkage => :static

pod 'core/all', :path => '../core'
pod 'FirebaseCrashlytics'
pod 'Firebase'
end

pre_install do |installer|
Expand All @@ -57,6 +68,11 @@ def fix_config(config)
if config.build_settings['DEVELOPMENT_TEAM'].nil?
config.build_settings['DEVELOPMENT_TEAM'] = '5YYLBTUB6W'
end
# Some pods can end up with a too low deployment target and cause weird build failures.
pod_deployment_target = Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
if pod_deployment_target < $app_deployment_target
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $app_deployment_target
end
end

post_install do |installer|
Expand Down
Loading