0
0
mirror of https://github.com/mediathekview/zapp.git synced 2024-09-19 20:02:17 +02:00

Update Android Studio, gradle and libraries

This commit is contained in:
Christine Emrich 2018-09-29 19:05:26 +02:00
parent 25b1cac3f6
commit 92c7cc8453
3 changed files with 18 additions and 13 deletions

View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 28
buildToolsVersion '28.0.2'
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "de.christinecoenen.code.zapp"
@ -34,12 +34,17 @@ android {
}
}
configurations {
cleanedAnnotations
compile.exclude group: 'org.jetbrains' , module:'annotations'
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
// tests
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support:support-annotations:27.1.1'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2', {
exclude group: 'com.android.support', module: 'animated-vector-drawable'
}
@ -56,20 +61,20 @@ dependencies {
androidTestImplementation 'com.android.support.test.espresso:espresso-accessibility:3.0.2'
// support
implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
implementation 'com.android.support:support-v4:28.0.0-rc02'
implementation 'com.android.support:design:28.0.0-rc02'
implementation 'com.android.support:cardview-v7:28.0.0-rc02'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:cardview-v7:28.0.0'
// helper
implementation 'com.google.code.gson:gson:2.8.2'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'commons-io:commons-io:2.6'
// changelog
implementation 'com.github.porokoro.paperboy:paperboy:3.0.0'
// sortable list
implementation 'com.github.woxthebox:draglistview:1.5.4'
implementation 'com.github.woxthebox:draglistview:1.6.2'
// markdown
implementation 'com.github.fiskurgit:MarkdownView:1.1.0'
@ -91,10 +96,10 @@ dependencies {
releaseImplementation 'ch.acra:acra:4.11'
// timber logging
implementation 'com.jakewharton.timber:timber:4.7.0'
implementation 'com.jakewharton.timber:timber:4.7.1'
// joda time
implementation 'joda-time:joda-time:2.9.9'
implementation 'joda-time:joda-time:2.10'
// about libraries view
implementation('com.mikepenz:aboutlibraries:6.0.0@aar') {

View File

@ -9,7 +9,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.2.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

View File

@ -1,6 +1,6 @@
#Wed Mar 28 21:24:06 CEST 2018
#Sat Sep 29 10:53:09 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip