0
0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 20:03:05 +02:00

Merge pull request #3667 from timrae/materialdialogs-jitpack

Update material dialogs version
This commit is contained in:
Tim Rae 2015-09-25 20:33:36 +09:00
commit 9bd4d12dff
4 changed files with 12 additions and 7 deletions

View File

@ -7,14 +7,14 @@ android:
- android-23
- extra-android-support
- extra-android-m2repository
- sys-img-armeabi-v7a-android-23
- sys-img-armeabi-v7a-android-21
branches:
except:
- master
# Emulator Management: Create, Start and Wait
before_script:
- echo no | android create avd --force -n test -t android-22 --sdcard 10M --abi armeabi-v7a
- echo no | android create avd --force -n test -t android-21 --sdcard 10M --abi armeabi-v7a
- emulator -avd test -no-skin -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &

View File

@ -7,7 +7,8 @@ android {
defaultConfig {
applicationId "com.ichi2.anki"
minSdkVersion 8
targetSdkVersion 23
//TODO: Update targetSdkVersion to v23 when Android issue 183547 is fixed or we switch to MaterialDrawer library
targetSdkVersion 22
testApplicationId "com.ichi2.anki.tests"
}
signingConfigs {
@ -36,8 +37,11 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:design:23.0.1'
compile 'com.afollestad:material-dialogs:0.7.6.0'
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:design:22.2.1'
compile('com.afollestad.material-dialogs:core:0.8.1.0@aar') {
transitive = true
}
compile 'net.i2p.android.ext:floatingactionbutton:1.10.0'
compile 'ch.acra:acra:4.6.2'
compile 'com.jakewharton.timber:timber:2.5.1'

View File

@ -5,8 +5,8 @@ def artifactId = "api"
def version = "1.0.0alpha2"
android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 23
buildToolsVersion "23.0.1"
defaultConfig {
minSdkVersion 8

View File

@ -15,5 +15,6 @@ buildscript {
allprojects {
repositories {
jcenter()
maven { url "https://jitpack.io" }
}
}