Upgrade 320beta7

README.md

@@ -18,7 +18,7 @@ buildscript {
 }
 
 dependencies {
-  compile "com.butterproject:vlc-android-sdk:3.0.3"
+  compile "com.butterproject:vlc-android-sdk:3.2.0-beta07"
 }
 ```
 

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.6.0-beta03'
     }
 }
 
@@ -27,12 +27,10 @@ repositories {
 
 android {
     compileSdkVersion rootProject.ext.compileSdk
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdk
         targetSdkVersion rootProject.ext.targetSdk
-        versionCode VERSION_CODE as int
         versionName VERSION_NAME
 
         ndk {
@@ -53,8 +51,8 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-compat:${rootProject.ext.appCompatVersion}"
-    compile "com.android.support:support-annotations:${rootProject.ext.appCompatVersion}"
+    api "androidx.annotation:annotation:$rootProject.ext.androidxAnnotationVersion"
+    api "androidx.legacy:legacy-support-v4:$rootProject.ext.androidxLegacyVersion"
 }
 
 

compile-libvlc.patch

@@ -1,11 +1,11 @@
 --- vlc-android/compile-libvlc.sh	2017-11-03 22:00:00.369247485 +0000
 +++ vlc-android/compile-libvlc-new.sh	2017-11-03 22:00:44.168393922 +0000
-@@ -531,7 +531,7 @@
+@@ -540,7 +540,7 @@
  which autopoint >/dev/null || make $MAKEFLAGS .gettext
  #export the PATH
  # Make
 -make $MAKEFLAGS
 +make $MAKEFLAGS --jobs=4
- checkfail "contribs: make failed"
+ avlc_checkfail "contribs: make failed"
 
  cd ../../

config/circleci/clone-repos.sh

@@ -5,7 +5,7 @@ git clone https://code.videolan.org/videolan/vlc-android.git vlc-android
 cd vlc-android
 
 echo "Checkout tag"
-git checkout 3.0.13
+git checkout 3.2.0-beta07
 cd ..
 
 echo "Patch compile options"

config/dependencies.gradle

@@ -1,7 +1,7 @@
 ext {
-    buildToolsVersion = "27.0.3"
     targetSdk = 27
     compileSdk = 27
     minSdk = 16
-    appCompatVersion = '27.1.0'
+    androidxLegacyVersion = '1.0.0'
+    androidxAnnotationVersion = '1.1.0'
 }

gradle.properties

@@ -1,5 +1,4 @@
-VERSION_NAME=3.0.13
-VERSION_CODE=3001300
+VERSION_NAME=3.2.0-beta07
 GROUP=com.butterproject
 ARTIFACT=vlc-android-sdk
 PROJECT_NAME=VLC Android SDK
@@ -11,3 +10,6 @@ SCM_URL=https://github.com/butterproject/vlc-android-sdk.git
 LICENSE_NAME=GNU Lesser General Public License, Version 3 or later
 LICENSE_URL=https://www.gnu.org/licenses/gpl-3.0.en.html
 ORGANIZATION=butterproject
+
+android.enableJetifier=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-bin.zip