diff --git a/README.md b/README.md
index 55e14bd..8602a77 100644
--- a/README.md
+++ b/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"
 }
 ```
 
diff --git a/build.gradle b/build.gradle
index 8820e5c..b2c9c0a 100644
--- a/build.gradle
+++ b/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"
 }
 
 
diff --git a/compile-libvlc.patch b/compile-libvlc.patch
index 2913c66..782affa 100644
--- a/compile-libvlc.patch
+++ b/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 ../../
diff --git a/config/circleci/clone-repos.sh b/config/circleci/clone-repos.sh
index 4cd231a..d3502e2 100755
--- a/config/circleci/clone-repos.sh
+++ b/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"
diff --git a/config/dependencies.gradle b/config/dependencies.gradle
index 95c375d..632deb1 100644
--- a/config/dependencies.gradle
+++ b/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'
 }
diff --git a/gradle.properties b/gradle.properties
index 7760fe7..2616404 100644
--- a/gradle.properties
+++ b/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
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a5fe1cb..5c2d1cf 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 be280be..0ebb310 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/gradlew b/gradlew
index cccdd3d..83f2acf 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/gradlew.bat b/gradlew.bat
index e95643d..24467a1 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome