diff --git a/build.gradle b/build.gradle index 2b8327b64..1670ab179 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,7 @@ buildscript { jcenter() mavenCentral() mavenLocal() + google() } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' @@ -30,20 +31,21 @@ allprojects { jcenter() mavenCentral() mavenLocal() + google() } } apply plugin: 'com.android.application' dependencies { - androidTestCompile ('com.android.support.test.espresso:espresso-core:2.2.2') { + androidTestCompile ('com.android.support.test.espresso:espresso-core:+') { exclude module: 'support-annotations' } - androidTestCompile group: 'com.jayway.android.robotium', name: 'robotium-solo', version: '5.6.3' - androidTestCompile 'junit:junit:4.12' - compile group: 'org.apache.commons', name: 'commons-compress', version: '1.14' + androidTestCompile group: 'com.jayway.android.robotium', name: 'robotium-solo', version: '+' + androidTestCompile 'junit:junit:+' + compile group: 'org.apache.commons', name: 'commons-compress', version: '+' if (firebaseEnable()) { - compile 'com.google.firebase:firebase-messaging:11.0.4' + compile 'com.google.firebase:firebase-messaging:11.2.0' } else { compile fileTree(include: 'gcm.jar', dir: 'libs') compile 'com.android.support:support-v4:+' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index fcf53b07b..c0173c8c0 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 763ce1376..c8438ef9a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 27 14:17:25 CEST 2017 +#Tue Aug 29 15:59:08 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-bin.zip diff --git a/gradlew b/gradlew index 4453ccea3..cccdd3d51 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/libLinphoneAndroidSdk.gradle b/libLinphoneAndroidSdk.gradle index 25c13513a..28b28f2f7 100644 --- a/libLinphoneAndroidSdk.gradle +++ b/libLinphoneAndroidSdk.gradle @@ -5,9 +5,10 @@ buildscript { jcenter() mavenCentral() mavenLocal() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.3' } } @@ -16,6 +17,7 @@ allprojects { jcenter() mavenCentral() mavenLocal() + google() } } @@ -26,8 +28,8 @@ configurations { apply plugin: 'com.android.library' dependencies { - compile group: 'org.apache.commons', name: 'commons-compress', version: '1.14' - javadocDeps group: 'org.apache.commons', name: 'commons-compress', version: '1.14' + compile group: 'org.apache.commons', name: 'commons-compress', version: '+' + javadocDeps group: 'org.apache.commons', name: 'commons-compress', version: '+' } def submoduleDir = ['submodules/mediastreamer2/java/src', diff --git a/liblinphone_tester/build.gradle b/liblinphone_tester/build.gradle index 401d8de68..8403f092e 100644 --- a/liblinphone_tester/build.gradle +++ b/liblinphone_tester/build.gradle @@ -12,7 +12,7 @@ buildscript { mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0-alpha9' } } diff --git a/linphoneAndroidSdk.gradle b/linphoneAndroidSdk.gradle index 81524b67b..c699b2c4a 100644 --- a/linphoneAndroidSdk.gradle +++ b/linphoneAndroidSdk.gradle @@ -11,9 +11,10 @@ buildscript { jcenter() mavenCentral() mavenLocal() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.3' if (googleFile.exists()) { classpath 'com.google.gms:google-services:3.1.0' } @@ -25,15 +26,16 @@ allprojects { jcenter() mavenCentral() mavenLocal() + google() } } apply plugin: 'com.android.library' dependencies { - compile group: 'org.apache.commons', name: 'commons-compress', version: '1.14' + compile group: 'org.apache.commons', name: 'commons-compress', version: '+' if (firebaseEnable()) { - compile 'com.google.firebase:firebase-messaging:11.0.2' + compile 'com.google.firebase:firebase-messaging:11.2.0' } else { compile fileTree(include: 'gcm.jar', dir: 'libs') compile 'com.android.support:support-v4:+'