[GitHub] dubeejw closed pull request #234: Switch to Maven based dependency

[GitBox <gi...@apache.org>]

dubeejw closed pull request #234: Switch to Maven based dependency
URL: https://github.com/apache/incubator-openwhisk-cli/pull/234
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index 42934f0a..c5713877 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,8 @@ before_script:
   - ./incubator-openwhisk/tools/travis/setup.sh
 
 script:
+  - cd $TRAVIS_BUILD_DIR/../incubator-openwhisk
+  - ./gradlew install
   - cd $TRAVIS_BUILD_DIR
   - ./gradlew --console=plain release
   - ./tools/travis/test_openwhisk.sh
diff --git a/settings.gradle b/settings.gradle
index 4f5a4d8b..fc465f7c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,29 +6,14 @@ if (!owDirectory.exists()) {
         "Environment variable OPENWHISK_HOME must point to a valid OpenWhisk build", null)
 }
 
-include 'clitests'; project(':clitests').projectDir = new File(owDirectory, 'tests')
-
-[   'common:scala',
-    'core:controller',
-    'core:invoker',
-    'actionRuntimes:nodejs6Action',
-    'actionRuntimes:actionProxy',
-    'actionRuntimes:pythonAction',
-    'actionRuntimes:python2Action',
-    'actionRuntimes:javaAction',
-    'actionRuntimes:swift3.1.1Action',
-    'sdk:docker',
-    'tests:dat:blackbox:badaction',
-    'tests:dat:blackbox:badproxy'
-].each() { p ->
-    include p
-    project(':'+p).projectDir = new File(owDirectory, p.replaceAll(':','/'))
-}
-
 include 'tests'
 
 rootProject.name = 'openwhisk-cli'
 
+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 22a54ec0..a46a1659 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -2,14 +2,10 @@ apply plugin: 'scala'
 apply plugin: 'eclipse'
 compileTestScala.options.encoding = 'UTF-8'
 
-evaluationDependsOn(':clitests')
-evaluationDependsOn(':common:scala')
-
-project(':clitests').test.onlyIf = {false}
-compileTestScala.dependsOn(':clitests:compileTestScala')
 
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 
 tasks.withType(Test) {
@@ -29,12 +25,8 @@ task testWithoutCredentials(type: Test) {
 
 dependencies {
     compile "org.scala-lang:scala-library:${gradle.scala.version}"
-    compile project(':clitests')
-    compile project(':clitests').sourceSets.test.output
-
-    compile project(':common:scala')
-    compile project(':core:controller')
-    compile project(':core:invoker')
+    compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
+    compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources"
 }
 
 tasks.withType(ScalaCompile) {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services