[Android] Update headers and disable schema export

Robert Stone git at videolan.org
Mon May 9 10:05:15 UTC 2022


vlc-android | branch: master | Robert Stone <rhstone at gmail.com> | Fri Apr 29 10:39:45 2022 -0700| [856c1cb44c56ea7fb20714e1564c46e7a3bcfd30] | committer: Nicolas Pomepuy

Update headers and disable schema export

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

 .../videolan/vlc/database/CustomDirectoryDao.kt    | 19 ++++++++++++++++
 .../org/videolan/vlc/database/MediaDatabase.kt     | 26 +---------------------
 .../moviepedia/database/MoviePediaDatabase.kt      |  2 +-
 application/vlc-android/build.gradle               |  7 ------
 4 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/application/mediadb/src/main/java/org/videolan/vlc/database/CustomDirectoryDao.kt b/application/mediadb/src/main/java/org/videolan/vlc/database/CustomDirectoryDao.kt
index 83284072d..282218f59 100644
--- a/application/mediadb/src/main/java/org/videolan/vlc/database/CustomDirectoryDao.kt
+++ b/application/mediadb/src/main/java/org/videolan/vlc/database/CustomDirectoryDao.kt
@@ -1,3 +1,22 @@
+/*******************************************************************************
+ *  CustomDirectoryDao.kt
+ * ****************************************************************************
+ * Copyright © 2018 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ ******************************************************************************/
 package org.videolan.vlc.database
 
 import androidx.room.*
diff --git a/application/mediadb/src/main/java/org/videolan/vlc/database/MediaDatabase.kt b/application/mediadb/src/main/java/org/videolan/vlc/database/MediaDatabase.kt
index fc4cbb56c..3528b1687 100644
--- a/application/mediadb/src/main/java/org/videolan/vlc/database/MediaDatabase.kt
+++ b/application/mediadb/src/main/java/org/videolan/vlc/database/MediaDatabase.kt
@@ -1,27 +1,3 @@
-/*
- * ************************************************************************
- *  MediaDatabase.kt
- * *************************************************************************
- * Copyright © 2020 VLC authors and VideoLAN
- * Author: Nicolas POMEPUY
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- * **************************************************************************
- *
- *
- */
-
 /*******************************************************************************
  *  MediaDatabase.kt
  * ****************************************************************************
@@ -60,7 +36,7 @@ import org.videolan.vlc.mediadb.models.Slave
 
 private const val DB_NAME = "vlc_database"
 
- at Database(entities = [ExternalSub::class, Slave::class, BrowserFav::class, CustomDirectory::class], version = 30)
+ at Database(entities = [ExternalSub::class, Slave::class, BrowserFav::class, CustomDirectory::class], version = 30, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class MediaDatabase: RoomDatabase() {
     abstract fun externalSubDao(): ExternalSubDao
diff --git a/application/moviepedia/src/main/java/org/videolan/moviepedia/database/MoviePediaDatabase.kt b/application/moviepedia/src/main/java/org/videolan/moviepedia/database/MoviePediaDatabase.kt
index 625d20841..9f803fc7f 100644
--- a/application/moviepedia/src/main/java/org/videolan/moviepedia/database/MoviePediaDatabase.kt
+++ b/application/moviepedia/src/main/java/org/videolan/moviepedia/database/MoviePediaDatabase.kt
@@ -35,7 +35,7 @@ import org.videolan.tools.SingletonHolder
 
 private const val DB_NAME = "moviepedia_database"
 
- at Database(entities = [MediaMetadata::class, Person::class, MediaPersonJoin::class, MediaImage::class], version = 1)
+ at Database(entities = [MediaMetadata::class, Person::class, MediaPersonJoin::class, MediaImage::class], version = 1, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class MoviePediaDatabase: RoomDatabase() {
     abstract fun mediaMetadataDao(): MediaMetadataDao
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index f4311b6d5..17d644d7a 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -42,13 +42,6 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/assets/schemas".toString(),
-                             "room.incremental":"true"]
-            }
-        }
     }
 
     testOptions {



More information about the Android mailing list