Skip to content
This repository has been archived by the owner on Mar 27, 2020. It is now read-only.

boring build system stuff #156

Merged
merged 4 commits into from
Jan 8, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

23 changes: 0 additions & 23 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/encodings.xml

This file was deleted.

19 changes: 0 additions & 19 deletions .idea/gradle.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/misc.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/modules.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/scopes/scope_settings.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/vcs.xml

This file was deleted.

1,726 changes: 0 additions & 1,726 deletions .idea/workspace.xml

This file was deleted.

37 changes: 33 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,15 +2,44 @@
language: android
jdk: oraclejdk7

env:
global:
# switch glibc to a memory conserving mode
- MALLOC_ARENA_MAX=2
# wait 5 minutes for adb to connect to emulator. Travis-ci cancels a
# stalled build after 10 minutes, so this should be shorter than that so
# there is time for the build to report the error.
- ADB_INSTALL_TIMEOUT=5

android:
components:
- android-22
- build-tools-22.0.1
- extra-android-m2repository
- tools
- platform-tools
- extra-android-m2repository
- build-tools-22.0.1
- android-22
licenses:
# only approve the Android software licenses, they match sources
# the Google licenses mean proprietary software with binary blobs
- 'android-sdk-preview-license-52d11cd2'
- 'android-sdk-license-.+'

sudo: false
notifications:
email: false

script:
- ./gradlew clean build
# 'assemble' everything and run all checks that do not require a device/emulator
# first with the wrapper, then with the system gradle
- ./gradlew clean build
- gradle clean build
# start the emulator after the build to conserve memory
- echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
- emulator -avd test -no-skin -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
# now run the tests that require a device/emulator
- gradle connectedCheck

after_failure:
- find * -name lint-results.xml | xargs cat
132 changes: 0 additions & 132 deletions app/app.iml

This file was deleted.

15 changes: 15 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

apply plugin: 'com.android.application'
apply plugin: 'io.fabric'
apply plugin: 'witness'

android {
compileSdkVersion 22
@@ -33,3 +34,17 @@ dependencies {
transitive = true;
}
}

// generate using: `gradle -q calculateChecksums | sort -V`
dependencyVerification {
verify = [
'com.android.support:support-annotations:ab6b131ab0e1edd165d21fb4c3edadeacbee9539aa166f7f7cbae05b60dc207a',
'com.android.support:support-v4:355a11466727e8ba00e239416aec55ac3cd3fb4ffc9d20c4a33373085c050bd1',
'com.crashlytics.sdk.android:answers:5af101ef6b58a26dd32cfc13f53c63c33fb2fdcdf6990241eca22e7a8c842847',
'com.crashlytics.sdk.android:beta:6d7dce749fd70fa20adcf089aaed5d52f9e8e2a08f6666336e90a7555cee9718',
'com.crashlytics.sdk.android:crashlytics-core:2f35df62420723d4a8e58f58a376fb640d11e1660656a9aa2959bb041b5b1d15',
'com.crashlytics.sdk.android:crashlytics:5bbf76250f6349baf173e082b4f7d14e777aa5a7510f9bea267b445bc439247d',
'com.google.code.gson:gson:9466512cd8cf0bd66a8a3661685373f7b3deafded11096e044926ff5c82c7a4c',
'io.fabric.sdk.android:fabric:15465f60ee6a2bb53dcf84e8dd939ce92dffbffc73bfdd3432b63fa6ee2f7bae',
]
}
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'
classpath 'io.fabric.tools:gradle:1.+'
classpath files('libs/gradle-witness.jar')
}
}

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
distributionSha256Sum=420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418
Binary file added libs/gradle-witness.jar
Binary file not shown.
29 changes: 0 additions & 29 deletions panic-button.iml

This file was deleted.