Commit 4525f2ab authored by Robert Hitt's avatar Robert Hitt

Merge branch '30-fix-CI' into 'master'

Resolve "Fix CI"

Closes #30

See merge request !10
parents 61f0f266 393258d3
Pipeline #1915 passed with stages
in 2 minutes and 23 seconds
image: openjdk:8-jdk image: jangrewe/gitlab-ci-android
variables:
ANDROID_COMPILE_SDK: "25"
ANDROID_BUILD_TOOLS: "26.0.2"
ANDROID_SDK_TOOLS: "24.4.1"
before_script: before_script:
- apt-get --quiet update --yes - export GRADLE_USER_HOME=$(pwd)/.gradle
- apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
- wget --quiet --output-document=android-sdk.tgz https://dl.google.com/android/android-sdk_r${ANDROID_SDK_TOOLS}-linux.tgz
- tar --extract --gzip --file=android-sdk.tgz
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_COMPILE_SDK}
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter platform-tools
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter build-tools-${ANDROID_BUILD_TOOLS}
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-android-m2repository
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-google_play_services
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-m2repository
- export ANDROID_HOME=$PWD/android-sdk-linux
- export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
- chmod +x ./gradlew - chmod +x ./gradlew
stages: stages:
...@@ -30,10 +14,9 @@ build: ...@@ -30,10 +14,9 @@ build:
- ./gradlew assembleDebug - ./gradlew assembleDebug
artifacts: artifacts:
paths: paths:
- app/build/outputs/ - app/build/outputs/apk/app-debug.apk
unitTests: unitTests:
stage: test stage: test
script: script:
- ./gradlew test - ./gradlew test
\ No newline at end of file
\ No newline at end of file
...@@ -14,13 +14,12 @@ repositories { ...@@ -14,13 +14,12 @@ repositories {
maven { url 'https://maven.fabric.io/public' } maven { url 'https://maven.fabric.io/public' }
} }
apply plugin: 'android-apt'
apply plugin: 'realm-android' apply plugin: 'realm-android'
apply plugin: 'me.tatarka.retrolambda' // apply plugin: 'me.tatarka.retrolambda'
android { android {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion '26.0.1' buildToolsVersion '26.0.2'
defaultConfig { defaultConfig {
applicationId "srct.whatsopen" applicationId "srct.whatsopen"
minSdkVersion 16 minSdkVersion 16
...@@ -55,6 +54,7 @@ dependencies { ...@@ -55,6 +54,7 @@ dependencies {
compile 'com.squareup.retrofit2:retrofit:2.1.0' compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2' compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2'
compile 'com.squareup.retrofit2:converter-gson:2.1.0' compile 'com.squareup.retrofit2:converter-gson:2.1.0'
//noinspection GradleCompatible
compile 'com.android.support:appcompat-v7:26.0.1' compile 'com.android.support:appcompat-v7:26.0.1'
compile 'com.android.support:cardview-v7:26.0.1' compile 'com.android.support:cardview-v7:26.0.1'
compile 'com.android.support:support-v4:26.0.1' compile 'com.android.support:support-v4:26.0.1'
...@@ -63,7 +63,7 @@ dependencies { ...@@ -63,7 +63,7 @@ dependencies {
compile 'io.reactivex:rxjava:1.1.4' compile 'io.reactivex:rxjava:1.1.4'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'com.jakewharton:butterknife:8.5.1' compile 'com.jakewharton:butterknife:8.5.1'
apt 'com.jakewharton:butterknife-compiler:8.5.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5' debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
......
...@@ -8,7 +8,7 @@ buildscript { ...@@ -8,7 +8,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'io.realm:realm-gradle-plugin:3.0.0' classpath 'io.realm:realm-gradle-plugin:3.0.0'
classpath 'me.tatarka:gradle-retrolambda:3.3.1' classpath 'me.tatarka:gradle-retrolambda:3.3.1'
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2' classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
......
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment