Skip to content

Commit

Permalink
Move custom functions and predicates to a separate module (#126)
Browse files Browse the repository at this point in the history
* Move custom functions and predicates to own module
* Prefix custom functions and predicates
* Zero-arg factory methods for all custom functions

Signed-off-by: Dimitry Solovyov <dimitry@solovyov.lv>
  • Loading branch information
disolovyov committed Jun 28, 2018
1 parent d085298 commit ded0954
Show file tree
Hide file tree
Showing 25 changed files with 567 additions and 515 deletions.
17 changes: 9 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ project(':translation') {
sourceSets.test.java.srcDirs = []

dependencies {
compile "org.apache.tinkerpop:gremlin-core:${tinkerpopVersion}"
compile project(':tinkerpop:cypher-gremlin-extensions')

compile "org.scala-lang:scala-library:${scalaVersion}.${scalaPatchVersion}"
compile "org.scala-lang.modules:scala-java8-compat_${scalaVersion}:0.8.0"
compile("org.opencypher:front-end-${cypherVersion}:${cypherFrontendVersion}") {
Expand All @@ -118,17 +119,17 @@ project(':translation') {
}

scaladoc {
title "${project.ext.title} ${->project.version} API"
title "${project.ext.title} ${-> project.version} API"
}
}

project(':tinkerpop:tinkerpop-common') {
project(':tinkerpop:cypher-gremlin-extensions') {
ext.releaseToMavenCentral = true
ext.title = 'Cypher for Gremlin: TinkerPop Common'
description 'Cypher for Gremlin common classes'
ext.title = 'Cypher for Gremlin: Gremlin language extensions'
description 'Cypher for Gremlin custom functions and predicates for Gremlin'

dependencies {
compile project(':translation')
compile "org.apache.tinkerpop:gremlin-core:${tinkerpopVersion}"
}
}

Expand All @@ -138,7 +139,7 @@ project(':tinkerpop:cypher-gremlin-server-client') {
description 'Gremlin Server client wrapper that can send Cypher queries to a Cypher-enabled Gremlin Server'

dependencies {
compile project(':tinkerpop:tinkerpop-common')
compile project(':translation')

compile "org.apache.tinkerpop:gremlin-driver:${tinkerpopVersion}"
}
Expand All @@ -152,7 +153,7 @@ project(':tinkerpop:cypher-gremlin-server-plugin') {
apply plugin: 'com.github.johnrengelman.shadow'

dependencies {
compile (project(':tinkerpop:tinkerpop-common')) {
compile (project(':translation')) {
exclude group: 'org.apache.tinkerpop'
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
rootProject.name = 'cypher-for-gremlin'

include 'translation'
include 'tinkerpop:tinkerpop-common'
include 'tinkerpop:cypher-gremlin-extensions'
include 'tinkerpop:cypher-gremlin-server-client'
include 'tinkerpop:cypher-gremlin-server-plugin'
include 'tinkerpop:cypher-gremlin-console-plugin'
Expand Down
Loading

0 comments on commit ded0954

Please sign in to comment.