You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2018/11/18 10:48:25 UTC

[1/2] buildr git commit: Fix typos in comments

Repository: buildr
Updated Branches:
  refs/heads/master 40ad146ae -> 68c61f5b6


Fix typos in comments


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/ba167071
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/ba167071
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/ba167071

Branch: refs/heads/master
Commit: ba167071cc47e30a77919b29334f289c82e3dc19
Parents: 69541b0
Author: Olle Jonsson <ol...@gmail.com>
Authored: Sun Nov 18 11:32:08 2018 +0100
Committer: Olle Jonsson <ol...@gmail.com>
Committed: Sun Nov 18 11:32:08 2018 +0100

----------------------------------------------------------------------
 lib/buildr/core/project.rb                 | 4 ++--
 lib/buildr/packaging/artifact_namespace.rb | 6 +++---
 spec/core/compile_spec.rb                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/ba167071/lib/buildr/core/project.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/core/project.rb b/lib/buildr/core/project.rb
index 5a214f0..a75c367 100644
--- a/lib/buildr/core/project.rb
+++ b/lib/buildr/core/project.rb
@@ -127,7 +127,7 @@ module Buildr #:nodoc:
   #   buildr compile
   # from the command line, it will execute the compile task of the current project.
   #
-  # Projects and sub-projects follow a directory heirarchy. The Buildfile is assumed to
+  # Projects and sub-projects follow a directory hierarchy. The Buildfile is assumed to
   # reside in the same directory as the top-level project, and each sub-project is
   # contained in a sub-directory in the same name. For example:
   #   /home/foo
@@ -223,7 +223,7 @@ module Buildr #:nodoc:
           end
 
           # Top-level project? Invoke the project definition. Sub-project? We don't invoke
-          # the project definiton yet (allow project calls to establish order of evaluation),
+          # the project definition yet (allow project calls to establish order of evaluation),
           # but must do so before the parent project's definition is done.
           project.parent.enhance { project.invoke } if project.parent
         end

http://git-wip-us.apache.org/repos/asf/buildr/blob/ba167071/lib/buildr/packaging/artifact_namespace.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/packaging/artifact_namespace.rb b/lib/buildr/packaging/artifact_namespace.rb
index 4c6001f..b977fa5 100644
--- a/lib/buildr/packaging/artifact_namespace.rb
+++ b/lib/buildr/packaging/artifact_namespace.rb
@@ -130,7 +130,7 @@ module Buildr #:nodoc:
   # Sometimes users would need to change the default artifact versions used by some
   # module, for example, the XMLBeans compiler needs this, because of compatibility
   # issues. Another example would be to select the groovy version to use on all our
-  # projects so that Buildr modules requiring groovy jars can use user prefered versions.
+  # projects so that Buildr modules requiring groovy jars can use user preferred versions.
   #
   # To meet this goal, an ArtifactNamespace allows to specify ArtifactRequirement objects.
   # In fact the only difference with the examples you have already seen is that requirements
@@ -194,7 +194,7 @@ module Buildr #:nodoc:
   #
   # A more advanced example using ArtifactRequirement listeners is included
   # in the artifact_namespace_spec.rb description for 'Extension using ArtifactNamespace'
-  # That's it for addon writers, now, users can select their prefered version with
+  # That's it for addon writers, now, users can select their preferred version with
   # something like:
   #
   #    require 'buildr/xmlbeans'
@@ -413,7 +413,7 @@ module Buildr #:nodoc:
       # The last part consist of a VersionRequirement.
       #                                     ->  ( >2 & <4)
       #
-      # VersionRequirement supports RubyGem's comparision operators
+      # VersionRequirement supports RubyGem's comparison operators
       # in adition to parens, logical and, logical or and negation.
       # See the docs for VersionRequirement for more info on operators.
       def initialize(spec)

http://git-wip-us.apache.org/repos/asf/buildr/blob/ba167071/spec/core/compile_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/compile_spec.rb b/spec/core/compile_spec.rb
index 69e5037..f70c585 100644
--- a/spec/core/compile_spec.rb
+++ b/spec/core/compile_spec.rb
@@ -141,7 +141,7 @@ describe Buildr::CompileTask, '#compiler' do
     end
   end
 
-  it 'should allow supressing compilation' do
+  it 'should allow suppressing compilation' do
     write 'src/main/java/package/Test.java', 'class Test {}'
     define 'foo' do
       compile.sources.clear


[2/2] buildr git commit: Merge remote-tracking branch 'github/pr/35'

Posted by do...@apache.org.
Merge remote-tracking branch 'github/pr/35'


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/68c61f5b
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/68c61f5b
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/68c61f5b

Branch: refs/heads/master
Commit: 68c61f5b6e99d328ac51db68a1984cec78b23971
Parents: 40ad146 ba16707
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun Nov 18 21:48:13 2018 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun Nov 18 21:48:13 2018 +1100

----------------------------------------------------------------------
 lib/buildr/core/project.rb                 | 4 ++--
 lib/buildr/packaging/artifact_namespace.rb | 6 +++---
 spec/core/compile_spec.rb                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------