Skip to content
This repository was archived by the owner on May 19, 2019. It is now read-only.

Commit 00ad209

Browse files
committed
Removed testGems & runtimeGems - the use case I thought them to be useful for, turned out to be a no-show. User now has control over the version of warbler-bootstrap to use. This commit relies on jruby-gradle-plugin v0.1.2 being released.
1 parent ee969ce commit 00ad209

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ configurations {
2828
dependencies {
2929
compile gradleApi()
3030
compile localGroovy()
31-
compile 'com.github.jruby-gradle:jruby-gradle-plugin:0.1.1'
31+
compile 'com.github.jruby-gradle:jruby-gradle-plugin:0.1.2'
3232

3333
testCompile ("org.spockframework:spock-core:0.7-groovy-${gradle.gradleVersion.startsWith('1.')?'1.8':'2.0'}") {
3434
exclude module : 'groovy-all'
3535
}
36-
testWarbler group: 'com.lookout', name: 'warbler-bootstrap', version: '1.+'
36+
testWarbler group: 'com.lookout', name: 'warbler-bootstrap', version: '1.0.0'
3737

3838
}
3939

src/main/groovy/com/github/jrubygradle/jar/JRubyJarPlugin.groovy

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.jrubygradle.jar
22

3-
import com.github.jrubygradle.jar.JRubyJarConfigurator
3+
import com.github.jrubygradle.internal.WarblerBootstrap
44
import org.gradle.api.Plugin
55
import org.gradle.api.Project
66
import org.gradle.api.Task
@@ -14,15 +14,7 @@ class JRubyJarPlugin implements Plugin<Project> {
1414
void apply(Project project) {
1515

1616
project.apply plugin : 'com.github.jruby-gradle.base'
17-
1817
project.configurations.maybeCreate('jrubyEmbeds')
19-
project.configurations.maybeCreate('testGems')
20-
project.configurations.maybeCreate('runtimeGems')
21-
22-
// TODO: This is currently fixed. Really need to find a way to allow user to configure the version
23-
project.dependencies {
24-
jrubyEmbeds group: 'com.lookout', name: 'warbler-bootstrap', version: '1.0.0'
25-
}
2618

2719
// In order to update the testing cycle we need to tell unit tests where to
2820
// find GEMs. We are assuming that if someone includes this plugin, that they
@@ -52,6 +44,7 @@ class JRubyJarPlugin implements Plugin<Project> {
5244
}
5345

5446
project.afterEvaluate {
47+
WarblerBootstrap.addDependency(project)
5548
JRubyJarConfigurator.afterEvaluateAction(project)
5649
}
5750
}

src/test/groovy/com/github/jrubygradle/jar/JRubyJarPluginSpec.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ class JRubyJarPluginSpec extends Specification {
134134
project.with {
135135
jruby {
136136
defaultRepositories = false
137+
warblerBootstrapVersion = '1.0.0'
137138
}
138139
repositories {
139140
ivy {

0 commit comments

Comments
 (0)