fastlane-plugin-branch 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08822a6026ae8a7f5a990080ddc64e537713d705'
-  data.tar.gz: bd5ae339f360d756004bb6e746c46543c0ebf09a
+  metadata.gz: 67178b34c75cdf6f56ddcdbc87a9f359073a4211
+  data.tar.gz: b66e17dd55ab0ed2622bbaccaaa2cbc3bf1088a1
 SHA512:
-  metadata.gz: 4768a177e965e307358b31fba008a73f1f3b136a81585039372982331521a23c75f9d89d799c68ce44f89bad375d3d822d2d34b8c944f34660d7f581ef231b4d
-  data.tar.gz: 2bb0ba13f14c4121aec797867a7b1193cfc30a552bec22fd268ea1e0aba9dad5db35bef92b9c1a15d1bf0f20a15110f363dc96db63d3999c641ce1307ce03e14
+  metadata.gz: 3ca86d2e6c28bebdfd31923b8a8b8ffb3ebe238db18b81140879a859c5b12fe1d42815171c13af59f9bca104486b0f9b335ab0b54d7914c890fcd427a69381b6
+  data.tar.gz: 2e15566a9d67b1c22882e2f782b925d4100b5290cb13bdb7e62892e30497830ddaee5a4bd7d42c6855b52e4ea6c75d5595d7037478b97d4a877580284c0116f5

data/README.md

@@ -166,17 +166,60 @@ the project must also match the value of this parameter without regard to order.
 
 This action does not use the Branchfile.
 
-## Example
+## Examples
 
-Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. To try it:
+There is an example [Fastfile](./fastlane/Fastfile) in this repo that defines a number of
+example lanes. Be sure to run `bundle install` before trying any of the examples.
+
+### setup
+
+This lane sets up the BranchPluginExample projects
+in [examples/android/BranchPluginExample](./examples/android/BranchPluginExample) and
+[examples/ios/BranchPluginExample](./examples/ios/BranchPluginExample).
+The Xcode project uses CocoaPods and Swift.
+
+```bash
+bundle exec fastlane setup
+```
+
+### setup_and_commit
+
+This lane sets up the BranchPluginExample projects and also commits the results to git.
+
+```bash
+bundle exec fastlane setup
+```
+
+### setup_objc
+
+This lane sets up the BranchPluginExampleObjc project
+in [examples/ios/BranchPluginExampleObjc](./examples/ios/BranchPluginExampleObjc).
+The project uses CocoaPods and Objective-C.
 
 ```bash
-bundle exec fastlane validate         # The example project needs to be set up. This will fail.
-bundle exec fastlane setup            # Also validates the UL configuration.
-bundle exec fastlane setup_and_commit # Also commit changes to Git. (git reset --hard HEAD^ to erase the last commit)
-bundle exec fastlane validate         # Now validation will pass.
+bundle exec fastlane setup_objc
 ```
 
+### setup_carthage
+
+This lane sets up the BranchPluginExampleCarthage project
+in [examples/ios/BranchPluginExampleCarthage](./examples/ios/BranchPluginExampleCarthage).
+The project uses Carthage and Swift.
+
+```bash
+bundle exec fastlane setup_carthage
+```
+
+### validate
+
+This lane validates the Universal Link configuration for the BranchPluginExample
+project in [examples/ios/BranchPluginExample](./examples/ios/BranchPluginExample).
+
+```bash
+bundle exec fastlane validate
+```
+
+
 ## Run tests for this plugin
 
 To run both the tests, and code style validation, run

data/lib/fastlane/plugin/branch/actions/setup_branch_action.rb

@@ -289,7 +289,15 @@ module Fastlane
           target = helper.target_from_project project, params[:target]
           target.frameworks_build_phase.add_file_reference branch_framework
 
-          # 5. TODO: Add to copy-frameworks build phase
+          # 5. Add to copy-frameworks build phase
+          carthage_build_phase = target.build_phases.find do |phase|
+            phase.respond_to?(:shell_script) && phase.shell_script =~ /carthage\s+copy-frameworks/
+          end
+
+          if carthage_build_phase
+            carthage_build_phase.input_paths << "$(SRCROOT)/Carthage/Build/iOS/Branch.framework"
+            carthage_build_phase.output_paths << "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Branch.framework"
+          end
 
           # 6. Check if Carthage folder is under SCM
           carthage_folder_path = File.expand_path "../Carthage", cartfile_path

data/lib/fastlane/plugin/branch/helper/configuration_helper.rb

@@ -94,17 +94,9 @@ module Fastlane
           UI.user_error! "#{podfile_path} not found"
         end
 
-        xcodeproj_path = xcodeproj_path_from_params(params)
         # Look in the same directory as the project (typical setup)
-        podfile_path = File.expand_path "../Podfile", xcodeproj_path
+        podfile_path = File.expand_path "../Podfile", params[:xcodeproj]
         return podfile_path if File.exist? podfile_path
-
-        # Scan the repo. If one Podfile found, return it.
-        repo_path = Bundler.root
-
-        all_podfile_paths = Dir[File.expand_path(File.join(repo_path, '**/Podfile'))]
-        return nil unless all_podfile_paths.count == 1
-        all_podfile_paths.first
       end
 
       def cartfile_path_from_params(params)
@@ -119,17 +111,9 @@ module Fastlane
           UI.user_error! "#{cartfile_path} not found"
         end
 
-        xcodeproj_path = xcodeproj_path_from_params(params)
         # Look in the same directory as the project (typical setup)
-        cartfile_path = File.expand_path "../Cartfile", xcodeproj_path
+        cartfile_path = File.expand_path "../Cartfile", params[:xcodeproj]
         return cartfile_path if File.exist? cartfile_path
-
-        # Scan the repo. If one Cartfile found, return it.
-        repo_path = Bundler.root
-
-        all_cartfile_paths = Dir[File.expand_path(File.join(repo_path, '**/Cartfile'))]
-        return nil unless all_cartfile_paths.count == 1
-        all_cartfile_paths.first
       end
 
       def add_sdk?(params)

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

@@ -358,6 +358,10 @@ module Fastlane
 
         # TODO: This is Swift 3. Support other versions, esp. 4.
         init_session_text = <<-EOF
+        #if DEBUG
+            Branch.setUseTestBranchKey(true)
+        #endif
+
         Branch.getInstance().initSession(launchOptions: launchOptions) {
             universalObject, linkProperties, error in
 
@@ -416,6 +420,10 @@ module Fastlane
         )
 
         init_session_text = <<-EOF
+#ifdef DEBUG
+    [Branch setUseTestBranchKey:YES];
+#endif // DEBUG
+
     [[Branch getInstance] initSessionWithLaunchOptions:launchOptions
         andRegisterDeepLinkHandlerUsingBranchUniversalObject:^(BranchUniversalObject *universalObject, BranchLinkProperties *linkProperties, NSError *error){
         // TODO: Route Branch links

data/lib/fastlane/plugin/branch/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Branch
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-branch
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Branch