Skip to content
Snippets Groups Projects
Commit 856c1cb4 authored by Robert Stone's avatar Robert Stone Committed by Nicolas Pomepuy
Browse files

Update headers and disable schema export

parent 602e37de
No related branches found
No related tags found
1 merge request!1360Clean-up existing routines and migrate from deprecated annotations
Pipeline #219059 passed with stage
in 3 minutes and 51 seconds
/*******************************************************************************
* 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.*
......
/*
* ************************************************************************
* 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"
@Database(entities = [ExternalSub::class, Slave::class, BrowserFav::class, CustomDirectory::class], version = 30)
@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
......
......@@ -35,7 +35,7 @@ import org.videolan.tools.SingletonHolder
private const val DB_NAME = "moviepedia_database"
@Database(entities = [MediaMetadata::class, Person::class, MediaPersonJoin::class, MediaImage::class], version = 1)
@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
......
......@@ -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 {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment