Skip to content
This repository has been archived by the owner on Jun 23, 2022. It is now read-only.

Swift 4.2 and quality of life improvements #82

Merged
merged 21 commits into from
May 16, 2019
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
4.0
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ disabled_rules:
- type_body_length
- trailing_whitespace
- cyclomatic_complexity
- identifier_name

included:
- Samples
Expand Down
21 changes: 8 additions & 13 deletions Iconic.podspec
Original file line number Diff line number Diff line change
@@ -1,39 +1,34 @@
@version = '1.3'
@version = '1.5.1'
robbiet480 marked this conversation as resolved.
Show resolved Hide resolved

Pod::Spec.new do |s|

s.name = 'Iconic'
s.version = @version
s.summary = 'Auto-generated icon font library for iOS [beta]'
s.description = 'Iconic will help you make icon fonts integration on iOS easy and effortless. Its main component is in charge of auto-generating strongly typed code in Swift, fully compatible with Objective-C, allowing the integration of vector icons as image or text in your apps.'

s.homepage = 'https://github.com/dzenbot/Iconic'
s.screenshots = ''
s.author = { 'Ignacio Romero Zurbuchen' => '[email protected]' }

s.license = {
:type => 'MIT',
:file => 'LICENSE'
}

s.source = {
:git => 'https://github.com/dzenbot/Iconic.git',
:tag => @version
}

s.source_files = 'Source/*.{swift}'
s.resources = 'Source/**/*.{ttf,otf}'
s.preserve_paths = 'Source/Catalog/**/*.*'
s.framework = 'UIKit', 'CoreText'

s.ios.deployment_target = '8.0'
s.tvos.deployment_target = '9.0'
s.watchos.deployment_target = '2.0'

s.pod_target_xcconfig = {
'ENABLE_BITCODE' => 'NO',
'SWIFT_VERSION' => '3.0',
}

s.prepare_command = "sh Source/Iconizer.sh '#{ENV['FONT_PATH']}' --verbose"
s.prepare_command = "sh Source/Iconizer.sh '#{ENV['FONT_PATH']}' '#{ENV['CUSTOM_FONT_NAME']}'"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest to keep the --verbose to see what's going on the console at all times.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed --verbose because Iconizer.sh doesn't actually do anything with that flag.

end
8 changes: 0 additions & 8 deletions Samples/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,3 @@ target 'Tests' do
pod 'FBSnapshotTestCase/Core'
iconic
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '3.0'
end
end
end
Loading