Skip to content

Commit

Permalink
Fix iOS warnings + update cocoapods & Swiftlint (#35)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcantoinefortier authored Aug 31, 2023
1 parent 5547407 commit 4f37f9d
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 25 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://rubygems.org'

gem 'cocoapods', '~> 1.12'
gem 'cocoapods-generate', '~> 2.2'
gem 'cocoapods', '~> 1.12', '>= 1.12.1'
gem 'cocoapods-generate', '~> 2.2', '>= 2.2.4'
24 changes: 12 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ GEM
specs:
CFPropertyList (3.0.6)
rexml
activesupport (7.0.4.2)
activesupport (7.0.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.1)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.1.0)
cocoapods (1.12.0)
cocoapods (1.12.1)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.12.0)
cocoapods-core (= 1.12.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.6.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -33,7 +33,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.12.0)
cocoapods-core (1.12.1)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand All @@ -44,10 +44,10 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-disable-podfile-validations (0.1.1)
cocoapods-disable-podfile-validations (0.2.0)
cocoapods-downloader (1.6.3)
cocoapods-generate (2.2.2)
cocoapods-disable-podfile-validations (~> 0.1.1)
cocoapods-generate (2.2.4)
cocoapods-disable-podfile-validations (>= 0.1.1, < 0.3.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
Expand All @@ -65,10 +65,10 @@ GEM
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
json (2.6.3)
minitest (5.18.0)
minitest (5.18.1)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
Expand All @@ -92,8 +92,8 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.12)
cocoapods-generate (~> 2.2)
cocoapods (~> 1.12, >= 1.12.1)
cocoapods-generate (~> 2.2, >= 2.2.4)

BUNDLED WITH
2.4.8
16 changes: 9 additions & 7 deletions ios/.swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Unless otherwise noted, rules are disabled because they reduce the readability of the code
# See https://realm.github.io/SwiftLint/rule-directory.html for more info on each rule

analyzer_rules:
- explicit_self
- unused_declaration
- unused_import

# Rule identifiers to exclude from running
disabled_rules:
- comment_spacing
Expand Down Expand Up @@ -34,7 +39,6 @@ opt_in_rules:
#- explicit_acl
#- explicit_enum_raw_value
- explicit_init
- explicit_self
#- explicit_top_level_acl
#- explicit_type_interface
- extension_access_modifier
Expand Down Expand Up @@ -109,8 +113,6 @@ opt_in_rules:
- unneeded_parentheses_in_closure_argument
- unowned_variable_capture
- untyped_error_in_catch
- unused_declaration
- unused_import
#- vertical_parameter_alignment_on_call
#- vertical_whitespace_between_cases
#- vertical_whitespace_closing_braces
Expand All @@ -131,9 +133,9 @@ conditional_returns_on_newline:

# Use the same deployment target as the project
deployment_target:
iOS_deployment_target: 9.0
tvOS_deployment_target: 9.1
watchOS_deployment_target: 2.0
iOS_deployment_target: 9.0
tvOS_deployment_target: 9.1
watchOS_deployment_target: 2.0

file_length:
ignore_comment_only_lines: true
Expand Down Expand Up @@ -161,4 +163,4 @@ discouraged_object_literal:
color_literal: false

attributes:
always_on_line_above: ["@objc"]
always_on_line_above: [ "@objc" ]
8 changes: 8 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@ target 'iosApp' do

pod 'SwiftLint'
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
end
end
end
6 changes: 3 additions & 3 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- Shared (0.1)
- SwiftLint (0.49.1)
- SwiftLint (0.52.4)

DEPENDENCIES:
- Shared (from `../shared`)
Expand All @@ -16,8 +16,8 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
Shared: f2c19c0b5f6abd7ec3aa3f109d4fce5885de176b
SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
SwiftLint: 1cc5cd61ba9bacb2194e340aeb47a2a37fda00b3

PODFILE CHECKSUM: 5baa6925aecf10ef705a6307fbe8d3ea1c77a900
PODFILE CHECKSUM: 60e72440e01d6f912f30472ba0860fb676c0fcd5

COCOAPODS: 1.12.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

0 comments on commit 4f37f9d

Please sign in to comment.