Use Maven based dependency instead of gradle project based dependency (#17)
diff --git a/settings.gradle b/settings.gradle
index 87ddbf3..9f1b09c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,11 +1,3 @@
-def owPath = System.getenv("OPENWHISK_HOME") ?: '../open'
-def owDirectory = new File(owPath)
-
-include 'common:scala'; project(':common:scala').projectDir = new File(owDirectory, 'common/scala')
-include 'core:controller'; project(':core:controller').projectDir = new File(owDirectory, 'core/controller')
-include 'core:invoker'; project(':core:invoker').projectDir = new File(owDirectory, 'core/invoker')
-include 'whisktests'; project(':whisktests').projectDir = new File(owDirectory, 'tests')
-
include 'tests'
include 'sdk:docker'
@@ -16,6 +8,10 @@
rootProject.name = 'runtime-docker'
+gradle.ext.openwhisk = [
+ version: '1.0.0-SNAPSHOT'
+]
+
gradle.ext.scala = [
version: '2.11.8',
compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
diff --git a/tests/build.gradle b/tests/build.gradle
index d95b884..8ab42fd 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -2,10 +2,9 @@
apply plugin: 'eclipse'
compileTestScala.options.encoding = 'UTF-8'
-evaluationDependsOn(':whisktests')
-
repositories {
mavenCentral()
+ mavenLocal()
}
tasks.withType(Test) {
@@ -25,8 +24,8 @@
dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
- compile project(':whisktests')
- compile project(':whisktests').sourceSets.test.output
+ compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
+ compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources"
}
tasks.withType(ScalaCompile) {
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 1d7cf07..fdb3e57 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -11,14 +11,6 @@
IMAGE_PREFIX="testing"
-# Build runtime
-cd $ROOTDIR
-TERM=dumb ./gradlew \
-:core:actionProxy:distDocker \
-:sdk:docker:distDocker \
--PdockerImagePrefix=${IMAGE_PREFIX}
-
-
# Build OpenWhisk
cd $WHISKDIR
@@ -30,6 +22,19 @@
docker pull openwhisk/nodejs6action
docker tag openwhisk/nodejs6action ${IMAGE_PREFIX}/nodejs6action
+TERM=dumb ./gradlew \
+:common:scala:install \
+:core:controller:install \
+:core:invoker:install \
+:tests:install
+
+# Build runtime
+cd $ROOTDIR
+TERM=dumb ./gradlew \
+:core:actionProxy:distDocker \
+:sdk:docker:distDocker \
+-PdockerImagePrefix=${IMAGE_PREFIX}
+
