removed rootProject presence from the settings.gradle parsing, regard…

…ing #128
cesarferreira · Aug 7, 2019 · a3818f5 · a3818f5
1 parent 8d53eca
commit a3818f5
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 40 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,48 +1,48 @@
 PATH
   remote: .
   specs:
-    dryrun (1.1.6)
-      bundler (>= 1.16)
-      colorize (>= 0.8)
-      highline (>= 1.7)
-      oga (>= 2.15)
-      rjb (>= 1.5)
+    dryrun (1.2.0)
+      bundler
+      colorize
+      highline
+      oga
+      rjb
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
     ast (2.4.0)
-    byebug (10.0.2)
+    byebug (11.0.1)
     coderay (1.1.2)
     colorize (0.8.1)
     diff-lcs (1.3)
-    highline (1.7.10)
-    method_source (0.9.0)
+    highline (2.0.2)
+    method_source (0.9.2)
     oga (2.15)
       ast
       ruby-ll (~> 2.1)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    rake (12.3.1)
-    rjb (1.5.5)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (12.3.3)
+    rjb (1.6.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
     ruby-ll (2.1.2)
       ansi
       ast
@@ -52,9 +52,9 @@ PLATFORMS
 
 DEPENDENCIES
   dryrun!
-  pry-byebug (>= 3.6)
-  rake (>= 12.3)
-  rspec (>= 3.7)
+  pry-byebug
+  rake
+  rspec
 
 BUNDLED WITH
-   1.16.1
+   2.0.2
diff --git a/dryrun.gemspec b/dryrun.gemspec
@@ -23,15 +23,15 @@ Gem::Specification.new do |s|
   s.require_paths << 'lib'
   s.executables   << 'dryrun'
 
-  s.required_ruby_version = '>= 2.0.0'
+  # s.required_ruby_version = '>= 2.0.0'
 
-  s.add_development_dependency 'rake', '>= 12.3'
-  s.add_development_dependency 'pry-byebug', '>= 3.6'
-  s.add_development_dependency 'rspec', '>= 3.7'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency 'rspec'
 
-  s.add_dependency 'bundler', '>= 1.16'
-  s.add_dependency 'colorize', '>= 0.8'
-  s.add_dependency 'oga', '>= 2.15'
-  s.add_dependency 'highline', '>= 1.7'
-  s.add_dependency 'rjb', '>= 1.5'
+  s.add_dependency 'bundler'
+  s.add_dependency 'colorize'
+  s.add_dependency 'oga'
+  s.add_dependency 'highline'
+  s.add_dependency 'rjb'
 end
diff --git a/lib/dryrun/android_project.rb b/lib/dryrun/android_project.rb
@@ -14,7 +14,6 @@ def initialize(path, custom_app_path, custom_module, flavour, device)
       @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
 
@@ -81,7 +80,10 @@ def find_modules
       return [] unless valid?
 
       content = File.open(@settings_gradle_path, 'rb').read
+
+      content = content.split(/\n/).delete_if { |x| x.start_with?("rootProject")}.join("\n")
       modules = content.scan(/'([^']*)'/)
+
       modules.each {|replacement| replacement.first.tr!(':', '')}
     end
 

diff --git a/lib/dryrun/version.rb b/lib/dryrun/version.rb
@@ -1,3 +1,3 @@
 module Dryrun
-  VERSION = '1.1.6'.freeze
+  VERSION = '1.2.0'.freeze
 end