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

Commit

Permalink
Merge pull request #112 from grandcentrix/gradle_4.1
Browse files Browse the repository at this point in the history
Upgrade gradlew to 4.1
  • Loading branch information
StefMa authored Sep 22, 2017
2 parents 2167ac8 + 19e64fb commit 6bc2ef3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
9 changes: 7 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ android:
components:
# Uncomment the lines below if you want to
# use the latest revision of Android SDK Tools
- tools
- platform-tools
- tools

# The BuildTools version used by your project
- build-tools-25.0.2

# The SDK version used to compile your project
- android-22
- android-25

# Additional components
Expand All @@ -23,16 +25,19 @@ android:

# Specify at least one system image,
# if you need to run emulator(s) during your tests
- sys-img-armeabi-v7a-android-21
- sys-img-armeabi-v7a-android-22


before_script:

# First assemble the project before launching the emulator
- ./gradlew assemble

# List available emulators
- android list targets

# Emulator Management: Create, Start and Wait
- echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
- emulator -avd test -no-skin -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
}
}
Expand All @@ -30,7 +30,7 @@ ext {

supportLibraryVersion = '25.2.0'

bintrayVersion = '0.3.4'
bintrayVersion = '0.5.0'
junitVersion = '4.12'
mockitoVersion = '1.10.19'
assertjVersion = '2.5.0'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Mar 13 12:02:41 GMT 2017
#Thu Sep 21 07:46:32 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 comments on commit 6bc2ef3

Please sign in to comment.