Skip to content

Commit

Permalink
0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Eke committed Apr 4, 2016
2 parents e765fee + 60697eb commit e786fad
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 16 deletions.
29 changes: 20 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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=""
2 changes: 1 addition & 1 deletion EMEmojiableBtn.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions Example/EMEmojiableBtn.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions Pod/Classes/EMEmojiableBtn.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
@protocol EMEmojiableBtnDelegate;
@interface EMEmojiableBtn : UIButton
@property (strong,nonatomic) NSArray * _Nonnull dataset;
@property (weak,readwrite) id <EMEmojiableBtnDelegate> delegate;
@property (weak,readwrite) id <EMEmojiableBtnDelegate> _Nullable delegate;

- (instancetype)initWithFrame:(CGRect)frame withConfig:(EMEmojiableBtnConfig*)conf;
- (instancetype _Nonnull)initWithFrame:(CGRect)frame withConfig:(EMEmojiableBtnConfig* _Nonnull)conf;
@end

@protocol EMEmojiableBtnDelegate <NSObject>
Expand Down
4 changes: 2 additions & 2 deletions Pod/Classes/EMEmojiableBtn.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/EMEmojiableBtnConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
/**
Font of information view
*/
@property (assign,nonatomic) UIFont* informationViewFont;
@property (strong,nonatomic) UIFont* informationViewFont;

/**
Text color of information view
Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/EMEmojiableInformationView.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <UIKit/UIKit.h>
#import "EMEmojiableBtnConfig.h";
#import "EMEmojiableBtnConfig.h"

@interface EMEmojiableInformationView : UIView
- (instancetype)initWithFrame:(CGRect)frame withConfig:(EMEmojiableBtnConfig*)config;
Expand Down

0 comments on commit e786fad

Please sign in to comment.