diff --git a/build.gradle b/build.gradle index d227775d37..f3b09c0f75 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' classpath 'com.google.gms:google-services:3.0.0' } } @@ -30,7 +30,7 @@ configurations.all { } ext { - supportLibraryVersion = '26.1.0' + supportLibraryVersion = '27.1.0' googleLibraryVersion = '11.2.2' androidLibraryVersion = '1.0.40' @@ -69,12 +69,12 @@ android { javaMaxHeapSize "4g" } - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 27 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -226,7 +226,9 @@ dependencies { // implementation "com.google.firebase:firebase-core:${googleLibraryVersion}" implementation 'org.parceler:parceler-api:1.1.9' annotationProcessor 'org.parceler:parceler:1.1.9' - implementation 'com.github.bumptech.glide:glide:3.7.0' + implementation ('com.github.bumptech.glide:glide:3.7.0') { + exclude group: "com.android.support" + } implementation 'com.caverock:androidsvg:1.2.1' implementation "com.android.support:support-annotations:${supportLibraryVersion}" implementation 'com.google.code.gson:gson:2.8.2' @@ -249,7 +251,7 @@ dependencies { //androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}" implementation 'org.jetbrains:annotations:15.0' - androidTestCompile 'tools.fastlane:screengrab:1.0.0' + androidTestImplementation 'tools.fastlane:screengrab:1.0.0' } configurations.all { diff --git a/gradle.properties b/gradle.properties index e8b10e2b5c..e69de29bb2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +0,0 @@ -android.enableAapt2=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 45b63bc7e5..4decf17a36 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 05 19:09:31 CEST 2017 +#Tue Apr 03 16:56:17 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/src/main/java/com/owncloud/android/media/MediaService.java b/src/main/java/com/owncloud/android/media/MediaService.java index 83f4aab77f..22ccb7bead 100644 --- a/src/main/java/com/owncloud/android/media/MediaService.java +++ b/src/main/java/com/owncloud/android/media/MediaService.java @@ -34,7 +34,7 @@ import android.net.wifi.WifiManager; import android.net.wifi.WifiManager.WifiLock; import android.os.IBinder; import android.os.PowerManager; -import android.support.v7.app.NotificationCompat; +import android.support.v4.app.NotificationCompat; import android.widget.Toast; import com.owncloud.android.R; diff --git a/src/main/res/values-v19/styles.xml b/src/main/res/values-v19/styles.xml index eeb57c04c2..f74e4bcada 100644 --- a/src/main/res/values-v19/styles.xml +++ b/src/main/res/values-v19/styles.xml @@ -1,7 +1,7 @@ - - - - - - - @@ -200,7 +200,7 @@ fix see: http://stackoverflow.com/questions/27187353/dialog-buttons-with-long-text-not-wrapping-squeezed-out-material-theme-on-an --> - - - -