Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
531
Issue boards
Milestones
Wiki
Code
Merge requests
14
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
353151ec
Commit
353151ec
authored
1 year ago
by
Nicolas Pomepuy
Browse files
Options
Downloads
Patches
Plain Diff
Bump libvlc and ML versions
parent
1495d23d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#437601
passed with stages
in 26 minutes and 42 seconds
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.gradle
+2
-2
2 additions, 2 deletions
build.gradle
buildsystem/compile.sh
+1
-1
1 addition, 1 deletion
buildsystem/compile.sh
with
3 additions
and
3 deletions
build.gradle
+
2
−
2
View file @
353151ec
...
...
@@ -42,8 +42,8 @@ ext {
versionCode
=
3050410
versionName
=
project
.
hasProperty
(
'forceVlc4'
)
&&
project
.
getProperty
(
'forceVlc4'
)
?
'4.0.0-preview - '
+
versionCode
:
'3.6.0 Beta 1'
vlcMajorVersion
=
project
.
hasProperty
(
'forceVlc4'
)
&&
project
.
getProperty
(
'forceVlc4'
)
?
4
:
3
libvlcVersion
=
vlcMajorVersion
==
3
?
'3.6.0-eap1
1
'
:
'4.0.0-eap1
4
'
medialibraryVersion
=
vlcMajorVersion
==
3
?
'0.13.13-rc1
1
'
:
'0.13.13-vlc4-rc1
1
'
libvlcVersion
=
vlcMajorVersion
==
3
?
'3.6.0-eap1
2
'
:
'4.0.0-eap1
5
'
medialibraryVersion
=
vlcMajorVersion
==
3
?
'0.13.13-rc1
2
'
:
'0.13.13-vlc4-rc1
2
'
minSdkVersion
=
17
targetSdkVersion
=
34
compileSdkVersion
=
34
...
...
This diff is collapsed.
Click to expand it.
buildsystem/compile.sh
+
1
−
1
View file @
353151ec
...
...
@@ -261,7 +261,7 @@ fi
if
[
"
$FORCE_VLC_4
"
=
1
]
;
then
LIBVLCJNI_TESTED_HASH
=
31636e1850bda0511ea379322fe8a50aec016b1a
LIBVLCJNI_TESTED_HASH
=
e7d9bf62834c36c92a3724f895dce45362aceb49
else
LIBVLCJNI_TESTED_HASH
=
13d22717b6af57fe1e4fe43e2250c30cffd77e3d
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment