Merge pull request #37 from BranchMetrics/fix-patches

Fix patches

Author: jdee

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fastlane-plugin-branch (0.5.0)
+    fastlane-plugin-branch (0.5.1)
       fastlane-plugin-patch
       plist
       xcodeproj
@@ -10,7 +10,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    activesupport (4.2.9)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -49,9 +49,9 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.2.0)
+    cocoapods-trunk (1.3.0)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
+      netrc (~> 0.11)
     cocoapods-try (1.1.0)
     coderay (1.1.2)
     colored (1.2)
@@ -75,7 +75,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.58.0)
+    fastlane (2.60.1)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -108,7 +108,7 @@ GEM
       xcodeproj (>= 1.5.0, < 2.0.0)
       xcpretty (>= 0.2.4, < 1.0.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-patch (0.3.0)
+    fastlane-plugin-patch (0.4.0)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.0.3)
@@ -139,7 +139,7 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     memoist (0.16.0)
-    method_source (0.8.2)
+    method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
@@ -151,16 +151,16 @@ GEM
     multipart-post (2.0.0)
     nanaimo (0.2.3)
     nap (1.1.0)
-    netrc (0.7.8)
+    netrc (0.11.0)
     os (0.9.6)
     parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     plist (3.3.0)
     powerpack (0.1.1)
-    pry (0.11.0)
+    pry (0.11.1)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
+      method_source (~> 0.9.0)
     public_suffix (2.0.5)
     rainbow (2.2.2)
       rake
@@ -193,7 +193,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-macho (1.1.0)
-    ruby-progressbar (1.8.3)
+    ruby-progressbar (1.9.0)
     rubyzip (1.2.1)
     security (0.1.3)
     signet (0.7.3)
@@ -220,7 +220,7 @@ GEM
     unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.1)
+    xcodeproj (1.5.2)
       CFPropertyList (~> 2.3.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)

lib/fastlane/plugin/branch/helper/ios_helper.rb

@@ -371,7 +371,7 @@ def patch_app_delegate_swift(project)
 
         Actions::PatchAction.run(
           files: app_delegate_swift_path,
-          regexp: /didFinishLaunchingWithOptions.*\{[^\n]*\n/m,
+          regexp: /didFinishLaunchingWithOptions.*?\{[^\n]*\n/m,
           text: init_session_text,
           mode: :append,
           offset: 0
@@ -432,7 +432,7 @@ def patch_app_delegate_objc(project)
 
         Actions::PatchAction.run(
           files: app_delegate_objc_path,
-          regexp: /didFinishLaunchingWithOptions.*\{[^\n]*\n/m,
+          regexp: /didFinishLaunchingWithOptions.*?\{[^\n]*\n/m,
           text: init_session_text,
           mode: :append,
           offset: 0
@@ -473,8 +473,8 @@ def patch_podfile(podfile_path)
         # TODO: Improve this patch. Should work in the majority of cases for now.
         Actions::PatchAction.run(
           files: podfile_path,
-          regexp: /^\s*pod\s*/,
-          text: "\npod \"Branch\"",
+          regexp: /^(\s*)pod\s*/,
+          text: "\n\\1pod \"Branch\"\n",
           mode: :prepend,
           offset: 0
         )

lib/fastlane/plugin/branch/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Branch
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end