diff --git a/build.gradle b/build.gradle index 1734cf75f..2f45cb76e 100644 --- a/build.gradle +++ b/build.gradle @@ -47,8 +47,8 @@ ext { versionName = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? '4.0.0-preview - ' + versionCode : '3.7.0 Beta 1' vlcMajorVersion = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? 4 : 3 remoteAccessVersion = '0.10.0' - libvlcVersion = vlcMajorVersion == 3 ? '3.6.3' :'4.0.0-eap21' - medialibraryVersion = '0.13.14' + (vlcMajorVersion == 3 ? '' : '-vlc4') + '-rc18' + libvlcVersion = vlcMajorVersion == 3 ? '3.6.4' :'4.0.0-eap22' + medialibraryVersion = '0.13.15' + (vlcMajorVersion == 3 ? '' : '-vlc4') + '-rc19' minSdkVersion = vlcMajorVersion == 3 ? 17 : 21 buildToolsVersion = vlcMajorVersion == 3 ? '35.0.0' : '35.0.0' targetSdkVersion = 36 diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh index 2224be396..f1759ed56 100755 --- a/buildsystem/compile.sh +++ b/buildsystem/compile.sh @@ -301,10 +301,10 @@ fi if [ "$FORCE_VLC_4" = 1 ]; then - LIBVLCJNI_TESTED_HASH=a1c3a2f1507396a3e030e5e3211b8a6618232369 + LIBVLCJNI_TESTED_HASH=82f21cdc8e122ce32d40c2709426a45c39343561 LIBVLCJNI_BRANCH="master" else - LIBVLCJNI_TESTED_HASH=755eea54c2a0d282bbb88d3d448efbadea9a8340 + LIBVLCJNI_TESTED_HASH=b1414d197d535691a21d25de1490418c61305b19 LIBVLCJNI_BRANCH="libvlcjni-3.x" fi LIBVLCJNI_REPOSITORY=https://code.videolan.org/videolan/libvlcjni.git