lib/dryrun/android_project.rb in dryrun-0.7.5 vs lib/dryrun/android_project.rb in dryrun-0.7.6

@@ -9,11 +9,11 @@
   class AndroidProject
     def initialize(path, custom_app_path, custom_module, flavour, device)
 
       @custom_app_path = custom_app_path
       @custom_module = custom_module
-      @base_path = path
+      @base_path = @custom_app_path? File.join(path, @custom_app_path) : path
       @flavour = flavour
       @device = device
 
       @settings_gradle_path = settings_gradle_file
       @main_gradle_file = main_gradle_file
@@ -24,14 +24,17 @@
     end
 
     def check_custom_app_path
       return unless @custom_app_path
 
-      full_custom_path = File.join(@base_path, @custom_app_path)
+      full_custom_path = @base_path
       settings_path = settings_gradle_file(full_custom_path)
-      return unless is_valid(settings_path)
+      main_gradle_path = main_gradle_file(full_custom_path)
+      return unless is_valid(main_gradle_path)
 
       @settings_gradle_path = settings_path
+      @main_gradle_file = main_gradle_file
+
       @base_path = full_custom_path
     end
 
     def remove_local_properties
       Dir.chdir @base_path