diff options
| -rw-r--r-- | .env.12-8-stable | 1 | ||||
| -rw-r--r-- | .gitlab/release.yml | 5 | ||||
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 | ||||
| -rwxr-xr-x | run.sh | 2 | ||||
| -rw-r--r-- | spec/integration/java/gradle_spec.rb | 25 |
7 files changed, 40 insertions, 5 deletions
diff --git a/.env.12-8-stable b/.env.12-8-stable new file mode 100644 index 0000000..0ee1d53 --- /dev/null +++ b/.env.12-8-stable @@ -0,0 +1 @@ +LM_REPORT_VERSION '2.0' diff --git a/.gitlab/release.yml b/.gitlab/release.yml index 3d52019..5d0950d 100644 --- a/.gitlab/release.yml +++ b/.gitlab/release.yml @@ -12,6 +12,11 @@ major: latest: extends: .release +12-8-stable: + extends: .release + variables: + DOTENV: ".env.12-8-stable" + 12-7-stable: extends: .release variables: diff --git a/CHANGELOG.md b/CHANGELOG.md index ad8a4c1..2830b11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v2.4.2 + +- Fix word splitting in default gradle options (!110) + ## v2.4.1 - Include a default NuGet configuration file (!105) diff --git a/Gemfile.lock b/Gemfile.lock index bddd908..85a4db1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - license-management (2.4.1) + license-management (2.4.2) license_finder (~> 5.11) net-hippie (~> 0.3) @@ -20,7 +20,7 @@ GEM toml (= 0.2.0) with_env (= 1.1.0) xml-simple - net-hippie (0.3.1) + net-hippie (0.3.2) parslet (1.8.2) public_suffix (4.0.3) rspec (3.9.0) @@ -36,7 +36,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.2) - rubyzip (2.0.0) + rubyzip (2.1.0) thor (1.0.1) toml (0.2.0) parslet (~> 1.8.0) diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index b1dcf4f..e4893d1 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '2.4.1' + VERSION = '2.4.2' end end @@ -174,7 +174,7 @@ case "$COMMAND" in fi if test -f build.gradle ; then - gradle build ${GRADLE_CLI_OPTS:-x test} + gradle build ${GRADLE_CLI_OPTS:"-x test"} skip_prepare=true fi if [[ $(ls ./*.sln 2> /dev/null) ]]; then diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb new file mode 100644 index 0000000..55bde8d --- /dev/null +++ b/spec/integration/java/gradle_spec.rb @@ -0,0 +1,25 @@ +require 'spec_helper' + +RSpec.describe "gradle" do + context "when running a default gradle build" do + it 'installs the required ruby and produces a valid report' do + content = <<~GRADLE +/* + * This file was generated by the Gradle 'init' task. + * + * This is a general purpose Gradle build. + * Learn how to create Gradle builds at https://guides.gradle.org/creating-new-gradle-builds + */ +plugins { + id "com.github.hierynomus.license" version "0.15.0" +} + GRADLE + runner.add_file('build.gradle', content) + + report = runner.scan + expect(report).to match_schema(version: '2.0') + expect(report[:licenses]).to be_empty + expect(report[:dependencies]).to be_empty + end + end +end |