[Android] Fix build on Apple Silicon devices

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Apr 26 21:31:02 2021 +0200| [bc7b4879a7d8d54f437e4302c20bf33130aa33bc] | committer: Nicolas Pomepuy

Fix build on Apple Silicon devices

> https://code.videolan.org/videolan/vlc-android/commit/bc7b4879a7d8d54f437e4302c20bf33130aa33bc
---

 application/mediadb/build.gradle     | 1 +
 application/moviepedia/build.gradle  | 2 ++
 application/vlc-android/build.gradle | 5 ++++-
 build.gradle                         | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/mediadb/build.gradle b/application/mediadb/build.gradle
index 89c49fa67..1e4dff86f 100644
--- a/application/mediadb/build.gradle
+++ b/application/mediadb/build.gradle
@@ -68,6 +68,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     //Room
     implementation "androidx.room:room-ktx:$rootProject.ext.roomVersion"
+    kapt ('org.xerial:sqlite-jdbc:3.34.0')
     kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion"
     implementation project(':application:tools')
     implementation project(':application:resources')
diff --git a/application/moviepedia/build.gradle b/application/moviepedia/build.gradle
index 07c4ed1e5..32c3f92d8 100644
--- a/application/moviepedia/build.gradle
+++ b/application/moviepedia/build.gradle
@@ -55,6 +55,8 @@ dependencies {
 
     //Room
     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"
 
 
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index 257443a5a..7006e9fa4 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -173,7 +173,10 @@ dependencies {
     api "androidx.lifecycle:lifecycle-livedata-ktx:$rootProject.ext.lifecycleVersion"
     api "androidx.lifecycle:lifecycle-common-java8:$rootProject.ext.lifecycleVersion"
     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"
 
 
diff --git a/build.gradle b/build.gradle
index 8ef0b90bb..9f8ec83fd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,7 +62,7 @@ ext {
     constraintLayoutVersion = '2.0.4'
     viewPager2Version = "1.0.0"
     archVersion = '2.1.0'
-    roomVersion = '2.2.6'
+    roomVersion = '2.3.0'
     pagingVersion = '2.1.2'
     junitVersion = '4.13'
     mockito = '2.25.0'