Merge pull request #30 from lookout/issue-29

Remove unnecessary dependency on assembe from the JRuby
This commit is contained in:
R. Tyler Croy 2015-06-08 15:06:17 -07:00
commit 21c1e77eca
3 changed files with 4 additions and 4 deletions

View File

@ -21,7 +21,7 @@ apply plugin: "com.jfrog.bintray"
apply plugin: "com.gradle.plugin-publish"
apply plugin: 'org.ysb33r.gradletest'
version = '0.3.3'
version = '0.4.0'
group = 'com.github.lookout'
description = 'Gradle plugin for building a prim and proper Lookout service artifact'

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="service-artifact-plugin" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.lookout" external.system.module.version="0.3.3" type="JAVA_MODULE" version="4">
<module external.linked.project.id="service-artifact-plugin" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.lookout" external.system.module.version="0.4.0" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />

View File

@ -95,8 +95,6 @@ class JRuby extends AbstractServiceExtension {
'META-INF/INDEX.LIST', 'META-INF/*.SF',
'META-INF/*.DSA', 'META-INF/*.RSA'
dependsOn this.project.tasks.findByName('assemble')
jruby {
defaultMainClass()
defaultGems()
@ -106,5 +104,7 @@ class JRuby extends AbstractServiceExtension {
initScript runnable()
}
}
this.project.tasks.findByName('assemble').dependsOn jar
}
}