Skip to content

Commit 4ca2135

Browse files
authored
Merge pull request #336 from ysb33r/master
Base plugin should be called jruby-gradle-plugin for now
2 parents d583a85 + 27424d6 commit 4ca2135

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

docs/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,3 @@ publishGhPages.dependsOn assembleDocs
7070

7171
/* We don't need an upload task in here */
7272
//bintrayUpload.enabled = false
73-

jruby-gradle-jar-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ configurations {
1010
}
1111

1212
dependencies {
13-
compile project(':jruby-gradle-base-plugin')
13+
compile project(':jruby-gradle-plugin')
1414
compile 'com.github.jengelman.gradle.plugins:shadow:[1.2.2,2.0)'
1515

1616
testCompile (spockVersion) {

jruby-gradle-jar-plugin/gradle/integration-test.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666
/* add our TestKit classpath to our test runtime so we can find it again */
6767
integrationTestRuntime files(prepareGradleTestKitClasspath)
6868

69-
gradleTest project(':jruby-gradle-base-plugin')
69+
gradleTest project(':jruby-gradle-plugin')
7070
gradleTest 'com.github.jengelman.gradle.plugins:shadow:[1.2.2,2.0)'
7171

7272
testJRubyPrepare "org.jruby:jruby-complete:1.7.19"

jruby-gradle-war-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "${rootProject.version}-alpha"
44

55

66
dependencies {
7-
compile project(':jruby-gradle-base-plugin')
7+
compile project(':jruby-gradle-plugin')
88
compile group: 'com.github.jruby-gradle', name: 'warbler-bootstrap', version: '0.2.0+'
99

1010
testCompile (spockVersion) {

settings.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
include 'jruby-gradle-base-plugin', 'jruby-gradle-jar-plugin', 'jruby-gradle-war-plugin', 'docs'
1+
include 'jruby-gradle-plugin'
2+
include 'jruby-gradle-jar-plugin'
3+
include 'jruby-gradle-war-plugin'
4+
include 'docs'
5+
6+
project(':jruby-gradle-plugin').projectDir = file('jruby-gradle-base-plugin')

0 commit comments

Comments
 (0)