From a4df787188a61f96da4de317d39e43321ff40842 Mon Sep 17 00:00:00 2001 From: Saurabh Rane Date: Sat, 4 Apr 2020 22:39:28 -0700 Subject: [PATCH] Release 3.0 --- .swift-version | 1 - .travis.yml | 9 ++--- CHANGELOG.md | 10 ++++- README.md | 6 +-- Source/Info.plist | 2 +- SwiftIcons.podspec | 3 +- SwiftIcons.xcodeproj/project.pbxproj | 46 ++++++++++++++--------- SwiftIconsApp/Base.lproj/Main.storyboard | 36 +++++++++--------- SwiftIconsApp/Extensions.swift | 4 +- SwiftIconsApp/Info.plist | 2 +- docs/images/pic01.png | Bin 98262 -> 144121 bytes 11 files changed, 68 insertions(+), 51 deletions(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 819e07a..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -5.0 diff --git a/.travis.yml b/.travis.yml index 012e167..967b9e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,15 @@ os: osx language: swift -osx_image: xcode10.1 +osx_image: xcode10.2.1 branches: - only: + only: - master script: - - xcodebuild clean build test -project SwiftIcons.xcodeproj -scheme SwiftIcons -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.3.1' CODE_SIGNING_REQUIRED=NO | xcpretty - - pod lib lint --verbose --no-clean + - xcodebuild clean build test -project SwiftIcons.xcodeproj -scheme SwiftIcons -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.0.1' CODE_SIGNING_REQUIRED=NO | xcpretty notifications: -email: + email: on_success: never on_failure: change diff --git a/CHANGELOG.md b/CHANGELOG.md index 992aef8..4d58ebc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +## [3.0] - 2020-04-04 + +### Changed + +- Updated to Swift 5.0 and Xcode 10.2 [#57] + ## [2.3.2] - 2018-12-16 ### Changed @@ -117,7 +123,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Initial Version of SwiftIcons - Support for Cocoapods -[Unreleased]: https://github.com/ranesr/SwiftIcons/compare/2.3.2...master +[Unreleased]: https://github.com/ranesr/SwiftIcons/compare/3.0...master +[3.0]: https://github.com/ranesr/SwiftIcons/compare/2.3.2...3.0 [2.3.2]: https://github.com/ranesr/SwiftIcons/compare/2.3.1...2.3.2 [2.3.1]: https://github.com/ranesr/SwiftIcons/compare/2.3.0...2.3.1 [2.3.0]: https://github.com/ranesr/SwiftIcons/compare/2.2.0...2.3.0 @@ -144,3 +151,4 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p [#35]: https://github.com/ranesr/SwiftIcons/issues/35 [#41]: https://github.com/ranesr/SwiftIcons/pull/41 [#48]: https://github.com/ranesr/SwiftIcons/pull/48 +[#57]: https://github.com/ranesr/SwiftIcons/pull/57 diff --git a/README.md b/README.md index 4fb4c93..f82bf12 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![BuyMeACoffee](https://img.shields.io/badge/buy%20me%20a%20coffee-%E2%98%95%EF%B8%8F-917A01.svg)](https://www.buymeacoffee.com/saurabhrrane) -[![CocoaPods](https://img.shields.io/cocoapods/v/SwiftIcons.svg)](https://cocoapods.org/pods/SwiftIcons) [![Platform](https://img.shields.io/cocoapods/p/SwiftIcons.svg)](http://cocoadocs.org/docsets/SwiftIcons) ![Swift](https://img.shields.io/badge/%20in-swift%204.2-orange.svg) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) +[![CocoaPods](https://img.shields.io/cocoapods/v/SwiftIcons.svg)](https://cocoapods.org/pods/SwiftIcons) [![Platform](https://img.shields.io/cocoapods/p/SwiftIcons.svg)](http://cocoadocs.org/docsets/SwiftIcons) ![Swift](https://img.shields.io/badge/%20in-swift%205.0-orange.svg) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Travis](https://img.shields.io/travis/ranesr/SwiftIcons.svg)](https://travis-ci.org/ranesr/SwiftIcons/) [![License](https://img.shields.io/cocoapods/l/SwiftIcons.svg?style=flat)](http://cocoapods.org/pods/SwiftIcons) @@ -71,7 +71,7 @@ Add the following lines to your `Podfile`: ```ruby target 'YourProject' do use_frameworks! - pod 'SwiftIcons', '~> 2.3.2' + pod 'SwiftIcons', '~> 3.0' end ``` @@ -96,7 +96,7 @@ Install the latest version of [Carthage](https://github.com/Carthage/Carthage#in Add this line to your `Cartfile`: ``` -github "ranesr/SwiftIcons" ~> 2.3.2 +github "ranesr/SwiftIcons" ~> 3.0 ``` or for `master`, diff --git a/Source/Info.plist b/Source/Info.plist index d10f2e2..cd4d194 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - $(CURRENT_PROJECT_VERSION) + $(MARKETING_VERSION) NSPrincipalClass diff --git a/SwiftIcons.podspec b/SwiftIcons.podspec index afb72b4..1bdb1ce 100644 --- a/SwiftIcons.podspec +++ b/SwiftIcons.podspec @@ -1,6 +1,7 @@ Pod::Spec.new do |s| s.name = 'SwiftIcons' - s.version = '2.3.2' + s.version = '3.0' + s.swift_versions = ['4.2', '5.0'] s.summary = 'SwiftIcons - A library for using different font icons' s.description = 'SwiftIcons library helps you use icons from any of these font icons - Dripicons, Emoji, FontAwesome, Icofont, Ionicons, Linearicons, Map-icons, Material icons, Open iconic, State face icons, Weather icons' diff --git a/SwiftIcons.xcodeproj/project.pbxproj b/SwiftIcons.xcodeproj/project.pbxproj index c7dea52..73926fa 100644 --- a/SwiftIcons.xcodeproj/project.pbxproj +++ b/SwiftIcons.xcodeproj/project.pbxproj @@ -42,7 +42,6 @@ A671D6971EAFD5BA00849862 /* SwiftIconsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A671D6961EAFD5BA00849862 /* SwiftIconsTests.swift */; }; A67D28A51E42445F005765A0 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = A67D28A41E42445F005765A0 /* LICENSE */; }; A6945A391E8D3D87004AA743 /* SwiftIcons.podspec in Resources */ = {isa = PBXBuildFile; fileRef = A6945A381E8D3D87004AA743 /* SwiftIcons.podspec */; }; - A6945A3B1E8D406B004AA743 /* .swift-version in Resources */ = {isa = PBXBuildFile; fileRef = A6945A3A1E8D406B004AA743 /* .swift-version */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -332,27 +331,29 @@ TargetAttributes = { 4389E5D820FE8E4400175651 = { CreatedOnToolsVersion = 9.4.1; - LastSwiftMigration = 1000; + LastSwiftMigration = 1120; ProvisioningStyle = Automatic; }; A605C12F1E37A9EE0079765A = { CreatedOnToolsVersion = 8.2; - LastSwiftMigration = 1000; + DevelopmentTeam = YT594STPKB; + LastSwiftMigration = 1120; ProvisioningStyle = Automatic; }; A671D6931EAFD5BA00849862 = { CreatedOnToolsVersion = 8.3.2; - LastSwiftMigration = 1000; + DevelopmentTeam = YT594STPKB; + LastSwiftMigration = 1120; ProvisioningStyle = Automatic; + TestTargetID = A605C12F1E37A9EE0079765A; }; }; }; buildConfigurationList = A605C12B1E37A9EE0079765A /* Build configuration list for PBXProject "SwiftIcons" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -398,7 +399,6 @@ A605C13E1E37A9EF0079765A /* LaunchScreen.storyboard in Resources */, A605C13B1E37A9EF0079765A /* Assets.xcassets in Resources */, A67D28A51E42445F005765A0 /* LICENSE in Resources */, - A6945A3B1E8D406B004AA743 /* .swift-version in Resources */, A605C1391E37A9EF0079765A /* Main.storyboard in Resources */, A6945A391E8D3D87004AA743 /* SwiftIcons.podspec in Resources */, ); @@ -491,7 +491,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2.1.0; + CURRENT_PROJECT_VERSION = 3.0; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -501,10 +501,11 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 3.0; PRODUCT_BUNDLE_IDENTIFIER = com.ranesr.SwiftIcons; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -520,7 +521,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2.1.0; + CURRENT_PROJECT_VERSION = 3.0; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -530,10 +531,11 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 3.0; PRODUCT_BUNDLE_IDENTIFIER = com.ranesr.SwiftIcons; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -595,7 +597,7 @@ SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -646,7 +648,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; VALIDATE_PRODUCT = YES; }; name = Release; @@ -657,12 +659,14 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = YT594STPKB; INFOPLIST_FILE = "$(SRCROOT)/SwiftIconsApp/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 3.0; PRODUCT_BUNDLE_IDENTIFIER = com.ranesr.SwiftIconsApp; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -673,12 +677,14 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = YT594STPKB; INFOPLIST_FILE = "$(SRCROOT)/SwiftIconsApp/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 3.0; PRODUCT_BUNDLE_IDENTIFIER = com.ranesr.SwiftIconsApp; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -687,12 +693,15 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; + DEVELOPMENT_TEAM = YT594STPKB; INFOPLIST_FILE = SwiftIconsTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.ranesr.SwiftIconsTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftIconsApp.app/SwiftIconsApp"; }; name = Debug; }; @@ -700,12 +709,15 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; + DEVELOPMENT_TEAM = YT594STPKB; INFOPLIST_FILE = SwiftIconsTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.ranesr.SwiftIconsTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftIconsApp.app/SwiftIconsApp"; }; name = Release; }; diff --git a/SwiftIconsApp/Base.lproj/Main.storyboard b/SwiftIconsApp/Base.lproj/Main.storyboard index 2a44785..50ec0ef 100644 --- a/SwiftIconsApp/Base.lproj/Main.storyboard +++ b/SwiftIconsApp/Base.lproj/Main.storyboard @@ -1,11 +1,9 @@ - - - - + + - + @@ -22,7 +20,7 @@ -