From 7471fed31c625c353b5ebd71e5f5e52d58e88d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 15 Feb 2016 16:34:27 +0000
Subject: [PATCH] CI: Use gradlew

---
 .gitlab-ci.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d9434d7f..f7a2d3041 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,17 +18,13 @@ before_script:
   - export PATH="$ANDROID_HOME/build-tools/23.0.2:$PATH"
   - echo " == Installing Android emulator images"
   - echo y | android -s update sdk --no-ui -a -t android-10
-  - echo " == Installing Gradle"
-  - wget -q -O gradle.zip https://services.gradle.org/distributions/gradle-2.9-bin.zip
-  - unzip -q gradle.zip
-  - export PATH="$PWD/gradle-2.9/bin:$PATH"
 
 test:
   script:
     - echo " == Running build"
-    - gradle build
+    - ./gradlew build
     - echo " == Running checkstyle"
-    - gradle checkstyle
+    - ./gradlew checkstyle
     - echo " == Creating Android 2.3.7 emulator"
     - echo no | android create avd --force -n fcl-test -t android-10 -b armeabi
     - echo " == Starting Android 2.3.7 emulator"
@@ -36,6 +32,6 @@ test:
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82
     - echo " == Running Android tests on the 2.3.7 emulator"
-    - ADB_INSTALL_TIMEOUT=8 gradle connectedCheck || { adb logcat -d '*:W'; exit 1; }
+    - ADB_INSTALL_TIMEOUT=8 ./gradlew connectedCheck || { adb logcat -d '*:W'; exit 1; }
     - echo " == Stopping Android 2.3.7 emulator"
     - kill $!