Permalink
Browse files

Look for build.gradle not just the directory

  • Loading branch information...
ShaneMcC committed Jan 17, 2017
1 parent 3b7598f commit d7f4e1deb37dd7a0769b9c1c41e5141c4a422718
Showing with 6 additions and 6 deletions.
  1. +2 −2 build.gradle
  2. +2 −2 gradle/jar.gradle
  3. +2 −2 settings.gradle
View
@@ -60,13 +60,13 @@ dependencies {
bundle group: 'org.kohsuke', name: 'akuma', version: '1.10'
bundle group: 'com.dmdirc', name: 'util', version: 'null-SNAPSHOT'
if (file('modules/sockets').exists()) {
if (file('modules/sockets/build.gradle').exists()) {
bundle project(":sockets")
} else {
bundle group: 'com.dfbnc', name: 'sockets', version: '0.2'
}
if (file('modules/parser').exists()) {
if (file('modules/parser/build.gradle').exists()) {
bundle project(":parser:common")
bundle project(":parser:irc")
} else {
View
@@ -65,15 +65,15 @@ task createVersionConfig {
targetFile << "versions:\n"
targetFile << " dfbnc=" + getGitVersion(project.projectDir) + "\n"
if (file('modules/parser').exists()) {
if (file('modules/parser/build.gradle').exists()) {
targetFile << " parser-common=local: " + getGitVersion(new File(project.projectDir, "modules/parser")) + "\n"
targetFile << " parser-irc=local: " + getGitVersion(new File(project.projectDir, "modules/parser")) + "\n"
} else {
targetFile << " parser-common=bundled: " + getBundledDependencyVersion("com.dmdirc", "parser-common") + "\n"
targetFile << " parser-irc=bundled: " + getBundledDependencyVersion("com.dmdirc", "parser-irc") + "\n"
}
if (file('modules/sockets').exists()) {
if (file('modules/sockets/build.gradle').exists()) {
targetFile << " sockets=local: " + getGitVersion(new File(project.projectDir, "modules/sockets")) + "\n"
} else {
targetFile << " sockets=bundled: " + getBundledDependencyVersion("com.dfbnc", "sockets") + "\n"
View
@@ -1,11 +1,11 @@
rootProject.name = 'dfbnc'
if (file('modules/sockets').exists()) {
if (file('modules/sockets/build.gradle').exists()) {
include ':sockets'
project(':sockets').projectDir = file('modules/sockets')
}
if (file('modules/parser').exists()) {
if (file('modules/parser/build.gradle').exists()) {
include ':parser'
project(':parser').projectDir = new File('modules/parser')

0 comments on commit d7f4e1d

Please sign in to comment.