Commit 19b411a1 authored by 汪洋's avatar 汪洋

Merge branch 'master' of git.gengmei.cc:gengmeiios/GMPhobos

parents c0b9b416 e932e0dd
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "GMPhobos" s.name = "GMPhobos"
s.version = "0.2.8" s.version = "0.2.9"
s.summary = "GM statistic data sdk" s.summary = "GM statistic data sdk"
s.description = <<-DESC s.description = <<-DESC
......
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
- (void)setUserId:(NSInteger)userId; - (void)setUserId:(NSInteger)userId;
/*! /*!
* @author zhaiguojun, 16-05-30 * @author zhaiguojun, 16-05-31
* *
* @brief 用户当前的城市id * @brief 用户当前的城市id
* *
* @param currentCityId * @param currentCityId
* *
* @since 0.2.5 * @since 0.2.7
*/ */
- (void)setCurrentCityId:(NSString *)currentCityId; - (void)setCurrentCityId:(NSString *)currentCityId;
......
...@@ -3,62 +3,39 @@ ...@@ -3,62 +3,39 @@
<testsuite name="fastlane.lanes"> <testsuite name="fastlane.lanes">
<testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000573"> <testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000871">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.000312"> <testcase classname="fastlane.lanes" name="1: default_platform" time="0.000305">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="2: Switch to ios do_release lane" time="0.000341"> <testcase classname="fastlane.lanes" name="2: Switch to ios do_release lane" time="0.000408">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="3: git_pull" time="1.062873"> <testcase classname="fastlane.lanes" name="3: git_pull" time="2.396995">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="4: ensure_git_branch" time="0.011428"> <testcase classname="fastlane.lanes" name="4: ensure_git_branch" time="0.018778">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="5: pod_install" time="2.703119"> <testcase classname="fastlane.lanes" name="5: pod_install" time="23.128242">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="6: pod_lib_lint" time="6.907513"> <testcase classname="fastlane.lanes" name="6: pod_lib_lint" time="0.001267">
</testcase> <failure message="/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/actions/actions_helper.rb:33:in `execute_action'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:162:in `block in execute_action'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:161:in `chdir'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:161:in `execute_action'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:109:in `trigger_action_by_name'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/fast_file.rb:140:in `method_missing'&#10;../../fastfile/pod_fastfile:20:in `block (2 levels) in parsing_binding'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:138:in `try_switch_to_lane'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:101:in `rescue in trigger_action_by_name'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:96:in `trigger_action_by_name'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/fast_file.rb:140:in `method_missing'&#10;Fastfile:8:in `block (2 levels) in parsing_binding'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:50:in `block in execute'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:46:in `chdir'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:46:in `execute'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/lane_manager.rb:46:in `cruise_lane'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/command_line_handler.rb:30:in `handle'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/commands_generator.rb:42:in `block (2 levels) in run'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/commander-4.3.5/lib/commander/command.rb:178:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/commander-4.3.5/lib/commander/command.rb:178:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/commander-4.3.5/lib/commander/command.rb:153:in `run'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/commander-4.3.5/lib/commander/runner.rb:428:in `run_active_command'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane_core-0.48.1/lib/fastlane_core/ui/fastlane_runner.rb:26:in `run!'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/commander-4.3.5/lib/commander/delegates.rb:15:in `run!'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/commands_generator.rb:159:in `run'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/commands_generator.rb:13:in `start'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/cli_tools_distributor.rb:47:in `take_off'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/bin/fastlane:5:in `&lt;top (required)&gt;'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/bin/fastlane:23:in `load'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/bin/fastlane:23:in `&lt;main&gt;'&#10;&#10;Could not find option 'use_libraries' in the list of available options: use_bundle_exec, verbose, allow_warnings, sources" />
<testcase classname="fastlane.lanes" name="7: version_bump_podspec" time="0.00128">
</testcase>
<testcase classname="fastlane.lanes" name="8: git_commit_all" time="0.029593">
</testcase>
<testcase classname="fastlane.lanes" name="9: add_git_tag" time="0.016019">
</testcase>
<testcase classname="fastlane.lanes" name="10: push_to_git_remote" time="1.144163">
</testcase>
<testcase classname="fastlane.lanes" name="11: pod_push" time="9.974637">
</testcase> </testcase>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment