Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
LibVLC Android samples
Commits
3401a857
Commit
3401a857
authored
Oct 25, 2018
by
Geoffrey Métais
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade gradle setting
parent
02a98be5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
19 deletions
+18
-19
build.gradle
build.gradle
+2
-1
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+2
-2
java_sample/build.gradle
java_sample/build.gradle
+7
-8
native_sample/build.gradle
native_sample/build.gradle
+7
-8
No files found.
build.gradle
View file @
3401a857
...
...
@@ -6,7 +6,7 @@ buildscript {
google
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
1.3
'
classpath
'com.android.tools.build:gradle:3.
2.1
'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
...
...
@@ -16,6 +16,7 @@ buildscript {
allprojects
{
repositories
{
jcenter
()
google
()
}
}
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
3401a857
#Thu
Jul 19 17:06:35
CEST 2018
#Thu
Oct 25 11:15:50
CEST 2018
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
4
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
6
-all.zip
java_sample/build.gradle
View file @
3401a857
apply
plugin:
'com.android.application'
android
{
compileSdkVersion
23
buildToolsVersion
"23.0.2"
compileSdkVersion
28
sourceSets
{
main
{
jni
.
srcDirs
=
[]
...
...
@@ -13,8 +12,8 @@ android {
}
defaultConfig
{
applicationId
'org.videolan.java_sample'
minSdkVersion
1
6
targetSdkVersion
2
3
minSdkVersion
1
7
targetSdkVersion
2
8
versionCode
1
versionName
"1.0"
}
...
...
@@ -29,8 +28,8 @@ android {
}
dependencies
{
co
mp
i
le
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
co
mp
i
le
'com.android.support:appcompat-v7:2
3.1.1
'
co
mp
i
le
'com.android.support:support-v4:2
3.1.1
'
co
mp
i
le
project
(
':libvlc'
)
i
mple
mentation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
i
mple
mentation
'com.android.support:appcompat-v7:2
8.0.0
'
i
mple
mentation
'com.android.support:support-v4:2
8.0.0
'
i
mple
mentation
project
(
':libvlc'
)
}
native_sample/build.gradle
View file @
3401a857
apply
plugin:
'com.android.application'
android
{
compileSdkVersion
23
buildToolsVersion
"23.0.2"
compileSdkVersion
28
sourceSets
{
main
{
jni
.
srcDirs
=
[]
// Prevent gradle from building native code with ndk; we have our own Makefile for it.
...
...
@@ -11,8 +10,8 @@ android {
}
defaultConfig
{
applicationId
'org.videolan.native_sample'
minSdkVersion
1
6
targetSdkVersion
2
3
minSdkVersion
1
7
targetSdkVersion
2
8
versionCode
1
versionName
"1.0"
}
...
...
@@ -27,8 +26,8 @@ android {
}
dependencies
{
co
mp
i
le
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
co
mp
i
le
'com.android.support:appcompat-v7:2
3.1.1
'
co
mp
i
le
'com.android.support:support-v4:2
3.1.1
'
co
mp
i
le
project
(
':libvlc'
)
i
mple
mentation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
i
mple
mentation
'com.android.support:appcompat-v7:2
8.0.0
'
i
mple
mentation
'com.android.support:support-v4:2
8.0.0
'
i
mple
mentation
project
(
':libvlc'
)
}
Lucie Smits
💬
@landgraaf2019
·
May 27, 2019
Ok
Ok
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment