Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updating plugins

Browse source
This commit is contained in:
Erwan Croze 2017-08-29 16:02:09 +02:00
parent d7feba811f
commit b13e063ac5
7 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.gradle
View file

@ -16,6 +16,7 @@ buildscript {
jcenter() jcenter()
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:2.3.3'
@ -30,20 +31,21 @@ allprojects {
jcenter() jcenter()
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()
google()
} }
} }
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
dependencies { dependencies {
androidTestCompile ('com.android.support.test.espresso:espresso-core:2.2.2') { androidTestCompile ('com.android.support.test.espresso:espresso-core:+') {
exclude module: 'support-annotations' exclude module: 'support-annotations'
} }
androidTestCompile group: 'com.jayway.android.robotium', name: 'robotium-solo', version: '5.6.3' androidTestCompile group: 'com.jayway.android.robotium', name: 'robotium-solo', version: '+'
androidTestCompile 'junit:junit:4.12' androidTestCompile 'junit:junit:+'
compile group: 'org.apache.commons', name: 'commons-compress', version: '1.14' compile group: 'org.apache.commons', name: 'commons-compress', version: '+'
if (firebaseEnable()) { if (firebaseEnable()) {
compile 'com.google.firebase:firebase-messaging:11.0.4' compile 'com.google.firebase:firebase-messaging:11.2.0'
} else { } else {
compile fileTree(include: 'gcm.jar', dir: 'libs') compile fileTree(include: 'gcm.jar', dir: 'libs')
compile 'com.android.support:support-v4:+' compile 'com.android.support:support-v4:+'

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Thu Apr 27 14:17:25 CEST 2017 #Tue Aug 29 15:59:08 CEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

6
gradlew vendored
View file

@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD="maximum"
warn ( ) { warn () {
echo "$*" echo "$*"
} }
die ( ) { die () {
echo echo
echo "$*" echo "$*"
echo echo
@ -155,7 +155,7 @@ if $cygwin ; then
fi fi
# Escape application args # Escape application args
save ( ) { save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " " echo " "
} }

8
libLinphoneAndroidSdk.gradle
View file

@ -5,9 +5,10 @@ buildscript {
jcenter() jcenter()
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()
google()
} }
dependencies { 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() jcenter()
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()
google()
} }
} }
@ -26,8 +28,8 @@ configurations {
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
dependencies { dependencies {
compile 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: '1.14' javadocDeps group: 'org.apache.commons', name: 'commons-compress', version: '+'
} }
def submoduleDir = ['submodules/mediastreamer2/java/src', def submoduleDir = ['submodules/mediastreamer2/java/src',

2
liblinphone_tester/build.gradle
View file

@ -12,7 +12,7 @@ buildscript {
mavenLocal() mavenLocal()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
} }
} }

8
linphoneAndroidSdk.gradle
View file

@ -11,9 +11,10 @@ buildscript {
jcenter() jcenter()
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.android.tools.build:gradle:2.3.3'
if (googleFile.exists()) { if (googleFile.exists()) {
classpath 'com.google.gms:google-services:3.1.0' classpath 'com.google.gms:google-services:3.1.0'
} }
@ -25,15 +26,16 @@ allprojects {
jcenter() jcenter()
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()
google()
} }
} }
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
dependencies { dependencies {
compile group: 'org.apache.commons', name: 'commons-compress', version: '1.14' compile group: 'org.apache.commons', name: 'commons-compress', version: '+'
if (firebaseEnable()) { if (firebaseEnable()) {
compile 'com.google.firebase:firebase-messaging:11.0.2' compile 'com.google.firebase:firebase-messaging:11.2.0'
} else { } else {
compile fileTree(include: 'gcm.jar', dir: 'libs') compile fileTree(include: 'gcm.jar', dir: 'libs')
compile 'com.android.support:support-v4:+' compile 'com.android.support:support-v4:+'