升级Phobos

Example/Podfile.lock

@@ -28,7 +28,11 @@ PODS:
   - GMLibrary/Network (0.0.1):
     - AFNetworking (~> 2.6.1)
     - GMLibrary/Cache (~> 0.0.1)
+<<<<<<< HEAD
   - GMPhobos (0.1.5):
+=======
+  - GMPhobos (0.1.4):
+>>>>>>> 8d05d5bee85c819788f7cd52bcfc3da2a88d0212
     - GMLibrary (~> 0.0.1)
   - TMCache (2.1.0)
 
@@ -37,12 +41,16 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   GMPhobos:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
   GMLibrary: c31039ad32bc93f866d6c3052c20acb8cf9c1568
+<<<<<<< HEAD
   GMPhobos: 0eb71964e6d28ca2fc20a25d4b8a6f07efb671c6
+=======
+  GMPhobos: 3f04110df4b8dec487ed63622ffd7c4ac8b4342e
+>>>>>>> 8d05d5bee85c819788f7cd52bcfc3da2a88d0212
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
 
 COCOAPODS: 0.39.0

Example/Pods/Local Podspecs/GMPhobos.podspec.json

 {
   "name": "GMPhobos",
+<<<<<<< HEAD
   "version": "0.1.5",
+=======
+  "version": "0.1.4",
+>>>>>>> 8d05d5bee85c819788f7cd52bcfc3da2a88d0212
   "summary": "GM statistic data sdk",
   "description": "GM event track sdk.",
   "homepage": "http://git.gengmei.cc/gengmeiios/GMPhobos",

Example/Pods/Manifest.lock

@@ -28,7 +28,11 @@ PODS:
   - GMLibrary/Network (0.0.1):
     - AFNetworking (~> 2.6.1)
     - GMLibrary/Cache (~> 0.0.1)
+<<<<<<< HEAD
   - GMPhobos (0.1.5):
+=======
+  - GMPhobos (0.1.4):
+>>>>>>> 8d05d5bee85c819788f7cd52bcfc3da2a88d0212
     - GMLibrary (~> 0.0.1)
   - TMCache (2.1.0)
 
@@ -37,12 +41,16 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   GMPhobos:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
   GMLibrary: c31039ad32bc93f866d6c3052c20acb8cf9c1568
+<<<<<<< HEAD
   GMPhobos: 0eb71964e6d28ca2fc20a25d4b8a6f07efb671c6
+=======
+  GMPhobos: 3f04110df4b8dec487ed63622ffd7c4ac8b4342e
+>>>>>>> 8d05d5bee85c819788f7cd52bcfc3da2a88d0212
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
 
 COCOAPODS: 0.39.0

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/GMPhobos.xcscheme

@@ -14,7 +14,11 @@
             buildForArchiving = "YES">
             <BuildableReference
                BuildableIdentifier = 'primary'
+<<<<<<< HEAD
                BlueprintIdentifier = 'A0184FDB9661D13765F66F69'
+=======
+               BlueprintIdentifier = '3C48763BA0F1BEE38DC657E0'
+>>>>>>> 8d05d5bee85c819788f7cd52bcfc3da2a88d0212
                BlueprintName = 'GMPhobos'
                ReferencedContainer = 'container:Pods.xcodeproj'
                BuildableName = 'GMPhobos.framework'>

Example/Pods/Target Support Files/GMPhobos/Info.plist

@@ -15,7 +15,11 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
+<<<<<<< HEAD
   <string>0.1.5</string>
+=======
+  <string>0.1.4</string>
+>>>>>>> 8d05d5bee85c819788f7cd52bcfc3da2a88d0212
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

fastlane/Appfile

+app_identifier "org.cocoapods.demo.GMPhobos-Example" # The bundle identifier of your app
+apple_id "wanmeizhensuo@gmail.com" # Your Apple email address
+
+team_id "86R4V3XFLU"  # Developer Portal Team ID
+
+# you can even provide different app identifiers, Apple IDs and team names per lane:
+# More information: https://github.com/fastlane/fastlane/blob/master/docs/Appfile.md

fastlane/Fastfile

+# Customise this file, documentation can be found here:
+# https://github.com/fastlane/fastlane/tree/master/docs
+# All available actions: https://github.com/fastlane/fastlane/blob/master/docs/Actions.md
+# can also be listed using the `fastlane actions` command
+
+# Change the syntax highlighting to Ruby
+# All lines starting with a # are ignored when running `fastlane`
+
+# By default, fastlane will send which actions are used
+# No personal data is shared, more information on https://github.com/fastlane/enhancer
+# Uncomment the following line to opt out
+# opt_out_usage
+
+# If you want to automatically update fastlane if a new version is available:
+# update_fastlane
+
+# This is the minimum version number required.
+# Update this, if you use features of a newer version
+fastlane_version "1.64.0"
+
+default_platform :ios
+
+platform :ios do
+  before_all do
+    
+  end
+
+  desc "Runs all the tests"
+  lane :test do
+    scan
+  end
+  
+  desc "Release new version"
+  lane :release do |options|
+    target_version = options[:version]
+    raise "The version is missed." if target_version.nil?
+    ensure_git_branch                                             # 确认 master 分支
+    ensure_git_status_clean                                       # 确认没有未提交的文件
+    #scan                                                          # 运行测试
+
+    #sync_build_number_to_git                                      # 将 build 号设为 git commit 数
+    #increment_version_number(version_number: target_version)      # 设置版本号
+    
+    pod_install
+    pod_lint(verbose: true, allow_warnings: true, sources: ["git@git.gengmei.cc:gengmeiios/GMSpecs.git","https://github.com/CocoaPods/Specs"])
+    version_bump_podspec(path: "GMPhobos.podspec", version_number: target_version)                    # 更新 podspec
+    git_commit_all(message: "Bump version to #{target_version}")  # 提交版本号修改
+    add_git_tag tag: target_version                               # 设置 tag
+    push_to_git_remote                                            # 推送到 git 仓库
+    pod_push(path: "GMPhobos.podspec", repo: "GMSpecs", allow_warnings: true, sources: ["git@git.gengmei.cc:gengmeiios/GMSpecs.git","https://github.com/CocoaPods/Specs"]) # 提交到 CocoaPods                                                     
+  end
+	
+end
+
+# More information about multiple platforms in fastlane: https://github.com/fastlane/fastlane/blob/master/docs/Platforms.md
+# All available actions: https://github.com/fastlane/fastlane/blob/master/docs/Actions.md

fastlane/README.md

+fastlane documentation
+================
+# Installation
+```
+sudo gem install fastlane
+```
+# Available Actions
+## iOS
+### ios test
+```
+fastlane ios test
+```
+Runs all the tests
+### ios release
+```
+fastlane ios release
+```
+Release new version
+
+----
+
+This README.md is auto-generated and will be re-generated every time to run [fastlane](https://fastlane.tools).  
+More information about fastlane can be found on [https://fastlane.tools](https://fastlane.tools).  
+The documentation of fastlane can be found on [GitHub](https://github.com/fastlane/fastlane).
\ No newline at end of file

fastlane/actions/git_commit_all.rb

+module Fastlane
+  module Actions
+    class GitCommitAllAction < Action
+      def self.run(params)
+          Actions.sh "git commit -am \"#{params[:message]}\""
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Commit all unsaved changes to git."
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :message,
+                                       env_name: "FL_GIT_COMMIT_ALL",
+                                       description: "The git message for the commit",
+                                       is_string: true)
+        ]
+      end
+
+      def self.authors
+        # So no one will ever forget your contribution to fastlane :) You are awesome btw!
+        ["thierry"]
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

fastlane/actions/pod_install.rb

+module Fastlane
+  module Actions
+    class PodInstallAction < Action
+      def self.run(params)
+      	Actions.sh "cd Example && pod install"
+        Helper.log.info "Successfully pod install ⬆️ ".green
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Update all pods"
+      end
+
+      def self.details
+        "Update all pods"
+      end
+
+      def self.authors
+        ["thierry"]
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

fastlane/actions/pod_lint.rb

+module Fastlane
+  module Actions
+    class PodLintAction < Action
+      def self.run(params)
+        command = "pod lib lint"
+
+        if params[:verbose]
+          command << " --verbose"
+        end
+
+        if params[:sources]
+          sources = params[:sources].join(",")
+          command << " --sources='#{sources}'"
+        end
+
+        if params[:allow_warnings]
+          command << " --allow-warnings"
+        end
+
+        result = Actions.sh("#{command}")
+        Helper.log.info "Successfully pod lint ⬆️ ".green
+        return result
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Pod lint"
+      end
+
+      def self.details
+        ""
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :verbose,
+                                       description: "Allow ouput detail in console",
+                                       optional: true,
+                                       is_string: false),
+          FastlaneCore::ConfigItem.new(key: :allow_warnings,
+                                       description: "Allow warnings during pod push",
+                                       optional: true,
+                                       is_string: false),
+          FastlaneCore::ConfigItem.new(key: :sources,
+                                       description: "The sources of repos you want the pod spec to lint with, separated by commas",
+                                       optional: true,
+                                       is_string: false,
+                                       verify_block: proc do |value|
+                                         raise "Sources must be an array.".red unless value.kind_of?(Array)
+                                       end)
+        ]
+      end
+
+      def self.output
+      end
+
+      def self.return_value
+        nil
+      end
+
+      def self.authors
+        ["thierry"]
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end
\ No newline at end of file

fastlane/actions/sync_build_number_to_git.rb

+module Fastlane
+  module Actions
+    module SharedValues
+      BUILD_NUMBER = :BUILD_NUMBER
+    end
+    class SyncBuildNumberToGitAction < Action
+      def self.is_git?
+        Actions.sh 'git rev-parse HEAD'
+        return true
+      rescue
+        return false
+      end
+        
+      def self.run(params)
+        if is_git?
+          command = 'git rev-list HEAD --count'
+        else
+          raise "Not in a git repository."
+        end
+      build_number = (Actions.sh command).strip
+      Fastlane::Actions::IncrementBuildNumberAction.run(build_number: build_number)
+      Actions.lane_context[SharedValues::BUILD_NUMBER] = build_number
+      end
+
+      def self.output
+        [
+          ['BUILD_NUMBER', 'The new build number']
+        ]
+      end
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Set the build version of your project to the same number of your total git commit count"
+      end
+
+      def self.authors
+        ["thierry"]
+      end
+
+      def self.is_supported?(platform)
+        [:ios].include? platform
+      end
+    end
+  end
+end

fastlane/report.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+  <testsuite name="fastlane.lanes">
+    
+      
+      <testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000441">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.000312">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="2: increment_version_number" time="1.457714">
+        
+      </testcase>
+    
+  </testsuite>
+</testsuites>