openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csantan...@apache.org
Subject [incubator-openwhisk-runtime-swift] 01/02: Switch to Maven based dependency
Date Mon, 26 Feb 2018 23:01:20 GMT
This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-swift.git

commit 22a2e272e81bfbc7c19e7c88b8f8fb94340b445f
Author: Chetan Mehrotra <chetanm@adobe.com>
AuthorDate: Thu Feb 22 18:29:11 2018 +0530

    Switch to Maven based dependency
    
    This is required for apache/incubator-openwhisk#3277
---
 settings.gradle       | 12 ++++--------
 tests/build.gradle    |  7 +++----
 tools/travis/build.sh | 23 ++++++++++++-----------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 3ebed6d..6476232 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 'core:swift3.1.1Action'
@@ -15,6 +7,10 @@ include 'core:swift41Action'
 
 rootProject.name = 'runtime-swift'
 
+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 124229c..3b60d6c 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -2,10 +2,9 @@ apply plugin: 'scala'
 apply plugin: 'eclipse'
 compileTestScala.options.encoding = 'UTF-8'
 
-evaluationDependsOn(':whisktests')
-
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 
 tasks.withType(Test) {
@@ -19,8 +18,8 @@ tasks.withType(Test) {
 
 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 f0aa297..7f87bbb 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -11,15 +11,6 @@ export OPENWHISK_HOME=$WHISKDIR
 
 IMAGE_PREFIX="testing"
 
-# Build runtime
-cd $ROOTDIR
-TERM=dumb ./gradlew \
-:core:swift3.1.1Action:distDocker \
-:core:swift40Action:distDocker \
-:core:swift41Action:distDocker \
--PdockerImagePrefix=${IMAGE_PREFIX}
-
-
 # Build OpenWhisk
 cd $WHISKDIR
 
@@ -31,6 +22,16 @@ docker tag openwhisk/invoker ${IMAGE_PREFIX}/invoker
 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:swift3.1.1Action:distDocker \
+:core:swift40Action:distDocker \
+:core:swift41Action:distDocker \
+-PdockerImagePrefix=${IMAGE_PREFIX}

-- 
To stop receiving notification emails like this one, please contact
csantanapr@apache.org.

Mime
View raw message