diff --git a/.travis.yml b/.travis.yml index c8d0be6..32e2ca7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,24 @@ -# references: -# * http://www.objc.io/issue-6/travis-ci.html -# * https://github.com/supermarin/xcpretty#usage - language: objective-c -cache: cocoapods +osx_image: xcode7.3 + +# cache: + # directories: + # - vendor/bundle +# install: + # - brew update && (brew upgrade xctool || true) && (brew install xcproj || true) && xctool --version + # - bundle install --path=vendor/bundle --binstubs=vendor/bin + # - cd Example && bundle exec pod install && cd - + + podfile: Example/Podfile -before_install: +# cache: cocoapods +# podfile: Example/Podfile +#before_install: # - gem install cocoapods # Since Travis is not always on latest version - - pod install --project-directory=Example +# - pod install --project-directory=Example +install: + - cd Example/ + - pod update + - cd ../ script: -- set -o pipefail && xcodebuild test -workspace Example/EMEmojiableBtn.xcworkspace -scheme EMEmojiableBtn-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -- pod lib lint + - xctool -workspace Example/EMEmojiableBtn.xcworkspace -scheme EMEmojiableBtn-Example -sdk iphoneos9.3 build CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" \ No newline at end of file diff --git a/EMEmojiableBtn.podspec b/EMEmojiableBtn.podspec index 09ba0f3..8bb0be3 100644 --- a/EMEmojiableBtn.podspec +++ b/EMEmojiableBtn.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "EMEmojiableBtn" - s.version = "0.0.3" + s.version = "0.1.0" s.summary = "Option selector that works similar to Reactions by fb. Objective-c version" # This description is used to generate tags and improve search results. diff --git a/Example/EMEmojiableBtn.xcodeproj/project.pbxproj b/Example/EMEmojiableBtn.xcodeproj/project.pbxproj index 70f657d..31cde92 100644 --- a/Example/EMEmojiableBtn.xcodeproj/project.pbxproj +++ b/Example/EMEmojiableBtn.xcodeproj/project.pbxproj @@ -597,6 +597,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "EMEmojiableBtn/EMEmojiableBtn-Prefix.pch"; INFOPLIST_FILE = "EMEmojiableBtn/EMEmojiableBtn-Info.plist"; @@ -614,6 +616,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "EMEmojiableBtn/EMEmojiableBtn-Prefix.pch"; INFOPLIST_FILE = "EMEmojiableBtn/EMEmojiableBtn-Info.plist"; diff --git a/Example/EMEmojiableBtn.xcodeproj/xcshareddata/xcschemes/EMEmojiableBtn-Example.xcscheme b/Example/EMEmojiableBtn.xcworkspace/xcshareddata/xcschemes/EMEmojiableBtn-Example.xcscheme similarity index 100% rename from Example/EMEmojiableBtn.xcodeproj/xcshareddata/xcschemes/EMEmojiableBtn-Example.xcscheme rename to Example/EMEmojiableBtn.xcworkspace/xcshareddata/xcschemes/EMEmojiableBtn-Example.xcscheme diff --git a/Pod/Classes/EMEmojiableBtn.h b/Pod/Classes/EMEmojiableBtn.h index 6e56b38..44321f8 100644 --- a/Pod/Classes/EMEmojiableBtn.h +++ b/Pod/Classes/EMEmojiableBtn.h @@ -13,9 +13,9 @@ @protocol EMEmojiableBtnDelegate; @interface EMEmojiableBtn : UIButton @property (strong,nonatomic) NSArray * _Nonnull dataset; -@property (weak,readwrite) id delegate; +@property (weak,readwrite) id _Nullable delegate; -- (instancetype)initWithFrame:(CGRect)frame withConfig:(EMEmojiableBtnConfig*)conf; +- (instancetype _Nonnull)initWithFrame:(CGRect)frame withConfig:(EMEmojiableBtnConfig* _Nonnull)conf; @end @protocol EMEmojiableBtnDelegate diff --git a/Pod/Classes/EMEmojiableBtn.m b/Pod/Classes/EMEmojiableBtn.m index d090539..6fd7d0d 100644 --- a/Pod/Classes/EMEmojiableBtn.m +++ b/Pod/Classes/EMEmojiableBtn.m @@ -13,7 +13,7 @@ @interface EMEmojiableBtn() @property (nonatomic,strong) EMEmojiableBtnConfig *config; @property (strong,nonatomic) UIView *selectorBgView; @property (strong,nonatomic) UIView *optionsView; -@property (strong,nonatomic) EMEmojiableInformationView *informationView; +@property (strong,nonatomic) EMEmojiableInformationView *informationView; @property (strong,nonatomic) UITapGestureRecognizer *singleTapGesture; @property (strong,nonatomic) UILongPressGestureRecognizer *longPressGesture; @property (assign,nonatomic) BOOL active; @@ -83,7 +83,7 @@ - (void)activate{ return; } if(_dataset == nil){ - [NSException raise:@"Invalid _dataset value" format:@"_dataset can't be nil", _dataset]; + [NSException raise:@"Invalid _dataset value" format:@"_dataset can't be nil"]; return; } diff --git a/Pod/Classes/EMEmojiableBtnConfig.h b/Pod/Classes/EMEmojiableBtnConfig.h index 434a45f..56a7505 100644 --- a/Pod/Classes/EMEmojiableBtnConfig.h +++ b/Pod/Classes/EMEmojiableBtnConfig.h @@ -83,7 +83,7 @@ /** Font of information view */ -@property (assign,nonatomic) UIFont* informationViewFont; +@property (strong,nonatomic) UIFont* informationViewFont; /** Text color of information view diff --git a/Pod/Classes/EMEmojiableInformationView.h b/Pod/Classes/EMEmojiableInformationView.h index 28197d4..c19af3d 100644 --- a/Pod/Classes/EMEmojiableInformationView.h +++ b/Pod/Classes/EMEmojiableInformationView.h @@ -7,7 +7,7 @@ // #import -#import "EMEmojiableBtnConfig.h"; +#import "EMEmojiableBtnConfig.h" @interface EMEmojiableInformationView : UIView - (instancetype)initWithFrame:(CGRect)frame withConfig:(EMEmojiableBtnConfig*)config;