Skip to content

Commit

Permalink
Removed .swift-version file, and added explicit spec.swift_version (4…
Browse files Browse the repository at this point in the history
….2) in podspec. All files (podfile, podspec, and all proj files in xcode) now target iOS 11.4, and Swift 4.2. Incremented the version number.
  • Loading branch information
jakeHawkenGeocaching committed Jun 22, 2019
1 parent 754985d commit cb02739
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 6 deletions.
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

27 changes: 27 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
disabled_rules: # rules from the default set that we want turned off
- identifier_name
- legacy_hashing
- statement_position
- todo
- trailing_whitespace
opt_in_rules:
- sorted_imports
- trailing_closure
- empty_count
- empty_string
excluded: # paths to ignore during linting. Takes precedence over `included`.
- Pods

# configurable rules can be customized from this configuration file
# binary rules can set their severity level
line_length: 145
function_body_length:
warning: 50
error: 100
type_name:
min_length: 3 # only warning
max_length: # warning and error
warning: 42
error: 50
function_body_length:
excluded: ".*Test\\.swift"
1 change: 1 addition & 0 deletions Concurrency.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Pod::Spec.new do |s|

s.platform = :ios, "11.4"
s.ios.deployment_target = '11.4'
s.swift_version = '4.2'

s.source_files = 'Source/*'
end
8 changes: 4 additions & 4 deletions Concurrency.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.JakeHawken.Concurrency;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -538,7 +538,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.JakeHawken.Concurrency;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand All @@ -556,7 +556,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.JakeHawken.ConcurrencyTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Concurrency.app/Concurrency";
};
Expand All @@ -575,7 +575,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.JakeHawken.ConcurrencyTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Concurrency.app/Concurrency";
};
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '11.0'
platform :ios, '11.4'
inhibit_all_warnings!

target 'Concurrency' do
Expand Down

0 comments on commit cb02739

Please sign in to comment.