Update Linphone to 3.3.0 (3303)

metadata/org.linphone.txt

@@ -265,14 +265,22 @@ Build:3.2.4-fdroid,3241
     scandelete=submodules/mswebrtc/webrtc/data/voice_engine/stereo_rtp_files/rtpplay.exe,submodules/externals/openh264/autotest/performanceTest/ios/*,submodules/externals/mbedtls/tests/
     build=./prepare.py; make BUILD_GPLV3_ZRTP=1
 
-Build:3.2.6-testing,3260
-    disable=wip
-    commit=3.2.6
+Build:3.3.0,3303
+    commit=3.3.0
     submodules=yes
-    build=export USE_SDK_WRAPPER=yes && \
-        ./prepare.py -cf && \
-        make
-    ndk=r13b
+    sudo=apt-get install -y cmake/testing
+    patch=3.3.0-gradle.patch
+    gradle=yes
+    output=bin/outputs/apk/org.linphone-release-unsigned.apk
+    rm=libs,src/android/org/linphone/gcm,src/android/org/linphone/firebase/Firebase*.java
+    scandelete=submodules
+    build=echo 'gradle "$@"' > gradlew && \
+        chmod a+x gradlew && \
+        ./prepare.py && \
+        make -j`nproc` build && \
+        make copy-libs && \
+        make `pwd`/res/raw/rootca.pem
+    ndk=r15c
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/org.linphone/3.3.0-gradle.patch

@@ -0,0 +1,120 @@
+diff --git a/build.gradle b/build.gradle
+index f07d012..3b51b9b 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -5,13 +5,7 @@ def getPackageName() {
+   return "org.linphone"
+ }
+ 
+-def firebaseEnable() {
+-  File googleFile = new File('google-services.json')
+-  return googleFile.exists()
+-}
+-
+ buildscript {
+-  File googleFile = new File('google-services.json')
+   repositories {
+     jcenter()
+     mavenCentral()
+@@ -20,9 +14,6 @@ buildscript {
+   }
+   dependencies {
+     classpath 'com.android.tools.build:gradle:2.3.3'
+-    if (googleFile.exists()) {
+-      classpath 'com.google.gms:google-services:3.+'
+-    }
+   }
+ }
+ 
+@@ -43,17 +34,8 @@ dependencies {
+   }
+   androidTestCompile 'com.jayway.android.robotium:robotium-solo:+'
+   androidTestCompile 'junit:junit:+'
+-  compile 'org.apache.commons:commons-compress:+'
+-  if (firebaseEnable()) {
+-    compile 'com.google.firebase:firebase-messaging:11.+'
+-  } else {
+-    compile fileTree(include: 'gcm.jar', dir: 'libs')
+-    compile 'com.android.support:support-v4:+'
+-  }
+-}
+-
+-if (firebaseEnable()) {
+-  apply plugin: 'com.google.gms.google-services'
++  compile 'org.apache.commons:commons-compress:1.15'
++  compile 'com.android.support:support-v4:26.1.0'
+ }
+ 
+ //// Submodule Dir /////
+@@ -66,14 +48,6 @@ def submoduleDir = ['submodules/mediastreamer2/java/src',
+ 
+ ///// Exclude Files /////
+ def excludeFiles = []
+-// Exclude firebase file if not enable
+-if (!firebaseEnable()) {
+-  excludeFiles.add('**/Firebase*')
+-  println '[Push Notification] Firebase disabled'
+-} else {
+-  excludeFiles.add('**/gcm*')
+-  println '[Push Notification] Firebase enabled'
+-}
+ excludeFiles.add('**/mediastream/MediastreamerActivity.java')
+ 
+ def excludePackage = []
+diff --git a/linphoneAndroidSdk.gradle b/linphoneAndroidSdk.gradle
+index c699b2c..60d29fd 100644
+--- a/linphoneAndroidSdk.gradle
++++ b/linphoneAndroidSdk.gradle
+@@ -1,12 +1,7 @@
+ // Project information
+ buildDir = 'bin'
+-def firebaseEnable() {
+-    File googleFile = new File('google-services.json')
+-    return googleFile.exists()
+-}
+ 
+ buildscript {
+-    File googleFile = new File('google-services.json')
+     repositories {
+         jcenter()
+         mavenCentral()
+@@ -15,9 +10,6 @@ buildscript {
+     }
+     dependencies {
+         classpath 'com.android.tools.build:gradle:2.3.3'
+-        if (googleFile.exists()) {
+-            classpath 'com.google.gms:google-services:3.1.0'
+-        }
+     }
+ }
+ 
+@@ -34,16 +26,6 @@ apply plugin: 'com.android.library'
+ 
+ dependencies {
+     compile group: 'org.apache.commons', name: 'commons-compress', version: '+'
+-    if (firebaseEnable()) {
+-        compile 'com.google.firebase:firebase-messaging:11.2.0'
+-    } else {
+-        compile fileTree(include: 'gcm.jar', dir: 'libs')
+-        compile 'com.android.support:support-v4:+'
+-    }
+-}
+-
+-if (firebaseEnable()) {
+-    apply plugin: 'com.google.gms.google-services'
+ }
+ 
+ 
+@@ -55,12 +37,6 @@ def srcDirs = ['submodules/mediastreamer2/java/src',
+                     'src/android']
+ 
+ def excludeFiles = []
+-// Exclude firebase file if not enable
+-if (!firebaseEnable()) {
+-    excludeFiles.add('**/Firebase*')
+-} else {
+-    excludeFiles.add('**/gcm*')
+-}
+ excludeFiles.add('**/mediastream/MediastreamerActivity.java')
+ 
+ def excludePackage = []