realityforge-buildr 1.5.9 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aead139867720099e785867e129cdbd0ac5d7755c9aecaa82cad4ba79e8b703
-  data.tar.gz: e5b61d9c94ec8ca7cda8ca3583cf99223b9e47226a2a8c7e8bf4620521ee7eb4
+  metadata.gz: 18706f32d591f5eee4b371e56f0e9ab2eae2faeab9e3b108c785727939c9089a
+  data.tar.gz: d27fbad9b2d4ec3a1965d15cfbde2ad56222f6f0569a574c280dfe59d5e23fa7
 SHA512:
-  metadata.gz: d6f7cbf839087fd897e8cea08b42697a1cf5109eba3a77223c70db7e9a124f83e98c2627d411f5b8effad5e691cf2dfffedfc01ae2bf886e5d6d781eb688a49e
-  data.tar.gz: c23a3d5b5c4f8bc1996395405d83d059244cd9ed71b97a9fbc653eb05a42b7884e186c936017f561c5fd8b065b3bcb0ed0e7795f67410d6f3d048d0e482c934e
+  metadata.gz: 408323c4e663adaa82994b3192a48def7380cf05aa4b6bf264617195141f7d1cb4875918d32a7bb8e6dea03a0b5c3a5e83f49739c27122dd58214ef23f63b08a
+  data.tar.gz: a06f1222cb77ec21ed799ab6655f4bfcb761fa150c4459e20710314e40500546b0e73faf980ce8c2089dfe1eda11cfccbdea7b9bc1fb4b9a04280104966f05b5

data/addon/buildr/jacoco.rb

@@ -148,6 +148,9 @@ module Buildr
           options[:html_output_directory] = project._(:reports, :jacoco, 'docs')
 
           unless execution_files.empty?
+            FileUtils.mkdir_p File.dirname(options[:xml_output_file])
+            FileUtils.mkdir_p File.dirname(options[:csv_output_file])
+            FileUtils.mkdir_p options[:html_output_directory]
             Buildr::JaCoCo.jacoco_report(execution_files, class_paths, source_paths, options)
           end
         end

data/addon/buildr/shade.rb

@@ -0,0 +1,62 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Buildr
+  # Provides the shade method.
+  module Shade
+
+    class << self
+
+      # The specs for requirements
+      def dependencies
+        %w(
+          net.sourceforge.pmd:pmd-core:jar:6.11.0
+          net.sourceforge.pmd:pmd-java:jar:6.11.0
+          net.sourceforge.pmd:pmd-java8:jar:6.11.0
+          jaxen:jaxen:jar:1.1.6
+          commons-io:commons-io:jar:2.6
+          com.beust:jcommander:jar:1.72
+          org.ow2.asm:asm:jar:7.1
+          com.google.code.gson:gson:jar:2.8.5
+          net.java.dev.javacc:javacc:jar:5.0
+          net.sourceforge.saxon:saxon:jar:9.1.0.8
+          org.apache.commons:commons-lang3:jar:3.8.1
+          org.antlr:antlr4-runtime:jar:4.7
+        )
+      end
+
+      def shade(input_jar, output_jar, relocations = {})
+
+        shaded_jar = (input_jar.to_s + '-shaded')
+        a = Buildr.artifact('org.realityforge.shade:shade-cli:jar:1.0.0')
+        a.invoke
+
+        args = []
+        args << Java::Commands.path_to_bin('java')
+        args << '-jar'
+        args << a.to_s
+        args << '--input'
+        args << input_jar.to_s
+        args << '--output'
+        args << shaded_jar.to_s
+        relocations.each_pair do |k, v|
+          args << "-r#{k}#{v}"
+        end
+
+        sh args.join(' ')
+        FileUtils.mv shaded_jar, output_jar.to_s
+      end
+    end
+  end
+end

data/buildr.gemspec

@@ -35,12 +35,12 @@ for those one-off tasks, with a language that's a joy to use.
   TEXT
 
   spec.files          = Dir['{addon,bin,lib,rakelib,spec}/**/*', '*.{gemspec}'] +
-                        %w(LICENSE NOTICE CHANGELOG.md README.md Rakefile)
+                        %w(LICENSE NOTICE README.md Rakefile)
   spec.require_paths  = 'lib', 'addon'
   spec.bindir         = 'bin'
   spec.executable     = 'buildr'
 
-  spec.extra_rdoc_files = 'README.md', 'CHANGELOG.md', 'LICENSE', 'NOTICE'
+  spec.extra_rdoc_files = 'README.md', 'LICENSE', 'NOTICE'
   spec.rdoc_options     = '--title', 'Buildr', '--main', 'README.md',
                           '--webcvs', 'https://github.com/realityforge/buildr'
   spec.post_install_message = 'To get started run buildr --help'

data/lib/buildr.rb

@@ -65,6 +65,7 @@ require 'buildr/java/packaging'
 require 'buildr/java/commands'
 require 'buildr/java/doc'
 require 'buildr/java/custom_pom'
+require 'buildr/java/annotation_processor'
 require 'buildr/ide/idea'
 
 # Methods defined in Buildr are both instance methods (e.g. when included in Project)

data/lib/buildr/core/transports.rb

@@ -273,7 +273,7 @@ module URI
         headers['Cache-Control'] = 'no-cache'
         headers['User-Agent'] = "Buildr-#{Buildr::VERSION}"
         request = Net::HTTP::Get.new(request_uri.empty? ? '/' : request_uri, headers)
-        request.basic_auth URI.decode(self.user), URI.decode(self.password) if self.user
+        request.basic_auth CGI.unescape(self.user), CGI.unescape(self.password) if self.user
         http.verify_mode = ::OpenSSL::SSL.const_get(ENV['SSL_VERIFY_MODE']) if ENV['SSL_VERIFY_MODE']
         http.ca_path = ENV['SSL_CA_CERTS'] if ENV['SSL_CA_CERTS']
         http.request request do |response|
@@ -330,7 +330,7 @@ module URI
         end
         headers = { 'Content-MD5'=>Digest::MD5.hexdigest(content.string), 'Content-Type'=>'application/octet-stream', 'User-Agent'=>"Buildr-#{Buildr::VERSION}" }
         request = Net::HTTP::Put.new(request_uri.empty? ? '/' : request_uri, headers)
-        request.basic_auth URI.decode(self.user), URI.decode(self.password) if self.user
+        request.basic_auth CGI.unescape(self.user), CGI.unescape(self.password) if self.user
         response = nil
         with_progress_bar options[:progress], path.split('/').last, content.size do |progress|
           request.content_length = content.size

data/lib/buildr/ide/idea.rb

@@ -56,6 +56,12 @@ module Buildr #:nodoc:
         self.components << create_component(name, attrs, &xml)
       end
 
+      def add_component_in_lambda(name, attrs = {}, &xml)
+        self.components << lambda do
+          create_component(name, attrs, &xml)
+        end
+      end
+
       def add_component_from_file(filename)
         self.components << lambda do
           raise "Unable to locate file #{filename} adding component to idea file" unless File.exist?(filename)
@@ -719,6 +725,16 @@ module Buildr #:nodoc:
         @jdk_version ||= buildr_project.compile.options.source || '1.7'
       end
 
+      def nonnull_assertions?
+        @nonnull_assertions.nil? ? true : !!@nonnull_assertions
+      end
+
+      attr_writer :nonnull_assertions
+
+      def wildcard_resource_patterns
+        @wildcard_resource_patterns ||= %w(!?*.java !?*.form !?*.class !?*.groovy !?*.scala !?*.flex !?*.kt !?*.clj !?*.aj)
+      end
+
       def add_artifact(name, type, build_on_make = false)
         add_to_composite_component(self.artifacts) do |xml|
           xml.artifact(:name => name, :type => type, 'build-on-make' => build_on_make) do |xml|
@@ -793,7 +809,7 @@ module Buildr #:nodoc:
         }.merge(options)
 
         if params[:url]
-          if /jdbc\:jtds\:sqlserver\:\/\/[^:\\]+(\:\d+)?\/([^;]*)(\;.*)?/ =~ params[:url]
+          if /jdbc:jtds:sqlserver:\/\/[^:\\]+(:\d+)?\/([^;]*)(;.*)?/ =~ params[:url]
             database_name = $2
             params[:schema_pattern] = "#{database_name}.*"
             params[:default_schemas] = "#{database_name}.*"
@@ -803,6 +819,47 @@ module Buildr #:nodoc:
         add_data_source(name, params)
       end
 
+      def add_javac_settings(javac_args)
+        add_component('JavacSettings') do |xml|
+          xml.option(:name => 'ADDITIONAL_OPTIONS_STRING', :value => javac_args)
+        end
+      end
+
+      def add_code_insight_settings(options = {})
+        excluded_names = options[:excluded_names] || default_code_sight_excludes
+        excluded_names += (options[:extra_excluded_names] || [])
+        add_component('JavaProjectCodeInsightSettings') do |xml|
+          xml.tag!('excluded-names') do
+            excluded_names.each do |excluded_name|
+              xml << "<name>#{excluded_name}</name>"
+            end
+          end
+        end
+      end
+
+      def add_nullable_manager
+        add_component('NullableNotNullManager') do |component|
+          component.option :name => 'myDefaultNullable', :value => 'javax.annotation.Nullable'
+          component.option :name => 'myDefaultNotNull', :value => 'javax.annotation.Nonnull'
+          component.option :name => 'myNullables' do |option|
+            option.value do |value|
+              value.list :size => '2' do |list|
+                list.item :index => '0', :class => 'java.lang.String', :itemvalue => 'org.jetbrains.annotations.Nullable'
+                list.item :index => '1', :class => 'java.lang.String', :itemvalue => 'javax.annotation.Nullable'
+              end
+            end
+          end
+          component.option :name => 'myNotNulls' do |option|
+            option.value do |value|
+              value.list :size => '2' do |list|
+                list.item :index => '0', :class => 'java.lang.String', :itemvalue => 'org.jetbrains.annotations.NotNull'
+                list.item :index => '1', :class => 'java.lang.String', :itemvalue => 'javax.annotation.Nonnull'
+              end
+            end
+          end
+        end
+      end
+
       def add_less_compiler_component(project, options = {})
         source_dir = options[:source_dir] || project._(:source, :main, :webapp, :less).to_s
         source_pattern = options[:pattern] || '*.less'
@@ -1376,6 +1433,7 @@ module Buildr #:nodoc:
           lambda { modules_component },
           vcs_component,
           artifacts_component,
+          compiler_configuration_component,
           lambda { data_sources_component },
           configurations_component,
           lambda { framework_detection_exclusion_component }
@@ -1477,6 +1535,60 @@ module Buildr #:nodoc:
         create_composite_component('ArtifactManager', {}, self.artifacts)
       end
 
+      def compiler_configuration_component
+        lambda do
+          create_component('CompilerConfiguration') do |component|
+            component.addNotNullAssertions :enabled => 'false' unless nonnull_assertions?
+            component.wildcardResourcePatterns do |xml|
+              wildcard_resource_patterns.each do |pattern|
+                xml.entry :name => pattern.to_s
+              end
+            end
+            component.annotationProcessing do |xml|
+              xml.profile(:default => true, :name => 'Default', :enabled => true) do
+                xml.sourceOutputDir :name => 'generated/processors/main/java'
+                xml.sourceTestOutputDir :name => 'generated/processors/test/java'
+                xml.outputRelativeToContentRoot :value => true
+                xml.processorPath :useClasspath => true
+              end
+              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?
+                if main_processor || test_processor
+                  xml.profile(:name => "#{prj.name}", :enabled => true) do
+                    xml.sourceOutputDir :name => 'generated/processors/main/java' if main_processor
+                    xml.sourceTestOutputDir :name => 'generated/processors/test/java' if test_processor
+                    xml.outputRelativeToContentRoot :value => true
+                    xml.module :name => prj.iml.name
+                    processor_path = (prj.compile.options[:processor_path] || []) + (prj.test.compile.options[:processor_path] || [])
+                    if processor_path.empty?
+                      xml.processorPath :useClasspath => true
+                    else
+                      xml.processorPath :useClasspath => false do
+                        Buildr.artifacts(processor_path).each do |path|
+                          xml.entry :name => resolve_path(path.to_s)
+                        end
+                      end
+                    end
+                  end
+                else
+                  disabled << prj
+                end
+              end
+              unless disabled.empty?
+                xml.profile(:name => 'Disabled') do
+                  disabled.each do |p|
+                    xml.module :name => p.iml.name
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
       def configurations_component
         create_composite_component('ProjectRunConfigurationManager', {}, self.configurations)
       end
@@ -1487,6 +1599,21 @@ module Buildr #:nodoc:
 
     private
 
+      def default_code_sight_excludes
+        %w(
+          com.sun.istack.internal.NotNull
+          com.sun.istack.internal.Nullable
+          org.jetbrains.annotations.Nullable
+          org.jetbrains.annotations.NotNull
+          org.testng.AssertJUnit
+          org.testng.internal.Nullable
+          org.mockito.internal.matchers.NotNull
+          edu.umd.cs.findbugs.annotations.Nonnull
+          edu.umd.cs.findbugs.annotations.Nullable
+          edu.umd.cs.findbugs.annotations.SuppressWarnings
+      )
+      end
+
       def to_artifact_name(project, options)
         options[:name] || project.iml.id
       end

data/lib/buildr/java/annotation_processor.rb

@@ -0,0 +1,59 @@
+# This file is licensed to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Buildr
+  module ProcessorPath
+    module ProjectExtension
+      include Extension
+
+      before_define do |project|
+        if project.iml?
+          project.iml.instance_variable_set('@main_generated_source_directories', [])
+          project.iml.instance_variable_set('@test_generated_source_directories', [])
+        end
+      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')
+          end
+          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.clean do
+            rm_rf project._(:target, :generated, 'processors/main/java')
+          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')
+          end
+          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.clean do
+            rm_rf project._(:target, :generated, 'processors/test/java')
+          end
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::ProcessorPath::ProjectExtension
+end

data/lib/buildr/java/commands.rb

@@ -63,7 +63,7 @@ module Java
           cmd_args << "cd '#{options[:dir]}' && "
         end
         cmd_args << path_to_bin('java')
-        cp = classpath_from(options)
+        cp = classpath_from(options[:classpath])
 
         unless cp.empty?
           if options[:pathing_jar] == true
@@ -112,14 +112,16 @@ module Java
       #
       # The last argument may be a Hash with additional options:
       # * :output -- Target directory for all compiled class files.
-      # * :classpath -- One or more file names, tasks or artifact specifications.
-      #   These are all expanded into artifacts, and all tasks are invoked.
+      # * :classpath -- One or more file names, tasks or artifact specifications. These are all expanded into artifacts, and all tasks are invoked.
       # * :sourcepath -- Additional source paths to use.
+      # * :processor_path -- Annotation processor path. These are all expanded into artifacts, and all tasks are invoked.
       # * :javac_args -- Any additional arguments to pass (e.g. -extdirs, -encoding)
       # * :name -- Shows this name, otherwise shows the working directory.
       def javac(*args, &block)
         options = Hash === args.last ? args.pop : {}
-        rake_check_options options, :classpath, :sourcepath, :output, :javac_args, :name
+        rake_check_options options, :classpath, :sourcepath, :output, :javac_args, :name, :processor, :processor_path
+
+        processor = !!options[:processor]
 
         files = args.flatten.each { |f| f.invoke if f.respond_to?(:invoke) }.map(&:to_s).
           collect { |arg| File.directory?(arg) ? FileList["#{File.expand_path(arg)}/**/*.java"] : File.expand_path(arg) }.flatten
@@ -127,9 +129,15 @@ module Java
 
         cmd_args = []
         cmd_args << path_to_bin('javac')
-        cp = classpath_from(options)
+        cp = classpath_from(options[:classpath])
         cmd_args << '-classpath' << cp.join(File::PATH_SEPARATOR) unless cp.empty?
         cmd_args << '-sourcepath' << [options[:sourcepath]].flatten.join(File::PATH_SEPARATOR) if options[:sourcepath]
+        if processor
+          processor_path = classpath_from(options[:processor_path])
+          cmd_args << '-processorpath' << processor_path.join(File::PATH_SEPARATOR) unless processor_path.empty?
+        else
+          cmd_args << '-proc:none'
+        end
         cmd_args << '-d' << File.expand_path(options[:output].to_s) if options[:output]
         cmd_args += options[:javac_args].flatten if options[:javac_args]
         Tempfile.open('javac') do |tmp|
@@ -221,9 +229,8 @@ module Java
       #
       # Extracts the classpath from the options, expands it by calling artifacts, invokes
       # each of the artifacts and returns an array of paths.
-      def classpath_from(options)
-        Buildr.artifacts(options[:classpath] || []).map(&:to_s).
-          map { |t| task(t).invoke; File.expand_path(t) }
+      def classpath_from(classpath)
+        Buildr.artifacts(classpath || []).flatten.map(&:to_s).map { |t| task(t).invoke; File.expand_path(t) }
       end
     end
   end

data/lib/buildr/java/compiler.rb

@@ -33,9 +33,9 @@ module Buildr #:nodoc:
     # (e.g. ['-implicit:none', '-encoding', 'iso-8859-1'])
     class Javac < Base
 
-      OPTIONS = [:warnings, :debug, :deprecation, :source, :target, :lint, :other]
+      OPTIONS = [:warnings, :debug, :deprecation, :source, :target, :lint, :other, :processor_path, :processor]
 
-      specify :language=>:java, :target=>'classes', :target_ext=>'class', :packaging=>:jar
+      specify :language => :java, :target => 'classes', :target_ext => 'class', :packaging => :jar
 
       def initialize(project, options) #:nodoc:
         super
@@ -43,15 +43,20 @@ module Buildr #:nodoc:
         options[:warnings] ||= false
         options[:deprecation] ||= false
         options[:lint] ||= false
+        options[:processor] ||= nil
+        options[:processor_path] ||= []
       end
 
       def compile(sources, target, dependencies) #:nodoc:
         check_options options, OPTIONS
+        processor = !!options[:processor] || options[:processor].nil?
         Java::Commands.javac(files_from_sources(sources),
                              :classpath => dependencies,
                              :sourcepath => sources.select { |source| File.directory?(source) },
                              :output => target,
-                             :javac_args => self.javac_args)
+                             :processor => processor,
+                             :processor_path => (processor ? options[:processor_path] : []),
+                             :javac_args => javac_args)
       end
 
       # Filter out source files that are known to not produce any corresponding .class output file. If we leave

data/lib/buildr/version.rb

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

data/rakelib/release.rake

@@ -79,7 +79,7 @@ task 'perform_release' do
 
     stage('PostReleaseUpdateVersion', 'Update the version to the non-dev version') do
       filename = 'lib/buildr/version.rb'
-      parts = ENV['PRODUCT_VERSION'].split
+      parts = ENV['PRODUCT_VERSION'].split('.')
       next_version = "#{parts[0]}.#{parts[1]}.#{parts[2].to_i + 1}"
       content = IO.read(filename).sub(/VERSION = '(.*)'\.freeze/, "VERSION = '#{next_version}.dev'.freeze")
       IO.write(filename, content)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -175,11 +175,9 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.md
-- CHANGELOG.md
 - LICENSE
 - NOTICE
 files:
-- CHANGELOG.md
 - LICENSE
 - NOTICE
 - README.md
@@ -191,6 +189,7 @@ files:
 - addon/buildr/gwt.rb
 - addon/buildr/jacoco.rb
 - addon/buildr/pmd.rb
+- addon/buildr/shade.rb
 - addon/buildr/single_intermediate_layout.rb
 - addon/buildr/spotbugs.rb
 - addon/buildr/top_level_generate_dir.rb
@@ -214,6 +213,7 @@ files:
 - lib/buildr/core/transports.rb
 - lib/buildr/core/util.rb
 - lib/buildr/ide/idea.rb
+- lib/buildr/java/annotation_processor.rb
 - lib/buildr/java/commands.rb
 - lib/buildr/java/compiler.rb
 - lib/buildr/java/custom_pom.rb

data/CHANGELOG.md

@@ -1,5 +0,0 @@
-# Change Log
-
-### Unreleased
-
-* First release after extraction from Apache Buildr.