aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-10-06 22:28:05 +0200
committerChristian Schneppe <christian@pix-art.de>2017-10-06 22:28:05 +0200
commit9b2fab93f3c26a3f602faed0b48f577af32c07ae (patch)
treede56c24a5680986ba4749c8a6dd155fd7413bbc0
parent97033b52339e49fc8bd3b655cd5bc37a24115f90 (diff)
upgraded build tools and gradle file
Diffstat (limited to '')
-rw-r--r--build.gradle18
-rw-r--r--libs/MemorizingTrustManager/build.gradle2
2 files changed, 12 insertions, 8 deletions
diff --git a/build.gradle b/build.gradle
index e593f4ff7..a26362f32 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,10 +3,6 @@
buildscript {
repositories {
jcenter()
- mavenCentral()
- maven {
- url 'https://maven.google.com'
- }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
@@ -18,6 +14,9 @@ apply plugin: 'com.android.application'
repositories {
jcenter()
mavenCentral()
+ maven {
+ url 'https://maven.google.com'
+ }
}
allprojects {
@@ -31,6 +30,10 @@ configurations {
standardPushCompile
}
+ext {
+ supportLibVersion = '25.4.0'
+}
+
dependencies {
compile project(':libs:MemorizingTrustManager')
compile project(':libs:android-transcoder')
@@ -53,9 +56,10 @@ dependencies {
compile 'jetty:javax.servlet:5.1.12'
compile 'com.google.code.gson:gson:2.7'
compile 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
- compile 'com.android.support:appcompat-v7:25.3.1'
+ compile "com.android.support:support-v13:$supportLibVersion"
+ compile "com.android.support:appcompat-v7:$supportLibVersion"
compile 'com.android.support:multidex:1.0.1'
- compile 'com.android.support:support-v4:25.3.1'
+ compile "com.android.support:support-v4:$supportLibVersion"
compile 'com.github.bumptech.glide:glide:3.8.0'
compile 'com.github.chrisbanes:PhotoView:2.0.0'
compile 'com.github.rtoshiro.fullscreenvideoview:fullscreenvideoview:1.1.3'
@@ -78,7 +82,7 @@ ext {
android {
compileSdkVersion 25
- buildToolsVersion "26.0.1"
+ buildToolsVersion "26.0.2"
defaultConfig {
minSdkVersion 15
diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle
index 37ca64641..82dd7d0e2 100644
--- a/libs/MemorizingTrustManager/build.gradle
+++ b/libs/MemorizingTrustManager/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 26
- buildToolsVersion "26.0.1"
+ buildToolsVersion "26.0.2"
defaultConfig {
minSdkVersion 14
targetSdkVersion 26