buildr 1.5.3-java → 1.5.4-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +25 -1
  3. data/addon/buildr/bnd.rb +8 -2
  4. data/addon/buildr/findbugs.rb +2 -2
  5. data/addon/buildr/gpg.rb +7 -1
  6. data/addon/buildr/gwt.rb +41 -1
  7. data/addon/buildr/jacoco.rb +18 -18
  8. data/addon/buildr/jetty.rb +14 -5
  9. data/addon/buildr/jetty6.rb +243 -0
  10. data/addon/buildr/org/apache/buildr/Jetty6Wrapper$1.class +0 -0
  11. data/addon/buildr/org/apache/buildr/Jetty6Wrapper$BuildrHandler.class +0 -0
  12. data/addon/buildr/org/apache/buildr/Jetty6Wrapper.class +0 -0
  13. data/addon/buildr/org/apache/buildr/Jetty6Wrapper.java +144 -0
  14. data/addon/buildr/org/apache/buildr/JettyWrapper$BuildrHandler.class +0 -0
  15. data/addon/buildr/org/apache/buildr/JettyWrapper.class +0 -0
  16. data/addon/buildr/org/apache/buildr/JettyWrapper.java +13 -13
  17. data/buildr.buildfile +7 -1
  18. data/doc/contributing.textile +0 -19
  19. data/doc/download.textile +18 -6
  20. data/doc/index.textile +20 -12
  21. data/doc/languages.textile +23 -1
  22. data/doc/packaging.textile +21 -0
  23. data/lib/buildr/ide/idea.rb +4 -2
  24. data/lib/buildr/java/commands.rb +1 -1
  25. data/lib/buildr/kotlin.rb +17 -0
  26. data/lib/buildr/kotlin/compiler.rb +282 -0
  27. data/lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector$1.class +0 -0
  28. data/lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.class +0 -0
  29. data/lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.java +46 -0
  30. data/lib/buildr/packaging/archive.rb +47 -11
  31. data/lib/buildr/packaging/package.rb +3 -2
  32. data/lib/buildr/packaging/tar.rb +51 -16
  33. data/lib/buildr/packaging/ziptask.rb +45 -17
  34. data/lib/buildr/version.rb +1 -1
  35. data/spec/addon/bnd_spec.rb +80 -20
  36. data/spec/kotlin/compiler_spec.rb +274 -0
  37. data/spec/packaging/archive_spec.rb +30 -0
  38. data/spec/sandbox.rb +1 -0
  39. metadata +13 -3
  40. data/lib/buildr/scala/org/apache/buildr/Specs2Runner.class +0 -0
@@ -306,6 +306,36 @@ shared_examples_for 'ArchiveTask' do
306
306
  inspect_archive.should be_empty
307
307
  end
308
308
  end
309
+
310
+ it 'should merge archives, concatenate file contents' do
311
+ @files = %w{foo1 foo2}.map { |folder| File.join(@dir, folder) }.
312
+ map do |dir|
313
+ txt_file = File.join(dir, 'test1.txt')
314
+ write txt_file, content_for('test1.txt')
315
+ zip(File.join(dir, 'test1.zip')).include(txt_file)
316
+ end
317
+ archive(@archive).merge(@files).concatenate("test1.txt")
318
+ archive(@archive).invoke
319
+ inspect_archive do |archive|
320
+ archive['test1.txt'].should eql(content_for('test1.txt') * @files.size)
321
+ end
322
+ end
323
+
324
+ it 'should merge archives, transforming file contents' do
325
+ @files = %w{foo1 foo2}.map { |folder| File.join(@dir, folder) }.
326
+ map do |dir|
327
+ txt_file = File.join(dir, 'test1.txt')
328
+ write txt_file, content_for('test1.txt')
329
+ zip(File.join(dir, 'test1.zip')).include(txt_file)
330
+ end
331
+ archive(@archive).merge(@files).transform("test1.txt") do |matches|
332
+ matches.join("\n=====\n")
333
+ end
334
+ archive(@archive).invoke
335
+ inspect_archive do |archive|
336
+ archive['test1.txt'].should eql("#{content_for('test1.txt')}\n=====\n#{content_for('test1.txt')}")
337
+ end
338
+ end
309
339
 
310
340
  it 'should expand another archive file into path' do
311
341
  create_for_merge do |src|
@@ -39,6 +39,7 @@ require 'buildr/groovy'
39
39
  require 'buildr/scala'
40
40
  require 'buildr/bnd'
41
41
  require 'buildr/jaxb_xjc'
42
+ require 'buildr/kotlin'
42
43
 
43
44
  Java.load # Anything added to the classpath.
44
45
  artifacts(
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: buildr
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.3
4
+ version: 1.5.4
5
5
  platform: java
6
6
  authors:
7
7
  - Apache Buildr
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-05-17 00:00:00.000000000 Z
11
+ date: 2017-11-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -390,12 +390,17 @@ files:
390
390
  - addon/buildr/jdepend-report.xsl
391
391
  - addon/buildr/jdepend.rb
392
392
  - addon/buildr/jetty.rb
393
+ - addon/buildr/jetty6.rb
393
394
  - addon/buildr/jibx.rb
394
395
  - addon/buildr/nailgun.rb
395
396
  - addon/buildr/openjpa.rb
396
397
  - addon/buildr/org/apache/buildr/BuildrNail$Main.class
397
398
  - addon/buildr/org/apache/buildr/BuildrNail.class
398
399
  - addon/buildr/org/apache/buildr/BuildrNail.java
400
+ - addon/buildr/org/apache/buildr/Jetty6Wrapper$1.class
401
+ - addon/buildr/org/apache/buildr/Jetty6Wrapper$BuildrHandler.class
402
+ - addon/buildr/org/apache/buildr/Jetty6Wrapper.class
403
+ - addon/buildr/org/apache/buildr/Jetty6Wrapper.java
399
404
  - addon/buildr/org/apache/buildr/JettyWrapper$1.class
400
405
  - addon/buildr/org/apache/buildr/JettyWrapper$BuildrHandler.class
401
406
  - addon/buildr/org/apache/buildr/JettyWrapper.class
@@ -504,6 +509,11 @@ files:
504
509
  - lib/buildr/java/test_result.rb
505
510
  - lib/buildr/java/tests.rb
506
511
  - lib/buildr/java/version_requirement.rb
512
+ - lib/buildr/kotlin.rb
513
+ - lib/buildr/kotlin/compiler.rb
514
+ - lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector$1.class
515
+ - lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.class
516
+ - lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.java
507
517
  - lib/buildr/packaging/archive.rb
508
518
  - lib/buildr/packaging/artifact.rb
509
519
  - lib/buildr/packaging/artifact_namespace.rb
@@ -525,7 +535,6 @@ files:
525
535
  - lib/buildr/scala/bdd.rb
526
536
  - lib/buildr/scala/compiler.rb
527
537
  - lib/buildr/scala/doc.rb
528
- - lib/buildr/scala/org/apache/buildr/Specs2Runner.class
529
538
  - lib/buildr/scala/shell.rb
530
539
  - lib/buildr/scala/tests.rb
531
540
  - lib/buildr/shell.rb
@@ -580,6 +589,7 @@ files:
580
589
  - spec/java/run_spec.rb
581
590
  - spec/java/test_coverage_helper.rb
582
591
  - spec/java/tests_spec.rb
592
+ - spec/kotlin/compiler_spec.rb
583
593
  - spec/packaging/archive_spec.rb
584
594
  - spec/packaging/artifact_namespace_spec.rb
585
595
  - spec/packaging/artifact_spec.rb