[Android] Bump the aar versions
Nicolas Pomepuy
git at videolan.org
Mon Mar 13 14:32:09 UTC 2023
vlc-android | branch: refs/tags/libvlc-4.0.0-eap9 | Nicolas Pomepuy <nicolas at videolabs.io> | Mon Mar 13 11:27:14 2023 +0100| [c8fd6af7de4619690dfe2e252fac2bf4d7d447ab] | committer: Nicolas Pomepuy
Bump the aar versions
> https://code.videolan.org/videolan/vlc-android/commit/c8fd6af7de4619690dfe2e252fac2bf4d7d447ab
---
build.gradle | 4 ++--
buildsystem/compile-medialibrary.sh | 2 +-
buildsystem/compile.sh | 2 +-
buildsystem/gitlab/.gitlab-ci.yml | 18 +++++++++---------
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
index a0041396c4..03858accb9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,8 +42,8 @@ ext {
versionCode = 3050400
versionName = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? '4.0.0-preview - ' + versionCode : '3.5.4'
vlcMajorVersion = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? 4 : 3
- libvlcVersion = vlcMajorVersion == 3 ? '3.6.0-eap5' :'4.0.0-eap8'
- medialibraryVersion = vlcMajorVersion == 3 ? '0.13.13-rc5' : '0.13.13-vlc4-r5'
+ libvlcVersion = vlcMajorVersion == 3 ? '3.6.0-eap6' :'4.0.0-eap9'
+ medialibraryVersion = vlcMajorVersion == 3 ? '0.13.13-rc6' : '0.13.13-vlc4-r6'
minSdkVersion = 17
targetSdkVersion = 33
compileSdkVersion = 33
diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index 53ff78bd3c..258faca22b 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -6,7 +6,7 @@ set -e
# ARGUMENTS #
#############
-MEDIALIBRARY_HASH=c792471d8cd3d4bfb64279b3d6bd490e2171b93d
+MEDIALIBRARY_HASH=918b0e7ff962aa31fe8502ae9bd7d2fd389c6ff6
while [ $# -gt 0 ]; do
case $1 in
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 2e1a232ef5..1106b03184 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -259,7 +259,7 @@ fi
if [ "$FORCE_VLC_4" = 1 ]; then
- LIBVLCJNI_TESTED_HASH=720bd2afb4a1eb83aa363656f2a7a375efc1e75c
+ LIBVLCJNI_TESTED_HASH=94fab2637b0c78eaf11490247afcf8df0ea10cfa
else
LIBVLCJNI_TESTED_HASH=6691a43c73df3abe3e30bda139c6a7b4d1adda87
fi
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index 8698a2348f..b974035296 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -120,28 +120,28 @@ build-ml-x86_64:
build-ml-arm64-v4:
extends: .build-ml-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
variables:
ARCH: arm64
EXTRA_BUILD_PARAM: -vlc4
build-ml-armv7-v4:
extends: .build-ml-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
variables:
ARCH: arm
EXTRA_BUILD_PARAM: -vlc4
build-ml-x86-v4:
extends: .build-ml-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
variables:
ARCH: x86
EXTRA_BUILD_PARAM: -vlc4
build-ml-x86_64-v4:
extends: .build-ml-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
variables:
ARCH: x86_64
EXTRA_BUILD_PARAM: -vlc4
@@ -194,7 +194,7 @@ nightly-x86_64:
# Weekly builds: build native & app code, and ship the APK as artifact for vlc4
nightly-arm64-v4:
extends: .build-all-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
@@ -207,7 +207,7 @@ nightly-arm64-v4:
nightly-armv7-v4:
extends: .build-all-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
@@ -220,7 +220,7 @@ nightly-armv7-v4:
nightly-x86-v4:
extends: .build-all-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
@@ -233,7 +233,7 @@ nightly-x86-v4:
nightly-x86_64-v4:
extends: .build-all-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
@@ -263,7 +263,7 @@ nightly-x86_64-v4:
M2_REPO: "$CI_PROJECT_DIR/aars/repository"
.build-libs-base-v4:
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
rules:
- if: '$CI_COMMIT_TAG =~ /^libvlc-4.*$/'
stage: build
More information about the Android
mailing list