From de3acdacae5fc9fce372a9d535e2e1fa99a68abf Mon Sep 17 00:00:00 2001 From: Felix Date: Fri, 27 Oct 2017 00:21:39 +0200 Subject: [PATCH] fix compile errors --- common/build.gradle | 3 ++- .../chaosflix/common/entities/recording/ConferenceDao.kt | 3 +++ .../chaosflix/common/entities/recording/EventDao.kt | 3 +++ .../chaosflix/common/entities/recording/RecordingDao.kt | 3 +++ .../chaosflix/common/entities/userdata/PlaybackProgressDao.kt | 2 +- .../chaosflix/common/entities/userdata/WatchlistItemDao.kt | 2 +- 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index d9c5ff0d..6827bcf8 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.library' apply plugin: 'android-maven' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -63,7 +64,7 @@ dependencies { androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } repositories { diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/ConferenceDao.kt b/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/ConferenceDao.kt index 97ca0b76..a3ca35b5 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/ConferenceDao.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/ConferenceDao.kt @@ -1,5 +1,8 @@ package de.nicidienase.chaosflix.common.entities.recording +import android.arch.persistence.room.Dao + +@Dao interface ConferenceDao{ } diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/EventDao.kt b/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/EventDao.kt index ce217701..c638ac62 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/EventDao.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/EventDao.kt @@ -1,5 +1,8 @@ package de.nicidienase.chaosflix.common.entities.recording +import android.arch.persistence.room.Dao + +@Dao interface EventDao{ } \ No newline at end of file diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/RecordingDao.kt b/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/RecordingDao.kt index 8949a655..e2826bb3 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/RecordingDao.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/RecordingDao.kt @@ -1,5 +1,8 @@ package de.nicidienase.chaosflix.common.entities.recording +import android.arch.persistence.room.Dao + +@Dao interface RecordingDao{ } \ No newline at end of file diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/entities/userdata/PlaybackProgressDao.kt b/common/src/main/java/de/nicidienase/chaosflix/common/entities/userdata/PlaybackProgressDao.kt index 500cedf8..059f7d79 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/entities/userdata/PlaybackProgressDao.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/entities/userdata/PlaybackProgressDao.kt @@ -14,7 +14,7 @@ interface PlaybackProgressDao{ @Query("SELECT * from playback_progress") fun getAll(): Flowable> - @Query("SELECT * from playback_progress WHERE event_id = :arg0 LIMIT 1") + @Query("SELECT * from playback_progress WHERE event_id = :id LIMIT 1") fun getProgressForEvent(id:Int): Flowable @Insert diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/entities/userdata/WatchlistItemDao.kt b/common/src/main/java/de/nicidienase/chaosflix/common/entities/userdata/WatchlistItemDao.kt index e4ed7cd3..2ec122b4 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/entities/userdata/WatchlistItemDao.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/entities/userdata/WatchlistItemDao.kt @@ -12,7 +12,7 @@ interface WatchlistItemDao { @Query("SELECT * from watchlist_item") fun getAll(): LiveData> - @Query("SELECT * from watchlist_item WHERE id = :arg0 LIMIT 1") + @Query("SELECT * from watchlist_item WHERE id = :id LIMIT 1") fun getItemForEvent(id:Int): LiveData @Insert(onConflict = OnConflictStrategy.REPLACE)