realityforge-buildr 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18706f32d591f5eee4b371e56f0e9ab2eae2faeab9e3b108c785727939c9089a
-  data.tar.gz: d27fbad9b2d4ec3a1965d15cfbde2ad56222f6f0569a574c280dfe59d5e23fa7
+  metadata.gz: 5c0826c776391d6468649d0f23a920dcc9d8d30e7b3c4f5974f94129f466da59
+  data.tar.gz: 755b410efcd9a99af87cf734c3acbfd8ec7dcab1234cb11ab43b65aef27df6a7
 SHA512:
-  metadata.gz: 408323c4e663adaa82994b3192a48def7380cf05aa4b6bf264617195141f7d1cb4875918d32a7bb8e6dea03a0b5c3a5e83f49739c27122dd58214ef23f63b08a
-  data.tar.gz: a06f1222cb77ec21ed799ab6655f4bfcb761fa150c4459e20710314e40500546b0e73faf980ce8c2089dfe1eda11cfccbdea7b9bc1fb4b9a04280104966f05b5
+  metadata.gz: 8f511c67d096605305c86991a25b8e26ab92566e9a7ca0a12ac33fc4a98f36ac8a52d379ad4e264242714b528e93508bbe0b5763b174fb75955d147a842adf5f
+  data.tar.gz: 9f1ce6d3788b0daae9d15b264a0f2a4c1ce7bd51c26d8630aaa53d9a24a1455708a05056eb3611f7269b1735c43abcd2b8f7a126a40ece2f497a40de8ee46de0

data/addon/buildr/top_level_generate_dir.rb

@@ -25,7 +25,7 @@ module Buildr
       include Extension
 
       before_define do |project|
-        project.layout[:target, :generated] = "generated"
+        project.layout[:target, :generated] = 'generated'
         project.clean { rm_rf project._(:target, :generated) }
       end
     end

data/lib/buildr/java/annotation_processor.rb

@@ -23,30 +23,32 @@ module Buildr
       end
 
       after_define do |project|
-        if project.compile.options.processor?
-          project.file(project._(:target, :generated, 'processors/main/java'))
-          project.compile.enhance do
-            mkdir_p project._(:target, :generated, 'processors/main/java')
+        if !!project.compile.options[:processor] || (project.compile.options[:processor].nil? && !(project.compile.options[:processor_path] || []).empty?)
+          path = project._(:target, :generated, 'processors/main/java')
+          f = project.file(path) do |t|
+            mkdir_p t.to_s
           end
+          project.compile.enhance([f])
           project.compile.options[:other] = [] unless project.compile.options[:other]
-          project.compile.options[:other] += ['-s', project._(:target, :generated, 'processors/main/java')]
-          project.iml.main_generated_source_directories << project._(:target, :generated, 'processors/main/java') if project.iml?
+          project.compile.options[:other] += ['-s', path]
+          project.iml.main_generated_source_directories << path if project.iml?
 
           project.clean do
-            rm_rf project._(:target, :generated, 'processors/main/java')
+            rm_rf path
           end
         end
-        if project.test.compile.options.processor?
-          project.file(project._(:target, :generated, 'processors/test/java'))
-          project.test.compile.enhance do
-            mkdir_p project._(:target, :generated, 'processors/test/java')
+        if !!project.test.compile.options[:processor] || (project.test.compile.options[:processor].nil? && !(project.test.compile.options[:processor_path] || []).empty?)
+          path = project._(:target, :generated, 'processors/test/java')
+          f = project.file(path) do |t|
+            mkdir_p t.to_s
           end
+          project.test.compile.enhance([f])
           project.test.compile.options[:other] = [] unless project.test.compile.options[:other]
-          project.test.compile.options[:other] += ['-s', project._(:target, :generated, 'processors/test/java')]
-          project.iml.test_generated_source_directories << project._(:target, :generated, 'processors/test/java') if project.iml?
+          project.test.compile.options[:other] += ['-s', path]
+          project.iml.test_generated_source_directories << path if project.iml?
 
           project.clean do
-            rm_rf project._(:target, :generated, 'processors/test/java')
+            rm_rf path
           end
         end
       end

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.5.10'.freeze
+  VERSION = '1.5.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake