dryrun 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a25899585b455629a49419b2f070f0ac0176c551f1e651c6bc666d9a59731c1b
-  data.tar.gz: fa0d00714904f823f2f37247078d66a819991d239c3c1aadff94fcaf38d2b1c4
+  metadata.gz: 85a4e602a0ecb72cc5f99b1faea818f4878b016a244f5d5a41b1f30007ba4876
+  data.tar.gz: 2438ea1f188a047f7bda8f66e1fab3921d039238d0c33e922729fbf033be27e0
 SHA512:
-  metadata.gz: e06e673360b53ffbd7e48a8f49d8ba7ef4af52a3345a6fbe47ec5d85512e9a87b6f05411a79697d61dbd6e716e11dd78d501c012770275e154102f98c0121c0f
-  data.tar.gz: 74fb51419e6d65657ececbfb8baf74dc1d2d0e5e20f9f05316a3a66636c018185fcb21732f0c4a2d1e60d7908ec4c4b7c8149a7be060478dcfb08f3b24032e7a
+  metadata.gz: 6ba477d9e8ea4a5a238f001abdd4dd8ebaaafb954a16aecb113aef3e58ebe7d36bb6cf9e7a343d10c5bda4ddcacf48d4b057c7594483060f326b973615ca4e82
+  data.tar.gz: 2f04666d5ec0014c8c062768b3e1f91ad4362e85231d1c440d59b0b0d104550fa480cf227e3a681ae83dd3c3e05db9dd6f248116a338115432ada73bcd117e47

data/lib/dryrun/android_project.rb

@@ -14,6 +14,7 @@ module Dryrun
       @base_path = @custom_app_path ? File.join(path, @custom_app_path) : path
       @flavour = flavour
       @device = device
+      @gradle_file_extension = gradle_file_extension
       @settings_gradle_path = settings_gradle_file
       @main_gradle_file = main_gradle_file
 
@@ -22,6 +23,14 @@ module Dryrun
       @modules = find_modules
     end
 
+    def gradle_file_extension
+      gradle_file = File.join(@base_path, 'settings.gradle.kts')
+      if (File.exist?(gradle_file))
+        return ".gradle.kts"
+      end
+      ".gradle"
+    end
+
     def check_custom_app_path
       return unless @custom_app_path
 
@@ -49,7 +58,7 @@ module Dryrun
       # Open temporary file
       tmp = Tempfile.new('extract')
 
-      file = "#{@path_to_sample}/build.gradle"
+      file = "#{@path_to_sample}/build#{@gradle_file_extension}"
 
       # Write good lines to temporary file
       File.open(file, 'r') do |f|
@@ -64,11 +73,11 @@ module Dryrun
     end
 
     def settings_gradle_file(path = @base_path)
-      File.join(path, 'settings.gradle')
+      File.join(path, "settings#{@gradle_file_extension}")
     end
 
     def main_gradle_file(path = @base_path)
-      File.join(path, 'build.gradle')
+      File.join(path, "build#{@gradle_file_extension}")
     end
 
     def valid?(main_gradle_file = @main_gradle_file)
@@ -81,8 +90,8 @@ module Dryrun
 
       content = File.open(@settings_gradle_path, 'rb').read
       
-      content = content.split(/\n/).delete_if { |x| x.start_with?("rootProject")}.join("\n")
-      modules = content.scan(/'([^']*)'/)
+      content = content.split(/\n/).delete_if { |x| !x.start_with?("include")}.join("\n")
+      modules = content.scan(/'([^']*)'/) + content.scan(/\"([^"]*)\"/)
       
       modules.each {|replacement| replacement.first.tr!(':', '')}
     end

data/lib/dryrun/version.rb

@@ -1,3 +1,3 @@
 module Dryrun
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryrun
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - cesar ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake