Skip to content

Commit

Permalink
Merge branch 'release/ios/3.6.4-393'
Browse files Browse the repository at this point in the history
  • Loading branch information
pyby committed Aug 12, 2022
2 parents 644b24a + 2a27254 commit d8e7fd0
Show file tree
Hide file tree
Showing 116 changed files with 1,743 additions and 1,063 deletions.
106 changes: 90 additions & 16 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,95 @@
included:
- Application
- Common
- Extensions
- TV Application
- UITests

disabled_rules:
- cyclomatic_complexity
- identifier_name
- force_cast
- force_try
- function_body_length
- multiple_closures_with_trailing_closure
- statement_position
- todo
- type_body_length
- cyclomatic_complexity
- identifier_name
- force_cast
- force_try
- function_body_length
- multiple_closures_with_trailing_closure
- statement_position
- todo
- type_body_length

line_length: 300
opt_in_rules:
- capture_variable
- closure_end_indentation
- closure_spacing
- collection_alignment
- comma_inheritance
- contains_over_filter_count
- contains_over_filter_is_empty
- contains_over_first_not_nil
- contains_over_range_nil_comparison
- convenience_type
- discarded_notification_center_observer
- discouraged_assert
- discouraged_object_literal
- discouraged_optional_boolean
- empty_collection_literal
- empty_count
- empty_string
- empty_xctest_method
- enum_case_associated_values_count
- expiring_todo
- explicit_init
- extension_access_modifier
- fallthrough
- fatal_error_message
- file_name_no_space
- first_where
- flatmap_over_map_reduce
- identical_operands
- joined_default_parameter
- last_where
- legacy_multiple
- literal_expression_end_indentation
- modifier_order
- multiline_function_chains
- multiline_literal_brackets
- multiline_parameters
- multiline_parameters_brackets
- nslocalizedstring_key
- operator_usage_whitespace
- overridden_super_call
- override_in_extension
- pattern_matching_keywords
- prefer_self_in_static_references
- prefer_self_type_over_type_of_self
- prefer_zero_over_explicit_init
- prefixed_toplevel_constant
- private_action
- private_outlet
- private_subject
- prohibited_super_call
- raw_value_for_camel_cased_codable_enum
- redundant_nil_coalescing
- redundant_type_annotation
- required_enum_case
- return_value_from_void_function
- sorted_first_last
- static_operator
- switch_case_on_newline
- test_case_accessibility
- toggle_bool
- typesafe_array_init
- unneeded_parentheses_in_closure_argument
- unowned_variable_capture
- untyped_error_in_catch
- unused_declaration
- unused_import
- vertical_parameter_alignment_on_call
- vertical_whitespace_closing_braces
- vertical_whitespace_opening_braces
- weak_delegate
- xct_specific_matcher

line_length: 300
file_length: 1000

trailing_whitespace:
Expand All @@ -25,9 +104,4 @@ function_parameter_count:
warning: 8

nesting:
type_level: 2

excluded:
- build
- Pods
- vendor
type_level: 2
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@
"Shows, topics and more" = "Émissions, sujets et plus encore";

/* Label of the button to simulate a memory warning */
"Simulate memory warning" = "Simuler l'alerte mémoire";
"Simulate memory warning" = "Simuler une alerte mémoire";

/* Title of the button to skip updating the application */
"Skip" = "Ignorer";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,45 +103,45 @@ body:
version: 2.0.1

name: abseil-cpp-SwiftPM, nameSpecified: abseil-cpp-swiftpm, owner: firebase, version: 0.20220203.1, source: https://github.com/firebase/abseil-cpp-SwiftPM
name: abseil-cpp-SwiftPM, nameSpecified: abseil-cpp-swiftpm, owner: firebase, version: 0.20220203.2, source: https://github.com/firebase/abseil-cpp-SwiftPM

name: Aiolos, nameSpecified: aiolos, owner: IdeasOnCanvas, version: 1.8.1, source: https://github.com/IdeasOnCanvas/Aiolos

name: appcenter-sdk-apple, nameSpecified: appcenter-sdk-apple, owner: microsoft, version: 4.4.2, source: https://github.com/microsoft/appcenter-sdk-apple
name: appcenter-sdk-apple, nameSpecified: appcenter-sdk-apple, owner: microsoft, version: 4.4.3, source: https://github.com/microsoft/appcenter-sdk-apple

name: boringssl-SwiftPM, nameSpecified: boringssl-swiftpm, owner: firebase, version: 0.9.0, source: https://github.com/firebase/boringssl-SwiftPM
name: boringssl-SwiftPM, nameSpecified: boringssl-swiftpm, owner: firebase, version: 0.9.1, source: https://github.com/firebase/boringssl-SwiftPM

name: Comscore-Swift-Package-Manager, nameSpecified: comscore-swift-package-manager, owner: comScore, version: 6.10.0, source: https://github.com/comScore/Comscore-Swift-Package-Manager

name: DZNEmptyDataSet, nameSpecified: dznemptydataset, owner: dzenbot, version: , source: https://github.com/dzenbot/DZNEmptyDataSet

name: firebase-ios-sdk, nameSpecified: firebase-ios-sdk, owner: firebase, version: 9.2.0, source: https://github.com/firebase/firebase-ios-sdk
name: firebase-ios-sdk, nameSpecified: firebase-ios-sdk, owner: firebase, version: 9.3.0, source: https://github.com/firebase/firebase-ios-sdk

name: FSCalendar, nameSpecified: fscalendar, owner: WenchaoD, version: 2.8.4, source: https://github.com/WenchaoD/FSCalendar

name: FXReachability, nameSpecified: fxreachability, owner: SRGSSR, version: 1.3.2-srg5, source: https://github.com/SRGSSR/FXReachability
name: FXReachability, nameSpecified: fxreachability, owner: SRGSSR, version: 1.3.2-srg6, source: https://github.com/SRGSSR/FXReachability

name: Gifu, nameSpecified: gifu, owner: kaishin, version: 3.3.1, source: https://github.com/kaishin/Gifu

name: GoogleAppMeasurement, nameSpecified: googleappmeasurement, owner: google, version: 9.1.0, source: https://github.com/google/GoogleAppMeasurement
name: GoogleAppMeasurement, nameSpecified: googleappmeasurement, owner: google, version: 9.3.0, source: https://github.com/google/GoogleAppMeasurement

name: GoogleCastSDK-ios-no-bluetooth, nameSpecified: googlecastsdk-ios-no-bluetooth, owner: SRGSSR, version: 4.7.1-beta.1, source: https://github.com/SRGSSR/GoogleCastSDK-ios-no-bluetooth

name: GoogleDataTransport, nameSpecified: googledatatransport, owner: google, version: 9.1.4, source: https://github.com/google/GoogleDataTransport
name: GoogleDataTransport, nameSpecified: googledatatransport, owner: google, version: 9.2.0, source: https://github.com/google/GoogleDataTransport

name: GoogleUtilities, nameSpecified: googleutilities, owner: google, version: 7.7.1, source: https://github.com/google/GoogleUtilities

name: grpc-ios, nameSpecified: grpc-ios, owner: grpc, version: 1.44.2-grpc, source: https://github.com/grpc/grpc-ios
name: grpc-ios, nameSpecified: grpc-ios, owner: grpc, version: 1.44.3-grpc, source: https://github.com/grpc/grpc-ios

name: gtm-session-fetcher, nameSpecified: gtm-session-fetcher, owner: google, version: 2.0.0, source: https://github.com/google/gtm-session-fetcher

name: ios-library, nameSpecified: ios-library, owner: urbanairship, version: 16.8.0, source: https://github.com/urbanairship/ios-library

name: leveldb, nameSpecified: leveldb, owner: firebase, version: 1.22.2, source: https://github.com/firebase/leveldb

name: libextobjc, nameSpecified: libextobjc, owner: SRGSSR, version: 0.6.0-srg3, source: https://github.com/SRGSSR/libextobjc
name: libextobjc, nameSpecified: libextobjc, owner: SRGSSR, version: 0.6.0-srg4, source: https://github.com/SRGSSR/libextobjc

name: MAKVONotificationCenter, nameSpecified: makvonotificationcenter, owner: SRGSSR, version: 1.0.0-srg5, source: https://github.com/SRGSSR/MAKVONotificationCenter
name: MAKVONotificationCenter, nameSpecified: makvonotificationcenter, owner: SRGSSR, version: 1.0.0-srg6, source: https://github.com/SRGSSR/MAKVONotificationCenter

name: Mantle, nameSpecified: mantle, owner: Mantle, version: 2.2.0, source: https://github.com/Mantle/Mantle

Expand All @@ -157,27 +157,27 @@ name: PLCrashReporter, nameSpecified: plcrashreporter, owner: microsoft, version

name: promises, nameSpecified: promises, owner: google, version: 2.1.1, source: https://github.com/google/promises

name: srganalytics-apple, nameSpecified: srganalytics-apple, owner: SRGSSR, version: 7.8.0, source: https://github.com/SRGSSR/srganalytics-apple
name: srganalytics-apple, nameSpecified: srganalytics-apple, owner: SRGSSR, version: 7.9.0, source: https://github.com/SRGSSR/srganalytics-apple

name: srgappearance-apple, nameSpecified: srgappearance-apple, owner: SRGSSR, version: 5.1.1, source: https://github.com/SRGSSR/srgappearance-apple
name: srgappearance-apple, nameSpecified: srgappearance-apple, owner: SRGSSR, version: 5.2.0, source: https://github.com/SRGSSR/srgappearance-apple

name: srgcontentprotection-apple, nameSpecified: srgcontentprotection-apple, owner: SRGSSR, version: 3.0.4, source: https://github.com/SRGSSR/srgcontentprotection-apple
name: srgcontentprotection-apple, nameSpecified: srgcontentprotection-apple, owner: SRGSSR, version: 3.1.0, source: https://github.com/SRGSSR/srgcontentprotection-apple

name: srgdataprovider-apple, nameSpecified: srgdataprovider-apple, owner: SRGSSR, version: 16.0.0, source: https://github.com/SRGSSR/srgdataprovider-apple
name: srgdataprovider-apple, nameSpecified: srgdataprovider-apple, owner: SRGSSR, version: 16.1.0, source: https://github.com/SRGSSR/srgdataprovider-apple

name: srgdiagnostics-apple, nameSpecified: srgdiagnostics-apple, owner: SRGSSR, version: 3.0.2, source: https://github.com/SRGSSR/srgdiagnostics-apple
name: srgdiagnostics-apple, nameSpecified: srgdiagnostics-apple, owner: SRGSSR, version: 3.1.0, source: https://github.com/SRGSSR/srgdiagnostics-apple

name: srgidentity-apple, nameSpecified: srgidentity-apple, owner: SRGSSR, version: 3.2.3, source: https://github.com/SRGSSR/srgidentity-apple
name: srgidentity-apple, nameSpecified: srgidentity-apple, owner: SRGSSR, version: 3.3.0, source: https://github.com/SRGSSR/srgidentity-apple

name: srgletterbox-apple, nameSpecified: srgletterbox-apple, owner: SRGSSR, version: 8.2.0, source: https://github.com/SRGSSR/srgletterbox-apple
name: srgletterbox-apple, nameSpecified: srgletterbox-apple, owner: SRGSSR, version: 8.3.0, source: https://github.com/SRGSSR/srgletterbox-apple

name: srglogger-apple, nameSpecified: srglogger-apple, owner: SRGSSR, version: 3.0.2, source: https://github.com/SRGSSR/srglogger-apple
name: srglogger-apple, nameSpecified: srglogger-apple, owner: SRGSSR, version: 3.1.0, source: https://github.com/SRGSSR/srglogger-apple

name: srgmediaplayer-apple, nameSpecified: srgmediaplayer-apple, owner: SRGSSR, version: 7.0.2, source: https://github.com/SRGSSR/srgmediaplayer-apple
name: srgmediaplayer-apple, nameSpecified: srgmediaplayer-apple, owner: SRGSSR, version: 7.1.0, source: https://github.com/SRGSSR/srgmediaplayer-apple

name: srgnetwork-apple, nameSpecified: srgnetwork-apple, owner: SRGSSR, version: 3.0.3, source: https://github.com/SRGSSR/srgnetwork-apple
name: srgnetwork-apple, nameSpecified: srgnetwork-apple, owner: SRGSSR, version: 3.1.0, source: https://github.com/SRGSSR/srgnetwork-apple

name: srguserdata-apple, nameSpecified: srguserdata-apple, owner: SRGSSR, version: 3.2.0, source: https://github.com/SRGSSR/srguserdata-apple
name: srguserdata-apple, nameSpecified: srguserdata-apple, owner: SRGSSR, version: 3.3.0, source: https://github.com/SRGSSR/srguserdata-apple

name: swift-collections, nameSpecified: swift-collections, owner: apple, version: 1.0.2, source: https://github.com/apple/swift-collections

Expand Down
Loading

0 comments on commit d8e7fd0

Please sign in to comment.