Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
whats-open-android
Commits
3a68f3cb
Commit
3a68f3cb
authored
Dec 30, 2017
by
David Haynes
🙆
Browse files
Attempt a band-aid fix for CI
- update gradle build config as well
parent
61f0f266
Pipeline
#1911
failed with stages
in 4 minutes and 6 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
3a68f3cb
image
:
openjdk:8-j
dk
image
:
npetrovsky/docker-android-sdk-n
dk
variables
:
ANDROID_COMPILE_SDK
:
"
25"
...
...
@@ -6,18 +6,6 @@ variables:
ANDROID_SDK_TOOLS
:
"
24.4.1"
before_script
:
-
apt-get --quiet update --yes
-
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
stages
:
...
...
@@ -35,5 +23,4 @@ build:
unitTests
:
stage
:
test
script
:
-
./gradlew test
\ No newline at end of file
-
./gradlew test
\ No newline at end of file
app/build.gradle
View file @
3a68f3cb
...
...
@@ -14,13 +14,12 @@ repositories {
maven
{
url
'https://maven.fabric.io/public'
}
}
apply
plugin:
'android-apt'
apply
plugin:
'realm-android'
apply
plugin:
'me.tatarka.retrolambda'
android
{
compileSdkVersion
26
buildToolsVersion
'26.0.
1
'
buildToolsVersion
'26.0.
2
'
defaultConfig
{
applicationId
"srct.whatsopen"
minSdkVersion
16
...
...
@@ -55,6 +54,7 @@ dependencies {
compile
'com.squareup.retrofit2:retrofit:2.1.0'
compile
'com.squareup.retrofit2:adapter-rxjava:2.0.2'
compile
'com.squareup.retrofit2:converter-gson:2.1.0'
//noinspection GradleCompatible
compile
'com.android.support:appcompat-v7:26.0.1'
compile
'com.android.support:cardview-v7:26.0.1'
compile
'com.android.support:support-v4:26.0.1'
...
...
@@ -63,7 +63,7 @@ dependencies {
compile
'io.reactivex:rxjava:1.1.4'
testCompile
'junit:junit:4.12'
compile
'com.jakewharton:butterknife:8.5.1'
a
pt
'com.jakewharton:butterknife-compiler:8.5.1'
a
nnotationProcessor
'com.jakewharton:butterknife-compiler:8.5.1'
debugCompile
'com.squareup.leakcanary:leakcanary-android:1.5'
releaseCompile
'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
testCompile
'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
...
...
build.gradle
View file @
3a68f3cb
...
...
@@ -8,7 +8,7 @@ buildscript {
}
dependencies
{
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
'me.tatarka:gradle-retrolambda:3.3.1'
classpath
'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment