From e552ed10543002e94a2dde1f538085481c50710c Mon Sep 17 00:00:00 2001 From: Chetan Mehrotra Date: Thu, 11 Oct 2018 12:36:33 +0530 Subject: [PATCH 1/3] Switch to Scala 2.12.7 --- .travis.yml | 2 +- settings.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c33c770..cdc2109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ sudo: required group: deprecated-2017Q3 language: scala scala: -- 2.11.11 +- 2.12.7 services: - docker before_install: diff --git a/settings.gradle b/settings.gradle index 92db886..4a8eccf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,7 +9,7 @@ gradle.ext.openwhisk = [ ] gradle.ext.scala = [ - version: '2.11.8', + version: '2.12.7', compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import'] ] From 3c5c8b5b3e2bf3e93bc27587f5568292494d90ec Mon Sep 17 00:00:00 2001 From: Chetan Mehrotra Date: Thu, 11 Oct 2018 12:37:05 +0530 Subject: [PATCH 2/3] Temporarily use scala-2-12 branch of core repo to build --- tools/travis/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh index 3424cdb..ea57cd7 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/setup.sh @@ -29,6 +29,6 @@ cd $HOMEDIR git clone https://github.com/apache/incubator-openwhisk-utilities.git # clone main openwhisk repo. for testing purposes -git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk +git clone --depth=1 --single-branch -b scala-2-12 https://github.com/chetanmeh/incubator-openwhisk.git openwhisk cd openwhisk ./tools/travis/setup.sh From 0651f0f50a59676c2bef54b4eef56a990d9af2d6 Mon Sep 17 00:00:00 2001 From: Chetan Mehrotra Date: Thu, 18 Oct 2018 10:29:39 +0530 Subject: [PATCH 3/3] Revert "Temporarily use scala-2-12 branch of core repo to build" This reverts commit 3c5c8b5 --- tools/travis/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh index ea57cd7..3424cdb 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/setup.sh @@ -29,6 +29,6 @@ cd $HOMEDIR git clone https://github.com/apache/incubator-openwhisk-utilities.git # clone main openwhisk repo. for testing purposes -git clone --depth=1 --single-branch -b scala-2-12 https://github.com/chetanmeh/incubator-openwhisk.git openwhisk +git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk cd openwhisk ./tools/travis/setup.sh