Skip to content
Snippets Groups Projects
Commit b2b698e6 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Bump the aar versions

parent c5c3228c
No related branches found
No related tags found
No related merge requests found
Pipeline #322405 passed with stages
in 22 minutes and 39 seconds
......@@ -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
......
......@@ -6,7 +6,7 @@ set -e
# ARGUMENTS #
#############
MEDIALIBRARY_HASH=c792471d8cd3d4bfb64279b3d6bd490e2171b93d
MEDIALIBRARY_HASH=918b0e7ff962aa31fe8502ae9bd7d2fd389c6ff6
while [ $# -gt 0 ]; do
case $1 in
......
......@@ -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
......@@ -278,6 +278,7 @@ if [ ! -d "$VLC_LIBJNI_PATH" ] || [ ! -d "$VLC_LIBJNI_PATH/.git" ]; then
git clone --single-branch --branch ${branch} "${LIBVLCJNI_REPOSITORY}"
cd libvlcjni
else # folder exist with only the artifacts
git config --global --add safe.directory "${LIBVLCJNI_REPOSITORY}"
cd libvlcjni
git init
git remote add origin "${LIBVLCJNI_REPOSITORY}"
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment