Skip to content

Commit

Permalink
refactoring: add marvin- prefix to all modules
Browse files Browse the repository at this point in the history
  • Loading branch information
beolnix committed Nov 9, 2015
1 parent 3bbec9a commit 3559e82
Show file tree
Hide file tree
Showing 42 changed files with 28 additions and 31 deletions.
32 changes: 15 additions & 17 deletions build.gradle
Expand Up @@ -51,15 +51,19 @@ configurations.all {

dependencies {

compile group: 'com.beolnix.marvin', name: 'api', version: MARVIN_API_VERSION, changing: true
compile group: 'com.beolnix.marvin', name: 'marvin-api', version: MARVIN_API_VERSION, changing: true

compile project(':core')
compile project(':plugin-utils')
compile project(':im-session-utils')
compile project(':marvin-core')
compile project(':marvin-plugin-utils')
compile project(':marvin-im-session-utils')

project(':im-sessions').getAllprojects().each {
compile (it)
}

project(':plugin-providers').getAllprojects().each {
compile (it)
}
}

buildscript {
Expand Down Expand Up @@ -108,16 +112,6 @@ subprojects {
}
}

uploadArchives {
repositories {
mavenDeployer {
pom.groupId = project.group
pom.artifactId = project.name
pom.version = version
}
}
}

repositories {
maven {
url "http://nexus.beolnix.com/content/repositories/releases/"
Expand All @@ -133,6 +127,10 @@ subprojects {
uploadArchives {
repositories {
mavenDeployer {
pom.groupId = project.group
pom.artifactId = project.name
pom.version = version

if (version.toString().endsWith("SNAPSHOT")) {
repository(url: "http://nexus.beolnix.com/content/repositories/snapshots/") {
authentication(userName: System.getenv()['REPO_USER'], password: System.getenv()['REPO_SNAPSHOT_PASSWORD'])
Expand Down Expand Up @@ -182,7 +180,7 @@ subprojects {
}

task packageMarvin(dependsOn: jar) << {
project(':core').copyToLib.execute()
project(':marvin-core').copyToLib.execute()
copyApp.execute()
copyConfig.execute()
copyScripts.execute()
Expand All @@ -209,9 +207,9 @@ task copyConfig(type: Copy) {

task copyApp(type: Copy) {
into("$distrDir")
from('core/build/libs')
from('marvin-core/build/libs')
rename { filename ->
filename.replace "core-${version}", 'core'
filename.replace "marvin-core-${version}", 'core'
}
}

Expand Down
@@ -1,13 +1,12 @@

dependencies {
compile "com.beolnix.marvin:marvin-api:0.2-SNAPSHOT"
compile project(':marvin-im-session-utils')

compile "org.codehaus.groovy:groovy-all:${GROOVY_VERSION}"

compile fileTree(dir:'lib', include: '*.jar')

compile "com.beolnix.marvin:api:0.2-SNAPSHOT"

compile project(':im-session-utils')

compile "org.springframework:spring-core:${SPRING_VERSION}"
compile "org.springframework:spring-beans:${SPRING_VERSION}"

Expand Down
File renamed without changes.
9 changes: 4 additions & 5 deletions core/build.gradle → marvin-core/build.gradle
@@ -1,15 +1,14 @@

dependencies {
compile "com.beolnix.marvin:marvin-api:0.2-SNAPSHOT"
compile project(':im-sessions:marvin-irc-im-session')
compile project(':plugin-providers:marvin-osgi-plugin-provider')

compile "com.beolnix:args-parser:0.3"
compile "org.codehaus.groovy:groovy-all:${GROOVY_VERSION}"

compile fileTree(dir:'lib', include: '*.jar')

compile "com.beolnix.marvin:api:0.2-SNAPSHOT"

compile project(':im-sessions:irc-im-session')
compile project(':plugin-providers:osgi-plugin-provider')

compile "org.springframework:spring-core:${SPRING_VERSION}"
compile "org.springframework:spring-beans:${SPRING_VERSION}"
compile "org.springframework:spring-context:${SPRING_VERSION}"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@

dependencies {
compile "com.beolnix.marvin:api:0.2-SNAPSHOT"
compile "com.beolnix.marvin:marvin-api:0.2-SNAPSHOT"

testCompile "junit:junit:${JUNIT_VERSION}"
}
@@ -1,8 +1,9 @@

dependencies {
compile "com.beolnix.marvin:api:0.2-SNAPSHOT"
compile "com.beolnix.marvin:marvin-api:0.2-SNAPSHOT"

compile "org.apache.felix:org.apache.felix.framework:${FELIX_VERSION}"

compile "log4j:log4j:${LOG4J_VERSION}"

testCompile "junit:junit:${JUNIT_VERSION}"
Expand Down
@@ -1,11 +1,11 @@

dependencies {
compile "com.beolnix.marvin:marvin-api:0.2-SNAPSHOT"

compile "org.codehaus.groovy:groovy-all:${GROOVY_VERSION}"

compile fileTree(dir:'lib', include: '*.jar')

compile "com.beolnix.marvin:api:0.2-SNAPSHOT"

compile "org.springframework:spring-core:${SPRING_VERSION}"
compile "org.springframework:spring-beans:${SPRING_VERSION}"

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
@@ -1 +1 @@
include 'core', 'im-sessions:irc-im-session', 'plugin-providers:osgi-plugin-provider', 'plugin-utils', 'im-session-utils'
include 'marvin-core', 'im-sessions:marvin-irc-im-session', 'plugin-providers:marvin-osgi-plugin-provider', 'marvin-plugin-utils', 'marvin-im-session-utils'

0 comments on commit 3559e82

Please sign in to comment.