Commit Graph

893 Commits

Author SHA1 Message Date
R Tyler Croy 704694e6b1
Replace stub gems with the Real McCoy.
Due to a rubygems security fix which arrived in JRuby 9.1.15.0, the empty stub
gems we were using in our integration tests would no longer work properly,
causing the error below:

    installing into parent path
    /home/tyler/source/github/jruby-gradle/jruby-gradle-plugin/jruby-gradle-base-plugin/build/tmp/integrationTest/root/jpgis/rack-resolve/build/gems/gems/sinatra-1.4.5 of
    /home/tyler/source/github/jruby-gradle/jruby-gradle-plugin/jruby-gradle-base-plugin/build/tmp/integrationTest/root/jpgis/rack-resolve/build/gems/gems/sinatra-1.4.5 is not allowed`

By adding the real gem files, the tests work fine again 😸

Many 👏 for @ysb33r whose detective work helped uncover the empty gems in
relation to the test failure
2019-05-04 11:20:28 -07:00
R Tyler Croy a389038505
Test on OpenJDK11 now too 2019-05-01 19:15:58 -07:00
R Tyler Croy 28485abb6c
Bump the to the latest JRuby version of 9.2.7.0 2019-05-01 19:15:56 -07:00
R Tyler Croy 5215286ef1
Merge pull request #342 from rtyler/install-time-dep-341
Handle dependencies which are needed at installation time
2019-05-01 19:14:42 -07:00
R Tyler Croy 8194b27b9f
Reverse the order of dependencies at install time
This should ensure that any dependencies which are needed at install time, are
available for the gem before it is its turn to be installed

Fixes #341
2019-04-27 21:25:38 -07:00
Stefan Stüben f25e16f936 use WorkResults.didWork() instead of deprecated SimpleWorkResult 2019-04-08 10:14:21 +02:00
R Tyler Croy 2806519f37
Merge pull request #339 from aalmiray/gradle-build-scan
Configure build-scan plugin
2019-03-04 08:00:22 -08:00
aalmiray d40f6b959f Configure build-scan plugin 2019-03-04 15:28:38 +01:00
Schalk W. Cronjé 4ca2135898
Merge pull request #336 from ysb33r/master
Base plugin should be called jruby-gradle-plugin for now
2018-08-29 17:55:28 +02:00
Schalk W. Cronjé 27424d647c Base plugin should be called jruby-gradle-plugin for now 2018-08-29 16:53:07 +01:00
Schalk W. Cronjé d583a85cf9
Merge pull request #335 from ysb33r/master
Cleaned up issues that prevented Bintray uploads
2018-08-29 17:22:16 +02:00
Schalk W. Cronjé 1662af97f6 Cleaned up issue sthat preventing Bintray uploads 2018-08-29 16:20:34 +01:00
Schalk W. Cronjé 5fd5aef5a9
Merge pull request #334 from ysb33r/master
Use VM instead of Docker on Travis
2018-08-29 16:02:43 +02:00
Schalk W. Cronjé 17f8ed3aa4 Use VM instead od Docker on Travis 2018-08-29 14:35:49 +01:00
Schalk W. Cronjé 8d693e8782 Merge branch 'master' of https://github.com/jruby-gradle/jruby-gradle-plugin 2018-08-27 23:27:08 +02:00
Christian Meier 9a08537abc
Merge pull request #332 from wdschei/FIX_CannotChangeStrategy
Fixing the "Cannot change strategy" issue.
2018-08-26 19:36:24 +02:00
Schalk W. Cronjé 7175ae4bba Remove dead code 2018-08-25 17:36:50 +02:00
wdschei 7d777cac36 Fixing the "Cannot change strategy of configuration ... after it has been resolved." issue. 2018-08-23 14:45:28 -05:00
Christian Meier 23d71a8124
Merge pull request #331 from jruby-gradle/version-resolve-workaround
use workaround an upstream bug in version range
2018-08-13 11:35:37 +02:00
Christian Meier 2f8d44d18f use workaround an upstream bug in version range
fixes #328
2018-08-12 20:09:47 +02:00
Schalk W. Cronjé 45635ac0b7
Merge pull request #330 from ysb33r/update-to-gradle4
WIP: Fix nagging issues preventing a release

- Upgradle to 4.8.1.
- Remove lasagne GEMS proxy.
- Remove `buildscript`, replace with `plugins`.
- Source/target compatibility set to JDK8.
- Upgradle to Grolifant 0.8.
- Upgradle to Spock 1.1.
- Added Gradle 4.9 to compatibility test set.
- Remove deprecated CodeNarc rules.
2018-08-04 14:14:42 +02:00
Schalk W. Cronjé 3684c406b9 Fix nagging issues preventing a release
- Upgradle to 4.8.1.
- Remove lasagne GEMS proxy.
- Remove `buildscript`, replace with `plugins`.
- Source/target compatibility set to JDK8.
- Upgradle to Grolifant 0.8.
- Upgradle to Spock 1.1.
- Added Gradle 4.9 to compatibility test set.
- Remove deprecated CodeNarc rules.
i
2018-08-04 13:52:29 +02:00
R. Tyler Croy 4352f4635d
Merge pull request #317 from jruby-gradle/jruby-mains
switch to latest jruby-mains version
2017-12-30 12:54:03 -08:00
R. Tyler Croy 9b3e77ad04
Merge pull request #321 from rtyler/travis-tinkering
Adjust some settings to hopefully get Travis to stop failing builds 💩
2017-12-30 12:51:57 -08:00
R. Tyler Croy 099bd58850
What if we only used two Gradle workers? 2017-12-05 17:02:09 -08:00
R. Tyler Croy 97e987bba5
What if we restricted the memory? 2017-12-05 16:46:11 -08:00
R. Tyler Croy eef4c006c7
Adjust some settings to hopefully get Travis to stop failing the builds 💩 2017-12-02 23:01:34 -08:00
R. Tyler Croy d9f4466a77
Ensure the right jruby-mains version is available for testing 2017-11-29 10:47:04 -08:00
Christian Meier 7ceb1f306e
switch to latest jruby-mains version
fixes an issue with puma and `Bundler`
2017-11-28 14:28:52 -08:00
R. Tyler Croy e11b008dce
Merge pull request #318 from rtyler/new-jrub
Default to JRuby 9.1.14.0 which now has some nice Java 9 support 👏
2017-11-28 14:26:18 -08:00
R. Tyler Croy 005183b092
Drop all 1.7.x support
Fixes #319
2017-11-28 13:26:18 -08:00
R. Tyler Croy da546ce48a
Default to JRuby 9.1.14.0 which now has some nice Java 9 support 👏
http://jruby.org/2017/11/08/jruby-9-1-14-0.html
2017-11-28 12:52:16 -08:00
R. Tyler Croy ff84f98a03
Upgrade our own use of Gradle to 4.3.1 2017-11-28 12:52:16 -08:00
R. Tyler Croy 0ebaba865b Merge pull request #311 from nilbus/changelog
Document that the CHANGELOG is no longer maintained
2017-09-28 18:09:04 -07:00
R. Tyler Croy 8e852bc53b Reference the closed milestones which are more accurate for release notes
The information displayed on the Releases page is just the "annotation" created by myself when I sign and tag a release.
2017-09-28 18:08:51 -07:00
Edward Anderson f47602b53c Document that the CHANGELOG is no longer maintained 2017-09-28 00:45:16 +00:00
Schalk W. Cronjé 28a28afab8 Merge pull request #309 from ysb33r/gradle42
Upgradle to 4.2 and use GradleTest 1.0-beta12
2017-09-27 22:23:37 +02:00
Schalk W. Cronjé 28b7b386f2 Remove PendingFeature 2017-09-27 22:22:31 +02:00
Schalk W. Cronjé 3d8b2f8a18 Bump version to 1.6.0-SNAPSHOT 2017-09-27 18:10:58 +02:00
Schalk W. Cronjé 163eb81337 Make Travis behave 2017-09-27 17:49:36 +02:00
Schalk W. Cronjé 05fb19d7ab Upgradle to 4.2 and use GradleTest 1.0-beta12
- Use Torquebox in addition to lasagne,io when building and to work around
  flasky tests.
- Use Grolifant library to deal with Gradle compatibility issues.
- Remove Gradle 5.0 deprecation warning.
- Do not set logging level within tests.
- Ignore IntelliJ "out" directories.
- Update GradleTest fixtures for 1.0-betaX improvements.
- Split out JRubyPluginInstanceSpec to its own file.
- Extract JRubyJarTestKitSpec into its own test file.
- Make test repository preparation a separate task.
- Update TestKit syntax to deal with Gradle 4.2.
- State that Gradle 2.8 is a minimum version.

Also marked custom repository test as `PendingFeature` to be investigated
later as doe a possible rewrite.
2017-09-27 17:20:32 +02:00
R. Tyler Croy 62e7bf6cd4 Merge pull request #301 from rtyler/9.1.12.0
Upgrade the default JRuby to the latest of 9.1.12.0
2017-08-15 16:32:36 -07:00
R. Tyler Croy c110ed3b62
Upgrade the default JRuby to the latest of 9.1.12.0 2017-08-15 13:01:17 -07:00
R. Tyler Croy 03e8495891 Merge pull request #300 from rtyler/jdk8
Force source compatibility to JDK8 and bump our minor version
2017-08-15 10:26:32 -07:00
R. Tyler Croy cb6cd6d9fb
Force source compatibility to JDK8 and bump our minor version 2017-08-15 09:28:43 -07:00
R. Tyler Croy ab11a0c1cc
As far as I am concerned, Java 7 is dead.
Not even Jenkins supports it anymore 😄
2017-08-14 22:08:02 -07:00
R. Tyler Croy 2df148531b Merge pull request #299 from rtyler/minor-fixens
Fix a few low-hanging fruits
2017-08-14 21:04:36 -07:00
R. Tyler Croy 2d1c14e176
Prefer the torquebox maven proxy which may now be faster than lasagna.io
We'll keep both around just to be sure.

References #297
2017-08-14 18:14:41 -07:00
R. Tyler Croy 8fbc0f7da9
Fix bad link on the homepage
Fixes #296
2017-08-14 18:08:26 -07:00
Schalk W. Cronjé 3e34395be4 Merge pull request #294 from EarthCitizen/master
Fixes #293 - Environment Variables not Passes to javaexec
2017-04-12 09:58:57 +02:00