diff --git a/.swiftlint.yml b/.swiftlint.yml index 9b0d783..10f792d 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,74 +1,127 @@ -disabled_rules: - - file_length - - line_length - - identifier_name - - todo - - vertical_whitespace - - force_cast - - force_try - - large_tuple - - function_body_length - - nesting - - type_body_length -opt_in_rules: - - empty_count - - prohibited_super_call - - conditional_returns_on_newline - - implicit_return - - overridden_super_call - - private_outlet - - redundant_nil_coalescing - - first_where - - explicit_init - - switch_case_on_newline - - number_separator - - closure_end_indentation - - closure_spacing - - operator_usage_whitespace - - nimble_operator - - attributes - - fatal_error_message - - unneeded_parentheses_in_closure_argument - - trailing_closure - - block_based_kvo - - discouraged_direct_init - - joined_default_parameter - - pattern_matching_keywords - - contains_over_first_not_nil - - fallthrough - - array_init - - literal_expression_end_indentation - - sorted_first_last - - private_action - - yoda_condition - - required_enum_case - - discouraged_optional_boolean - - empty_string - - untyped_error_in_catch - - discouraged_optional_collection - - modifier_order - - unavailable_function - - multiline_function_chains - - redundant_set_access_control - - empty_xctest_method - - multiline_arguments +whitelist_rules: - anyobject_protocol - - redundant_type_annotation - - no_extension_access_modifier - - legacy_random - - toggle_bool - - identical_operands + - array_init + - attributes + - block_based_kvo + - class_delegate_protocol + - closing_brace + - closure_end_indentation + - closure_parameter_position + - closure_spacing - collection_alignment - - static_operator - - multiline_literal_brackets - - multiline_parameters_brackets - - vertical_whitespace_opening_braces - - vertical_whitespace_closing_braces - - legacy_hashing - - object_literal + - colon + - comma + - compiler_protocol_init + - conditional_returns_on_newline + - contains_over_first_not_nil + - control_statement + - deployment_target + - discarded_notification_center_observer + - discouraged_direct_init + - discouraged_object_literal + - discouraged_optional_boolean + - discouraged_optional_collection + - duplicate_imports + - dynamic_inline + - empty_count + - empty_enum_arguments + - empty_parameters + - empty_parentheses_with_trailing_closure + - empty_string + - empty_xctest_method + - explicit_init + - fallthrough + - fatal_error_message + - first_where + - for_where + - generic_type_name + - identical_operands + - identifier_name + - implicit_getter + - implicit_return + - inert_defer + - is_disjoint + - joined_default_parameter - last_where - - unused_control_flow_label + - leading_whitespace + - legacy_cggeometry_functions + - legacy_constant + - legacy_constructor + - legacy_hashing + - legacy_nsgeometry_functions + - legacy_random + - literal_expression_end_indentation + - lower_acl_than_parent + - mark + - modifier_order + - multiline_arguments + - multiline_function_chains + - multiline_literal_brackets + - multiline_parameters + - multiline_parameters_brackets + - multiple_closures_with_trailing_closure + - nimble_operator + - no_extension_access_modifier + - no_fallthrough_only + - notification_center_detachment + - number_separator + - object_literal + - opening_brace + - operator_usage_whitespace + - operator_whitespace + - overridden_super_call + - pattern_matching_keywords + - private_action + - private_outlet + - private_unit_test + - prohibited_super_call + - protocol_property_accessors_order + - redundant_discardable_let + - redundant_nil_coalescing + - redundant_objc_attribute + - redundant_optional_initialization + - redundant_set_access_control + - redundant_string_enum_value + - redundant_type_annotation + - redundant_void_return + - required_enum_case + - return_arrow_whitespace + - shorthand_operator + - sorted_first_last + - statement_position + - static_operator - strong_iboutlet + - superfluous_disable_command + - switch_case_alignment + - switch_case_on_newline + - syntactic_sugar + - toggle_bool + - trailing_closure + - trailing_comma + - trailing_newline + - trailing_semicolon + - trailing_whitespace + - type_name + - unavailable_function + - unneeded_break_in_switch + - unneeded_parentheses_in_closure_argument + - untyped_error_in_catch + - unused_closure_parameter + - unused_control_flow_label + - unused_enumerated + - unused_optional_binding + - unused_setter_value + - valid_ibinspectable + - vertical_parameter_alignment + - vertical_parameter_alignment_on_call + - vertical_whitespace_closing_braces + - vertical_whitespace_opening_braces + - void_return + - weak_computed_property + - weak_delegate + - xct_specific_matcher + - xctfail_message + - yoda_condition analyzer_rules: - unused_import - unused_private_declaration @@ -80,5 +133,25 @@ object_literal: image_literal: false discouraged_object_literal: color_literal: false +identifier_name: + max_length: + warning: 100 + error: 100 + min_length: + warning: 2 + error: 2 + validates_start_with_lowercase: false + allowed_symbols: + - '_' + excluded: + - 'x' + - 'y' + - 'a' + - 'b' + - 'x1' + - 'x2' + - 'y1' + - 'y2' +macOS_deployment_target: '10.14' excluded: - Carthage diff --git a/Cartfile.resolved b/Cartfile.resolved index 5f7b9e2..3335e01 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ github "sindresorhus/Defaults" "v1.0.0" -github "sparkle-project/Sparkle" "1.21.2" +github "sparkle-project/Sparkle" "1.21.3" diff --git a/Touch Bar Simulator/TouchBarWindow.swift b/Touch Bar Simulator/TouchBarWindow.swift index 0d5ea75..27f19b8 100644 --- a/Touch Bar Simulator/TouchBarWindow.swift +++ b/Touch Bar Simulator/TouchBarWindow.swift @@ -63,7 +63,7 @@ final class TouchBarWindow: NSPanel { func makeScreenshotButton(_ toolbarView: NSView) -> NSButton { let button = NSButton() - button.image = #imageLiteral(resourceName: "ScreenshotButton") + button.image = NSImage(named: "ScreenshotButton") button.imageScaling = .scaleProportionallyDown button.isBordered = false button.bezelStyle = .shadowlessSquare