From cec331454a610ba3984b1eb50efe5138a95283dc Mon Sep 17 00:00:00 2001 From: Civitaspo Date: Wed, 24 Apr 2019 08:36:24 +0900 Subject: [PATCH 1/2] Add settings.gradle --- settings.gradle | 1 + 1 file changed, 1 insertion(+) create mode 100644 settings.gradle diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..fb6c023 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "embulk-filter-expand_json" From 32b66b94d0be3d9ee85f5ed9fc9d42434dbcf57e Mon Sep 17 00:00:00 2001 From: Civitaspo Date: Wed, 24 Apr 2019 08:38:16 +0900 Subject: [PATCH 2/2] Follow latest build.gradle for embulk --- build.gradle | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 40353d7..4d3c7f1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "com.jfrog.bintray" version "1.1" - id "com.github.jruby-gradle.base" version "0.1.5" + id "com.github.jruby-gradle.base" version "1.5.0" id "com.github.kt3k.coveralls" version "2.4.0" id "jacoco" id "java" @@ -59,19 +59,23 @@ task checkstyle(type: Checkstyle) { } task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) { - jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build" - script "${project.name}.gemspec" + jrubyArgs "-S" + script "gem" + scriptArgs "build", "${project.name}.gemspec" doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") } } task gemPush(type: JRubyExec, dependsOn: ["gem"]) { - jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "push" - script "pkg/${project.name}-${project.version}.gem" + jrubyArgs "-S" + script "gem" + scriptArgs "push", "pkg/${project.name}-${project.version}.gem" } -task "package"(dependsOn: ["gemspec", "classpath"]) << { - println "> Build succeeded." - println "> You can run embulk with '-L ${file(".").absolutePath}' argument." +task "package"(dependsOn: ["gemspec", "classpath"]) { + doLast { + println "> Build succeeded." + println "> You can run embulk with '-L ${file(".").absolutePath}' argument." + } } task gemspec { @@ -93,7 +97,6 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r"^(test|spec)/") spec.require_paths = ["lib"] - #spec.add_dependency 'YOUR_GEM_DEPENDENCY', ['~> YOUR_GEM_DEPENDENCY_VERSION'] spec.add_development_dependency 'bundler', ['~> 1.0'] spec.add_development_dependency 'rake', ['>= 10.0'] end