upgrade to Android Api 26, update dependencies
This commit is contained in:
parent
309c89eefc
commit
722908ab90
2 changed files with 31 additions and 30 deletions
|
@ -1,12 +1,12 @@
|
|||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 25
|
||||
buildToolsVersion "25.0.3"
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion "26.0.1"
|
||||
defaultConfig {
|
||||
applicationId "com.keylesspalace.tusky"
|
||||
minSdkVersion 15
|
||||
targetSdkVersion 25
|
||||
targetSdkVersion 26
|
||||
versionCode 25
|
||||
versionName "1.1.4"
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
|
@ -28,40 +28,41 @@ android {
|
|||
}
|
||||
}
|
||||
|
||||
ext.supportLibraryVersion = '26.0.0'
|
||||
|
||||
dependencies {
|
||||
compile fileTree(include: ['*.jar'], dir: 'libs')
|
||||
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
|
||||
exclude group: 'com.android.support', module: 'support-annotations'
|
||||
})
|
||||
compile('com.mikepenz:materialdrawer:5.9.1@aar') {
|
||||
compile('com.mikepenz:materialdrawer:5.9.5@aar') {
|
||||
transitive = true
|
||||
}
|
||||
compile 'com.android.support:appcompat-v7:25.3.1'
|
||||
compile 'com.android.support:customtabs:25.3.1'
|
||||
compile 'com.android.support:recyclerview-v7:25.3.1'
|
||||
compile 'com.android.support:support-v13:25.3.1'
|
||||
compile 'com.android.support:design:25.3.1'
|
||||
compile 'com.android.support:exifinterface:25.3.1'
|
||||
compile 'com.squareup.retrofit2:retrofit:2.2.0'
|
||||
compile 'com.squareup.retrofit2:converter-gson:2.2.0'
|
||||
compile 'com.squareup.picasso:picasso:2.5.2'
|
||||
compile 'com.squareup.okhttp3:okhttp:3.7.0'
|
||||
compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
|
||||
compile 'com.pkmmte.view:circularimageview:1.1'
|
||||
compile 'com.github.varunest:sparkbutton:1.0.5'
|
||||
compile 'com.github.chrisbanes:PhotoView:2.0.0'
|
||||
compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar'
|
||||
compile 'com.theartofdev.edmodo:android-image-cropper:2.4.3'
|
||||
compile 'org.jsoup:jsoup:1.10.2'
|
||||
compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
|
||||
compile('org.eclipse.paho:org.eclipse.paho.android.service:1.1.1') {
|
||||
exclude module: 'support-v4'
|
||||
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
|
||||
compile "com.android.support:customtabs:$supportLibraryVersion"
|
||||
compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
|
||||
compile "com.android.support:support-v13:$supportLibraryVersion"
|
||||
compile "com.android.support:design:$supportLibraryVersion"
|
||||
compile "com.android.support:exifinterface:$supportLibraryVersion"
|
||||
compile "com.squareup.retrofit2:retrofit:2.3.0"
|
||||
compile "com.squareup.retrofit2:converter-gson:2.3.0"
|
||||
compile "com.squareup.picasso:picasso:2.5.2"
|
||||
compile "com.squareup.okhttp3:okhttp:3.8.1"
|
||||
compile "com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0"
|
||||
compile "com.pkmmte.view:circularimageview:1.1"
|
||||
compile "com.github.varunest:sparkbutton:1.0.5"
|
||||
compile "com.github.chrisbanes:PhotoView:2.1.3"
|
||||
compile "com.mikepenz:google-material-typeface:3.0.1.0.original@aar"
|
||||
compile "com.theartofdev.edmodo:android-image-cropper:2.4.7"
|
||||
compile "org.jsoup:jsoup:1.10.3"
|
||||
compile "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.1"
|
||||
compile("org.eclipse.paho:org.eclipse.paho.android.service:1.1.1") {
|
||||
exclude module: "support-v4"
|
||||
}
|
||||
testCompile 'junit:junit:4.12'
|
||||
testCompile "junit:junit:4.12"
|
||||
//room
|
||||
compile 'android.arch.persistence.room:runtime:1.0.0-alpha3'
|
||||
annotationProcessor "android.arch.persistence.room:compiler:1.0.0-alpha3"
|
||||
googleCompile 'com.google.firebase:firebase-crash:10.0.1'
|
||||
compile "android.arch.persistence.room:runtime:1.0.0-alpha5"
|
||||
annotationProcessor 'android.arch.persistence.room:compiler:1.0.0-alpha5'
|
||||
googleCompile 'com.google.firebase:firebase-crash:11.0.4'
|
||||
}
|
||||
|
||||
apply plugin: 'com.google.gms.google-services'
|
|
@ -9,7 +9,7 @@ buildscript {
|
|||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
classpath 'com.google.gms:google-services:3.0.0'
|
||||
classpath 'com.google.gms:google-services:3.1.0'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue