realityforge-buildr 1.5.14 → 1.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d48d00ff2c45664c2dee85712e4c8014d1015519e3cf24fca25428c5cb2232
-  data.tar.gz: 0de204d07f99d6bb57b4e7d1ca68c44e22aeecac0e84ed4c4eb35ab4f454412d
+  metadata.gz: d8fa34dd92a2579440a4004d0b4a90d43e0cba4302d19e2f7d983db46984123d
+  data.tar.gz: 1b3adb97db7e6bd180232bd89a97d177c3701423a37eee8711e1e14c6b87b00e
 SHA512:
-  metadata.gz: 117f3e4c4d92fd43da908c0a32b468c9eca92d6ca6a79817f8a27d70241da999d8999b6ed9d9af721f71cf8be81c467db02f8331530c16b1ed03ffb1316c27f4
-  data.tar.gz: 0a9f1a1a159a23bf386027068d7285510ea223838f5bda0e5482d2e596dbccdeb585250be197916ba4eb473174cc104771470b61a28738079e5eeccd238221c3
+  metadata.gz: 97881c109b09796e52353d719ba96ea0efc7277f5ce8f6f80c30e12109ebd202e6b97aae56f1833f3d09d12ec870cd906ac90183174d3b881b3903d5c638c385
+  data.tar.gz: 4ff07b06229fe1cbcdbf0e47028e8ac8758c408f0929a7a5397edf05d6653fb54866e433b5970f0acc14fe611b42ec0e100aa25aac0db639fe3d8975aa4ded88

data/addon/buildr/checkstyle.rb

@@ -220,7 +220,7 @@ module Buildr
           project.task('checkstyle:xml') do
             puts 'Checkstyle: Analyzing source code...'
             mkdir_p File.dirname(project.checkstyle.xml_output_file)
-            source_paths = project.checkstyle.complete_source_paths.select{|p| !p.start_with?(project._(:generated).to_s)}
+            source_paths = project.checkstyle.complete_source_paths.select{|p| !p.start_with?(project._(:target, :generated).to_s)}
             source_paths = source_paths.collect{|p|::Buildr::Util.relative_path(File.expand_path(p.to_s), project.base_dir)}
             Buildr::Checkstyle.checkstyle(project.checkstyle.configuration_file,
                                           project.checkstyle.format,

data/lib/buildr/ide/idea.rb

@@ -117,7 +117,7 @@ module Buildr #:nodoc:
 
       def create_component(name, attrs = {})
         target = StringIO.new
-        Builder::XmlMarkup.new(:target => target, :indent => 2).component({:name => name}.merge(attrs)) do |xml|
+        Builder::XmlMarkup.new(:target => target, :indent => 2).component({ :name => name }.merge(attrs)) do |xml|
           yield xml if block_given?
         end
         Buildr::IntellijIdea.new_document(target.string).root
@@ -219,7 +219,7 @@ module Buildr #:nodoc:
       end
 
       def annotation_paths
-        @annotation_paths ||= [buildr_project._(:source, :main, :annotations)].select {|p| File.exist?(p)}
+        @annotation_paths ||= [buildr_project._(:source, :main, :annotations)].select { |p| File.exist?(p) }
       end
 
       def main_source_directories
@@ -349,7 +349,7 @@ module Buildr #:nodoc:
         name = options[:name] || 'Web'
         default_webroots = {}
         default_webroots[buildr_project._(:source, :main, :webapp)] = '/' if File.exist?(buildr_project._(:source, :main, :webapp))
-        buildr_project.assets.paths.each {|p| default_webroots[p] = '/' }
+        buildr_project.assets.paths.each { |p| default_webroots[p] = '/' }
         webroots = options[:webroots] || default_webroots
         default_deployment_descriptors = []
         %w(web.xml sun-web.xml glassfish-web.xml jetty-web.xml geronimo-web.xml context.xml weblogic.xml jboss-deployment-structure.xml jboss-web.xml ibm-web-bnd.xml ibm-web-ext.xml ibm-web-ext-pme.xml).
@@ -375,7 +375,7 @@ module Buildr #:nodoc:
               end
             end
           end
-          default_enable_jsf = webroots.keys.any?{|webroot| File.exist?("#{webroot}/WEB-INF/faces-config.xml")}
+          default_enable_jsf = webroots.keys.any? { |webroot| File.exist?("#{webroot}/WEB-INF/faces-config.xml") }
           enable_jsf = options[:enable_jsf].nil? ? default_enable_jsf : options[:enable_jsf]
           enable_jsf = false if buildr_project.root_project.ipr? && buildr_project.root_project.ipr.version >= '13'
           f.facet(:type => 'jsf', :name => 'JSF') do |jsf|
@@ -404,8 +404,8 @@ module Buildr #:nodoc:
           provider = options[:provider_enabled]
         else
           provider = nil
-          {'org.hibernate.ejb.HibernatePersistence' => 'Hibernate',
-           'org.eclipse.persistence.jpa.PersistenceProvider' => 'EclipseLink'}.
+          { 'org.hibernate.ejb.HibernatePersistence' => 'Hibernate',
+            'org.eclipse.persistence.jpa.PersistenceProvider' => 'EclipseLink' }.
             each_pair do |match, candidate_provider|
             deployment_descriptors.each do |descriptor|
               if File.exist?(descriptor) && /#{Regexp.escape(match)}/ =~ IO.read(descriptor)
@@ -608,7 +608,7 @@ module Buildr #:nodoc:
         unless paths.empty?
           xml.tag!('annotation-paths') do |xml|
             paths.each do |path|
-              xml.root(:url=> file_path(path))
+              xml.root(:url => file_path(path))
             end
           end
         end
@@ -618,14 +618,14 @@ module Buildr #:nodoc:
         xml.content(:url => 'file://$MODULE_DIR$') do
           # Source folders
           [
-            {:dirs => (self.main_source_directories.dup - self.main_generated_source_directories)},
-            {:dirs => self.main_generated_source_directories, :generated => true},
-            {:type => 'resource', :dirs => (self.main_resource_directories.dup - self.main_generated_resource_directories)},
-            {:type => 'resource', :dirs => self.main_generated_resource_directories, :generated => true},
-            {:test => true, :dirs => (self.test_source_directories - self.test_generated_source_directories)},
-            {:test => true, :dirs => self.test_generated_source_directories, :generated => true},
-            {:test => true, :type => 'resource', :dirs => (self.test_resource_directories - self.test_generated_resource_directories)},
-            {:test => true, :type => 'resource', :dirs => self.test_generated_resource_directories, :generated => true},
+            { :dirs => (self.main_source_directories.dup - self.main_generated_source_directories) },
+            { :dirs => self.main_generated_source_directories, :generated => true },
+            { :type => 'resource', :dirs => (self.main_resource_directories.dup - self.main_generated_resource_directories) },
+            { :type => 'resource', :dirs => self.main_generated_resource_directories, :generated => true },
+            { :test => true, :dirs => (self.test_source_directories - self.test_generated_source_directories) },
+            { :test => true, :dirs => self.test_generated_source_directories, :generated => true },
+            { :test => true, :type => 'resource', :dirs => (self.test_resource_directories - self.test_generated_resource_directories) },
+            { :test => true, :type => 'resource', :dirs => self.test_generated_resource_directories, :generated => true },
           ].each do |content|
             content[:dirs].map { |dir| dir.to_s }.compact.sort.uniq.each do |dir|
               options = {}
@@ -658,14 +658,14 @@ module Buildr #:nodoc:
       end
 
       def generate_project_dependency(xml, other_project, export, test = false)
-        attribs = {:type => 'module', 'module-name' => other_project}
+        attribs = { :type => 'module', 'module-name' => other_project }
         attribs[:exported] = '' if export
         attribs[:scope] = 'TEST' if test
         xml.orderEntry attribs
       end
 
       def generate_module_lib(xml, path, export, source_path, annotations_path, test = false)
-        attribs = {:type => 'module-library'}
+        attribs = { :type => 'module-library' }
         attribs[:exported] = '' if export
         attribs[:scope] = 'TEST' if test
         xml.orderEntry attribs do
@@ -691,7 +691,7 @@ module Buildr #:nodoc:
         net = []
         all = self.excluded_directories.map { |dir| buildr_project._(dir.to_s) }.sort_by { |d| d.size }
         all.each_with_index do |dir, i|
-          unless all[0 ... i].find { |other| dir =~ /^#{other}/ }
+          unless all[0...i].find { |other| dir =~ /^#{other}/ }
             net << dir
           end
         end
@@ -725,6 +725,10 @@ module Buildr #:nodoc:
         @jdk_version ||= buildr_project.compile.options.source || '1.7'
       end
 
+      def compiler_configuration_options
+        @compiler_configuration_options ||= {}
+      end
+
       def nonnull_assertions?
         @nonnull_assertions.nil? ? true : !!@nonnull_assertions
       end
@@ -781,7 +785,7 @@ module Buildr #:nodoc:
 
       def add_postgres_data_source(name, options = {})
         if options[:url].nil? && options[:database]
-         default_url = "jdbc:postgresql://#{(options[:host] || '127.0.0.1')}:#{(options[:port] || '5432')}/#{options[:database]}"
+          default_url = "jdbc:postgresql://#{(options[:host] || '127.0.0.1')}:#{(options[:port] || '5432')}/#{options[:database]}"
         end
 
         params = {
@@ -901,7 +905,7 @@ module Buildr #:nodoc:
           }
           classpath = options[:classpath] || []
           xml.tag!('data-source', data_source_options) do |xml|
-            xml.tag!('synchronize', (options[:synchronize]||'true'))
+            xml.tag!('synchronize', (options[:synchronize] || 'true'))
             xml.tag!('jdbc-driver', options[:driver]) if options[:driver]
             xml.tag!('jdbc-url', options[:url]) if options[:url]
             xml.tag!('user-name', options[:username]) if options[:username]
@@ -1002,7 +1006,7 @@ module Buildr #:nodoc:
         end
       end
 
-      def add_exploded_ear_artifact(project, options ={})
+      def add_exploded_ear_artifact(project, options = {})
         artifact_name = to_artifact_name(project, options)
 
         add_artifact(artifact_name, 'exploded-ear', build_on_make(options)) do |xml|
@@ -1478,7 +1482,7 @@ module Buildr #:nodoc:
             buildr_project.projects.select { |subp| subp.iml? }.each do |subproject|
               module_path = subproject.base_dir.gsub(/^#{buildr_project.base_dir}\//, '')
               path = "#{module_path}/#{subproject.iml.name}.iml"
-              attribs = {:fileurl => "file://$PROJECT_DIR$/#{path}", :filepath => "$PROJECT_DIR$/#{path}"}
+              attribs = { :fileurl => "file://$PROJECT_DIR$/#{path}", :filepath => "$PROJECT_DIR$/#{path}" }
               if subproject.iml.group == true
                 attribs[:group] = subproject.parent.name.gsub(':', '/')
               elsif !subproject.iml.group.nil?
@@ -1528,7 +1532,7 @@ module Buildr #:nodoc:
       end
 
       def data_sources_component
-        create_composite_component('DataSourceManagerImpl', {:format => 'xml', :hash => '3208837817'}, self.data_sources)
+        create_composite_component('DataSourceManagerImpl', { :format => 'xml', :hash => '3208837817' }, self.data_sources)
       end
 
       def artifacts_component
@@ -1538,6 +1542,9 @@ module Buildr #:nodoc:
       def compiler_configuration_component
         lambda do
           create_component('CompilerConfiguration') do |component|
+            compiler_configuration_options.each_pair do |k, v|
+              component.option :name => k, :value => v
+            end
             component.addNotNullAssertions :enabled => 'false' unless nonnull_assertions?
             component.wildcardResourcePatterns do |xml|
               wildcard_resource_patterns.each do |pattern|
@@ -1554,8 +1561,8 @@ module Buildr #:nodoc:
               disabled = []
               Buildr.projects.each do |prj|
                 next unless prj.iml?
-                main_processor = !!prj.compile.options[:processor] || prj.compile.options[:processor].nil?
-                test_processor = !!prj.test.compile.options[:processor] || prj.test.compile.options[:processor].nil?
+                main_processor = !!prj.compile.options[:processor] || (prj.compile.options[:processor].nil? && !(prj.compile.options[:processor_path] || []).empty?)
+                test_processor = !!prj.test.compile.options[:processor] || (prj.test.compile.options[:processor].nil? && !(prj.test.compile.options[:processor_path] || []).empty?)
                 if main_processor || test_processor
                   xml.profile(:name => "#{prj.name}", :enabled => true) do
                     xml.sourceOutputDir :name => 'generated/processors/main/java' if main_processor
@@ -1597,7 +1604,7 @@ module Buildr #:nodoc:
         resolve_path_from_base(path, '$PROJECT_DIR$')
       end
 
-    private
+      private
 
       def default_code_sight_excludes
         %w(
@@ -1717,7 +1724,7 @@ module Buildr #:nodoc:
         ].compact
 
         files.each do |ideafile|
-          module_dir =  File.dirname(ideafile.filename)
+          module_dir = File.dirname(ideafile.filename)
           idea.enhance do |task|
             mkdir_p module_dir
             info "Writing #{ideafile.filename}"

data/lib/buildr/version.rb

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

metadata

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