fix build warnings

kristy-hu · Aug 26, 2020 · e7c921c · e7c921c
1 parent 4b84a37
commit e7c921c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,18 +28,17 @@ android {
         //buildConfigField 'int', 'BUILD_NUMBER', "${project.ext.buildNumber}"
 
         testInstrumentationRunner "journal.gratitude.com.gratitudejournal.CustomTestRunner"
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation":
-                                     "$projectDir/schemas".toString()]
+        kapt {
+            arguments {
+                arg("room.schemaLocation", "$projectDir/schemas")
             }
         }
         buildConfigField "String", "DROPBOX_APP_KEY", "\"${project.property("dropboxAppKey")}\""
 
         manifestPlaceholders = [dropboxAppKey: project.property("dropboxAppKey")]
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
     }
     buildTypes {
         debug {

diff --git a/app/src/androidTest/java/journal/gratitude/com/gratitudejournal/di/TestCloudUploadModule.kt b/app/src/androidTest/java/journal/gratitude/com/gratitudejournal/di/TestCloudUploadModule.kt
@@ -1,6 +1,5 @@
 package journal.gratitude.com.gratitudejournal.di
 
-import android.content.Context
 import dagger.Module
 import dagger.Provides
 import journal.gratitude.com.gratitudejournal.fakes.FakeCloudUploader
@@ -13,7 +12,7 @@ object TestCloudUploadModule {
     @JvmStatic
     @Singleton
     @Provides
-    fun provideCloudUpload(context: Context): CloudProvider {
+    fun provideCloudUpload(): CloudProvider {
         return FakeCloudUploader()
     }
 

diff --git a/app/src/androidTest/java/journal/gratitude/com/gratitudejournal/fakes/FakeEntryRepository.kt b/app/src/androidTest/java/journal/gratitude/com/gratitudejournal/fakes/FakeEntryRepository.kt
@@ -30,13 +30,13 @@ class FakeEntryRepository : EntryRepository {
 
     override suspend fun getEntries(): List<Entry> {
         val list = mutableListOf<Entry>()
-        entriesDatabase.forEach { (date, entry) -> list.add(entry) }
+        entriesDatabase.forEach { (_, entry) -> list.add(entry) }
         return list
     }
 
     override suspend fun getEntriesFlow(): Flow<List<Entry>> {
         val list = mutableListOf<Entry>()
-        entriesDatabase.forEach { (date, entry) -> list.add(entry) }
+        entriesDatabase.forEach { (_, entry) -> list.add(entry) }
         return flow {
             emit(emptyList<Entry>())
         }

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,6 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.databinding.enableV2=true
 android.useAndroidX=true
 android.enableJetifier=true
 dropboxAppKey=keyHiddenFromGit