Commit 5f5b3dba authored by 翟国钧's avatar 翟国钧

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

parents 584cb3c0 4f63e233
PODS:
- Base64nl (1.2)
- GMCache (0.1.0):
- GMCache (0.1.1):
- TMCache (~> 2.1.0)
- GMFoundation (0.0.2):
- Base64nl (= 1.2)
......@@ -11,7 +11,7 @@ PODS:
- SDWebImage (= 3.7.6)
- GMOCConstant (0.0.3)
- GMPhobos (0.2.18):
- GMCache (~> 0.1.0)
- GMCache (~> 0.1.1)
- GMKit
- Masonry (1.0.1)
- SDWebImage (3.7.6):
......@@ -28,15 +28,15 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc
GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
GMFoundation: 08b2e6e12c211ed37aa5dce3588f645a133b9165
GMKit: 04a30d67c6b5468f07c8d9f60d0f8b12dd90b162
GMOCConstant: 39371248b4d8d54929391bfcd2c5883776436c4b
GMPhobos: 4549142bc1d9ffdae74b4fd44e3a102ac718d62a
GMPhobos: ac60874d0176a4bf2d91f77e4cd59364e5617e50
Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df
SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
PODFILE CHECKSUM: ab2b5ff1dcd8a35fd02cced6c06c7f9477b82d69
PODFILE CHECKSUM: 3ee139e4c035fc28d4bc33c1d05695a40a3b0d43
COCOAPODS: 1.1.1
......@@ -19,7 +19,7 @@
"source_files": "Pod/Classes/**/*",
"dependencies": {
"GMCache": [
"~> 0.1.0"
"~> 0.1.1"
],
"GMKit": [
......
PODS:
- Base64nl (1.2)
- GMCache (0.1.0):
- GMCache (0.1.1):
- TMCache (~> 2.1.0)
- GMFoundation (0.0.2):
- Base64nl (= 1.2)
......@@ -11,7 +11,7 @@ PODS:
- SDWebImage (= 3.7.6)
- GMOCConstant (0.0.3)
- GMPhobos (0.2.18):
- GMCache (~> 0.1.0)
- GMCache (~> 0.1.1)
- GMKit
- Masonry (1.0.1)
- SDWebImage (3.7.6):
......@@ -28,15 +28,15 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc
GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
GMFoundation: 08b2e6e12c211ed37aa5dce3588f645a133b9165
GMKit: 04a30d67c6b5468f07c8d9f60d0f8b12dd90b162
GMOCConstant: 39371248b4d8d54929391bfcd2c5883776436c4b
GMPhobos: 4549142bc1d9ffdae74b4fd44e3a102ac718d62a
GMPhobos: ac60874d0176a4bf2d91f77e4cd59364e5617e50
Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df
SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
PODFILE CHECKSUM: ab2b5ff1dcd8a35fd02cced6c06c7f9477b82d69
PODFILE CHECKSUM: 3ee139e4c035fc28d4bc33c1d05695a40a3b0d43
COCOAPODS: 1.1.1
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = "GMPhobos"
s.version = "0.2.18"
s.version = "0.2.19"
s.summary = "GM statistic data sdk"
s.description = <<-DESC
......@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.source_files = 'Pod/Classes/**/*'
s.dependency 'GMCache','~> 0.1.0'
s.dependency 'GMCache','~> 0.1.1'
s.dependency 'GMKit'
s.library = 'z'
......
......@@ -3,77 +3,44 @@
<testsuite name="fastlane.lanes">
<testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.001126">
<testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000608">
</testcase>
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.00029">
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.00023">
</testcase>
<testcase classname="fastlane.lanes" name="2: import_from_git" time="0.515765">
<testcase classname="fastlane.lanes" name="2: import_from_git" time="0.634671">
</testcase>
<testcase classname="fastlane.lanes" name="3: hipchat" time="0.056666">
<testcase classname="fastlane.lanes" name="3: hipchat" time="0.052846">
</testcase>
<testcase classname="fastlane.lanes" name="4: git_pull" time="0.812655">
<testcase classname="fastlane.lanes" name="4: git_pull" time="1.289843">
</testcase>
<testcase classname="fastlane.lanes" name="5: ensure_git_branch" time="0.007399">
<testcase classname="fastlane.lanes" name="5: ensure_git_branch" time="0.006715">
</testcase>
<testcase classname="fastlane.lanes" name="6: pod_install" time="2.574528">
<testcase classname="fastlane.lanes" name="6: pod_install" time="4.002534">
</testcase>
<testcase classname="fastlane.lanes" name="7: pod_lib_lint" time="6.374423">
</testcase>
<testcase classname="fastlane.lanes" name="8: version_bump_podspec" time="0.001129">
</testcase>
<testcase classname="fastlane.lanes" name="9: git_commit_all" time="0.020312">
</testcase>
<testcase classname="fastlane.lanes" name="10: add_git_tag" time="0.013513">
</testcase>
<testcase classname="fastlane.lanes" name="11: push_to_git_remote" time="0.878544">
</testcase>
<testcase classname="fastlane.lanes" name="12: pod_push" time="15.675476">
</testcase>
<testcase classname="fastlane.lanes" name="13: pod_repo_update" time="1.214203">
<failure message="/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/actions/actions_helper.rb:33:in `execute_action'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/runner.rb:187:in `block in execute_action'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/runner.rb:186:in `chdir'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/runner.rb:186:in `execute_action'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/runner.rb:112:in `trigger_action_by_name'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/fast_file.rb:140:in `method_missing'&#10;../../../../../../var/folders/j6/yvgnw4_n0x74mjp36j7h7bjw0000gn/T/fl_clone20161031-47236-1n6g5lc/JaguarTemplate.git/fastlane/ios_fastfile:65:in `block (2 levels) in parsing_binding'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/runner.rb:49:in `block in execute'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/runner.rb:45:in `chdir'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/runner.rb:45:in `execute'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/lane_manager.rb:52:in `cruise_lane'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/command_line_handler.rb:30:in `handle'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/commands_generator.rb:49:in `block (2 levels) in run'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/commander-4.4.0/lib/commander/command.rb:178:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/commander-4.4.0/lib/commander/command.rb:153:in `run'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/commander-4.4.0/lib/commander/runner.rb:444:in `run_active_command'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane_core-0.53.0/lib/fastlane_core/ui/fastlane_runner.rb:38:in `run!'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/commander-4.4.0/lib/commander/delegates.rb:15:in `run!'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/commands_generator.rb:244:in `run'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/commands_generator.rb:20:in `start'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/lib/fastlane/cli_tools_distributor.rb:58:in `take_off'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/gems/fastlane-1.105.3/bin/fastlane:5:in `&lt;top (required)&gt;'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/bin/fastlane:23:in `load'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/bin/fastlane:23:in `&lt;main&gt;'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/bin/ruby_executable_hooks:15:in `eval'&#10;/Users/gengmei/.rvm/gems/ruby-2.3.0/bin/ruby_executable_hooks:15:in `&lt;main&gt;'&#10;&#10;Exit status of command 'pod repo update GMSpecs &amp;&amp; cd Example &amp;&amp; pod install' was 1 instead of 0.&#10;Updating spec repo `GMSpecs`&#10; $ /usr/bin/git -C /Users/gengmei/.cocoapods/repos/GMSpecs pull --ff-only&#10; Already up-to-date.&#10;Analyzing dependencies&#10;Fetching podspec for `GMPhobos` from `../`&#10;[!] Unable to satisfy the following requirements:&#10;&#10;- `GMCache (= 0.1.0)` required by `Podfile.lock`&#10;- `GMCache (~&gt; 0.1.1)` required by `GMPhobos (0.2.18)`&#10;&#10;It seems like you've changed the constraints of dependency `GMCache` inside your development pod `GMPhobos`.&#10;You should run `pod update GMCache` to apply changes you've made.&#10;" />
</testcase>
<testcase classname="fastlane.lanes" name="14: hipchat" time="0.046295">
<testcase classname="fastlane.lanes" name="7: hipchat" time="0.049595">
</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