jruby-gradle
/
jruby-gradle-plugin
mirror of https://github.com/jruby-gradle/jruby-gradle-plugin
1
0
Fork 0
Code Issues Releases Wiki Activity

Create jrubyJar configuration if it does not exist

This commit is contained in:
Schalk Cronje 2019-05-05 17:33:52 +02:00
parent 01a5c3443b
commit ed7216086a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jar-plugin/src/main/groovy/com/github/jrubygradle/jar/JRubyJar.groovy
View File

@ -19,7 +19,7 @@ import com.github.jengelman.gradle.plugins.shadow.internal.ZipCompressor
import com.github.jengelman.gradle.plugins.shadow.internal.DefaultZipCompressor
/**
* JRubyJar creates a Java ARchive with Ruby code packed inside of it.
* JRubyJar creates a Java Archive with Ruby code packed inside of it.
*
* The most common use-case is when packing a self-contained executable jar
* which would contain your application code, the JRuby runtime and a launcher
@ -67,7 +67,7 @@ class JRubyJar extends Jar {
void jrubyVersion(String version) {
logger.info("setting jrubyVersion to ${version} from ${embeddedJRubyVersion}")
embeddedJRubyVersion = version
addEmbeddedDependencies(project.configurations.maybeCreate(configuration))
addEmbeddedDependencies(project.configurations.maybeCreate(configuration)) // TODO <-- Should not be creating a configuration at this stage
}
/**

9
jar-plugin/src/main/groovy/com/github/jrubygradle/jar/JRubyJarPlugin.groovy
View File

@ -6,6 +6,8 @@ import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.tasks.testing.Test
import static com.github.jrubygradle.jar.JRubyJar.DEFAULT_JRUBYJAR_CONFIG
/**
* @author Schalk W. Cronjé
* @author Christian Meier
@ -16,6 +18,7 @@ class JRubyJarPlugin implements Plugin<Project> {
void apply(Project project) {
project.apply plugin: 'com.github.jruby-gradle.base'
project.apply plugin: 'java-base'
project.configurations.maybeCreate(DEFAULT_JRUBYJAR_CONFIG)
project.tasks.create('jrubyJar', JRubyJar)
updateTestTask(project)
@ -35,7 +38,7 @@ class JRubyJarPlugin implements Plugin<Project> {
if ((task instanceof JRubyJar) && (task.scriptName != JRubyJar.Type.LIBRARY)) {
if (isJRubyVersionDeprecated(task.jrubyVersion)) {
project.logger.warn('The task `{}` is using JRuby {} which may cause unexpected behavior, see <http://jruby-gradle.org/errors/jar-deprecated-jrubyversion> for more',
task.name, task.jrubyVersion)
task.name, task.jrubyVersion)
}
}
}
@ -60,8 +63,8 @@ class JRubyJarPlugin implements Plugin<Project> {
// will be writing tests that includes jruby and that they might need some
// GEMs as part of the tests.
Closure testConfiguration = { Task t ->
environment GEM_HOME : project.jruby.gemInstallDir
environment JARS_HOME : project.jruby.jarInstallDir
environment GEM_HOME: project.jruby.gemInstallDir
environment JARS_HOME: project.jruby.jarInstallDir
dependsOn 'jrubyPrepare'
}