Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
name: ci.yml
on: [push, pull_request]
name: Ruby

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
ruby-version: [jruby-9.4, jruby-10.0]

steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 'jruby-head'
- run: bundle
- run: bundle exec rake specs
- uses: actions/checkout@v5
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true
- run: bundle
- run: bundle exec rake specs
9 changes: 5 additions & 4 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# jbundler

* [![Build Status](https://secure.travis-ci.org/mkristian/jbundler.svg)](http://travis-ci.org/mkristian/jbundler)
[![Gem Version](https://img.shields.io/gem/v/jbundler)](https://rubygems.org/gems/jbundler)
[![master Build Status](https://github.com/jruby/jbundler/actions/workflows/ci.yml/badge.svg)](https://github.com/jruby/jbundler/actions/workflows/ci.yml?query=branch%3Amaster) (master)

Manage jar dependencies similar to how **bundler** manages gem dependencies:

Expand All @@ -11,8 +12,8 @@ Manage jar dependencies similar to how **bundler** manages gem dependencies:

differences compared to **bundler**

* you need to run ```bundle install``` first if any of the gems have jar dependencies.
* all one command ```jbundle```, see ```jbundle help``` on the possible options and how to update a single jar, etc.
* you need to run `bundle install` first if any of the gems have jar dependencies.
* all one command `jbundle`, see `jbundle help` on the possible options and how to update a single jar, etc.

## Get started

Expand Down Expand Up @@ -100,7 +101,7 @@ The whole project actually started with a controversial discussion on a [pull re
License
-------

Almost all code is under the MIT license but the java class (AetherSettings.java)[https://github.com/mkristian/jbundler/blob/master/src/main/java/jbundler/AetherSettings.java] which was derived from EPL licensed code.
JBundler is [MIT-licensed](./MIT-LICENSE).

Contributing
------------
Expand Down
16 changes: 8 additions & 8 deletions jbundler.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ END

s.authors = ['Christian Meier']
s.email = ['m.kristian@web.de']
s.homepage = 'https://github.com/mkristian/jbundler'
s.homepage = 'https://github.com/jruby/jbundler'

s.bindir = "bin"
s.bindir = 'bin'
s.executables = ['jbundle']

s.license = 'MIT'
Expand All @@ -27,11 +27,11 @@ END
s.files += Dir['Gemfile*']
s.test_files += Dir['spec/*_spec.rb']

s.add_runtime_dependency 'maven-tools', '1.2.3'
s.add_runtime_dependency 'maven-tools', '~> 1.2.3'
s.add_runtime_dependency 'ruby-maven', '~> 3.3', '>= 3.3.8'
s.add_runtime_dependency 'bundler', '> 1.5', '< 3'
s.add_runtime_dependency 'jar-dependencies', '~> 0.3'

s.add_runtime_dependency "ruby-maven", "~> 3.3", '>= 3.3.8'
s.add_runtime_dependency "bundler", "> 1.5", "< 3.0.0"
s.add_runtime_dependency "jar-dependencies", "~> 0.3"
s.add_development_dependency "rake", "~> 13.0"
s.add_development_dependency "minitest", "~> 5.3"
s.add_development_dependency 'rake', '~> 13.0'
s.add_development_dependency 'minitest', '~> 5.3'
end
2 changes: 1 addition & 1 deletion lib/jbundler/lock_down.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
require 'maven/tools/jarfile'
require 'maven/ruby/maven'
require 'fileutils'
require 'jar_installer'
require 'jars/installer'

module JBundler
class LockDown
Expand Down
3 changes: 3 additions & 0 deletions lib/jbundler/version.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module JBundler
VERSION = '0.9.6'
end