Skip to content

Commit 79121f8

Browse files
committed
Remove hardcoded plugin jar name
1 parent 9c426d7 commit 79121f8

File tree

1 file changed

+17
-22
lines changed

1 file changed

+17
-22
lines changed

base-plugin/build.gradle

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
import org.gradle.plugins.ide.idea.model.IdeaModel
2-
import org.gradle.plugins.ide.idea.model.IdeaModule
3-
4-
archivesBaseName = 'jruby-gradle-plugin' // TODO: FIX !!
5-
61
apply plugin: TestConfigPlugin
72
apply plugin: 'java-gradle-plugin'
83
apply from: "${rootProject.projectDir}/gradle/integration-tests.gradle"
@@ -19,7 +14,7 @@ ext {
1914

2015
jrubyClassPathFromConfiguration = { Configuration cfg ->
2116
def f = cfg.files.find { it.name.startsWith('jruby-complete-') }
22-
return f?.absolutePath
17+
return f?.absolutePath
2318
}
2419
}
2520

@@ -41,20 +36,20 @@ dependencies {
4136

4237
compile "org.eclipse.jetty:jetty-server:${jettyVersion}"
4338
compile "org.eclipse.jetty:jetty-webapp:${jettyVersion}"
44-
runtime( 'de.saumya.mojo:rubygems:0.2.3@war' ) {
39+
runtime('de.saumya.mojo:rubygems:0.2.3@war') {
4540
// we just want the war file on the classloader for the application
4641
// to find it and use the war-file from filesystem
4742
exclude group: 'org.sonatype.nexus.plugins', module: 'nexus-ruby-tools'
4843
}
4944

5045
testJRubyPrepare "org.jruby:jruby-complete:${jrubyVersion}"
5146

52-
testCompile (spockVersion) {
53-
exclude module : 'groovy-all'
47+
testCompile(spockVersion) {
48+
exclude module: 'groovy-all'
5449
}
5550

56-
integrationTestCompile (spockVersion) {
57-
exclude module : 'groovy-all'
51+
integrationTestCompile(spockVersion) {
52+
exclude module: 'groovy-all'
5853
}
5954

6055
// NOTE: This is used by JRubyPrepareGemsIntegrationSpec
@@ -79,14 +74,14 @@ dependencies {
7974
// This is used by JRubyExecExtensionIntegrationSpec
8075
integrationTestGems "org.bouncycastle:bcprov-jdk15on:${bcprovVersion}"
8176

82-
gradleTest"org.jruby:jruby-complete:${jrubyVersion}"
77+
gradleTest "org.jruby:jruby-complete:${jrubyVersion}"
8378
gradleTest 'rubygems:credit_card_validator:1.1.0'
8479
gradleTest 'org.bouncycastle:bcprov-jdk15on:1.50'
8580
}
8681

8782
test {
8883
if (gradle.startParameter.isOffline()) {
89-
systemProperties 'TESTS_ARE_OFFLINE' : '1'
84+
systemProperties 'TESTS_ARE_OFFLINE': '1'
9085
}
9186
}
9287

@@ -99,23 +94,23 @@ generateTestConfig {
9994
leafyVersion: leafyVersion
10095
}
10196

102-
task copyIntegrationTestJRuby (type:Copy) {
103-
from ({configurations.testJRubyPrepare.files})
104-
into new File(buildDir,'tmp/integrationTest/flatRepo')
97+
task copyIntegrationTestJRuby(type: Copy) {
98+
from({ configurations.testJRubyPrepare.files })
99+
into new File(buildDir, 'tmp/integrationTest/flatRepo')
105100
}
106101

107102
integrationTest {
108-
if(gradle.startParameter.isOffline()) {
109-
systemProperties 'TESTS_ARE_OFFLINE' : '1'
103+
if (gradle.startParameter.isOffline()) {
104+
systemProperties 'TESTS_ARE_OFFLINE': '1'
110105
}
111106
dependsOn copyIntegrationTestJRuby
112107
}
113108

114-
task installGroovyDoc (type : Copy) {
115-
from ({new File(buildDir,'docs/groovydoc')}) {
109+
task installGroovyDoc(type: Copy) {
110+
from({ new File(buildDir, 'docs/groovydoc') }) {
116111
include '**'
117112
}
118-
into {new File(project.properties.jrubyGradleWebsiteInstallDir,"docs/api/${archivesBaseName}/${version}")}
113+
into { new File(project.properties.jrubyGradleWebsiteInstallDir, "docs/api/${archivesBaseName}/${version}") }
119114
onlyIf { project.hasProperty('jrubyGradleWebsiteInstallDir') }
120115
}
121116

@@ -152,7 +147,7 @@ bintray {
152147
version {
153148
name = project.version
154149
vcsTag = "v${project.version}"
155-
attributes = ['gradle-plugin' : 'com.github.jruby-gradle.base:com.github.jruby-gradle:jruby-gradle-plugin']
150+
attributes = ['gradle-plugin': 'com.github.jruby-gradle.base:com.github.jruby-gradle:jruby-gradle-plugin']
156151
desc = 'The purpose of plugin is to encapsulate useful Gradle functionality for JRuby projects.'
157152

158153
}

0 commit comments

Comments
 (0)