mirrors/vlc-android
0
0
Fork 0
mirror of https://github.com/videolan/vlc-android synced 2024-11-27 11:53:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build on Apple Silicon devices

Browse Source
This commit is contained in:
Geoffrey Métais 2021-04-26 21:31:02 +02:00 committed by Nicolas Pomepuy
parent 9c78e762dd
commit bc7b4879a7
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/mediadb/build.gradle
View File

@ -68,6 +68,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
//Room //Room
implementation "androidx.room:room-ktx:$rootProject.ext.roomVersion" implementation "androidx.room:room-ktx:$rootProject.ext.roomVersion"
kapt ('org.xerial:sqlite-jdbc:3.34.0')
kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion" kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion"
implementation project(':application:tools') implementation project(':application:tools')
implementation project(':application:resources') implementation project(':application:resources')

2
application/moviepedia/build.gradle
View File

@ -55,6 +55,8 @@ dependencies {
//Room //Room
implementation "androidx.room:room-runtime:$rootProject.ext.roomVersion" implementation "androidx.room:room-runtime:$rootProject.ext.roomVersion"
// Provide proper JDBC version, see https://issuetracker.google.com/issues/174695268
kapt ('org.xerial:sqlite-jdbc:3.34.0')
kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion" kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion"

5
application/vlc-android/build.gradle
View File

@ -173,7 +173,10 @@ dependencies {
api "androidx.lifecycle:lifecycle-livedata-ktx:$rootProject.ext.lifecycleVersion" api "androidx.lifecycle:lifecycle-livedata-ktx:$rootProject.ext.lifecycleVersion"
api "androidx.lifecycle:lifecycle-common-java8:$rootProject.ext.lifecycleVersion" api "androidx.lifecycle:lifecycle-common-java8:$rootProject.ext.lifecycleVersion"
api "androidx.room:room-runtime:$rootProject.ext.roomVersion" api "androidx.room:room-runtime:$rootProject.ext.roomVersion"
kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion"
kapt ('org.xerial:sqlite-jdbc:3.34.0')
kapt("androidx.room:room-compiler:$rootProject.ext.roomVersion")
api "androidx.paging:paging-runtime-ktx:$rootProject.ext.pagingVersion" api "androidx.paging:paging-runtime-ktx:$rootProject.ext.pagingVersion"

2
build.gradle
View File

@ -62,7 +62,7 @@ ext {
constraintLayoutVersion = '2.0.4' constraintLayoutVersion = '2.0.4'
viewPager2Version = "1.0.0" viewPager2Version = "1.0.0"
archVersion = '2.1.0' archVersion = '2.1.0'
roomVersion = '2.2.6' roomVersion = '2.3.0'
pagingVersion = '2.1.2' pagingVersion = '2.1.2'
junitVersion = '4.13' junitVersion = '4.13'
mockito = '2.25.0' mockito = '2.25.0'