Skip to content

Commit fc02536

Browse files
author
dirtmelon
committed
Merge branch 'eggswift/master'
2 parents b535934 + b4c35c1 commit fc02536

File tree

104 files changed

+2991
-3147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+2991
-3147
lines changed

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
osx_image: xcode7.3
2-
language: objective-c
2+
language: swift
33

44
xcode_project: ESTabBarControllerExample/ESTabBarControllerExample.xcodeproj
55
xcode_scheme: ESTabBarControllerExample
6-
xcode_sdk: iphonesimulator
6+
xcode_sdk: iphonesimulator

ESTabBarController-swift.podspec

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
Pod::Spec.new do |s|
22
s.name = 'ESTabBarController-swift'
3-
s.module_name = 'ESTabBarController'
4-
s.version = '1.0.2'
5-
s.license = { :type => "MIT", :file => "LICENSE" }
3+
s.version = '2.0'
64
s.summary = 'An easy way to customize tabBarController and tabBarItem.'
75
s.homepage = 'https://github.com/eggswift/ESTabBarController'
8-
s.authors = { "lihao" => "lihao_ios@hotmail.com"}
9-
s.source = {:git => "https://github.com/eggswift/ESTabBarController.git", :tag => "v#{s.version}" }
10-
s.ios.deployment_target = '8.0'
11-
s.source_files = 'ESTabBarController/*.swift'
6+
7+
s.license = { :type => 'MIT', :file => 'LICENSE' }
8+
s.authors = { 'lihao' => 'lihao_ios@hotmail.com'}
9+
s.social_media_url = 'https://github.com/eggswift'
10+
s.platform = :ios, '8.0'
11+
s.source = {:git => 'https://github.com/eggswift/ESTabBarController.git', :tag => s.version}
12+
s.source_files = ['Sources/**/*.{swift}']
13+
s.requires_arc = true
1214
end

ESTabBarController/ESTabBarBadge.swift

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)