From a3f504d41043e5577e03380bb5130025a28cdc7f Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 26 Nov 2019 11:58:34 -0600
Subject: [PATCH] Room 2.2.2

---
 app/src/main/assets/licenses.json             | 20 +++++++++----------
 app/src/main/java/org/tasks/data/TagData.java |  4 ++--
 buildSrc/src/main/kotlin/Versions.kt          |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json
index 27dbed9a4..cfa4ee4f7 100644
--- a/app/src/main/assets/licenses.json
+++ b/app/src/main/assets/licenses.json
@@ -205,7 +205,7 @@
       "artifactId": {
         "name": "room-common",
         "group": "androidx.room",
-        "version": "2.1.0"
+        "version": "2.2.2"
       }
     },
     {
@@ -221,7 +221,7 @@
       "artifactId": {
         "name": "room-runtime",
         "group": "androidx.room",
-        "version": "2.1.0"
+        "version": "2.2.2"
       }
     },
     {
@@ -573,7 +573,7 @@
       "artifactId": {
         "name": "annotations",
         "group": "org.jetbrains",
-        "version": "13.0"
+        "version": "16.0.1"
       }
     },
     {
@@ -957,7 +957,7 @@
       "artifactId": {
         "name": "collection",
         "group": "androidx.collection",
-        "version": "1.0.0"
+        "version": "1.1.0"
       }
     },
     {
@@ -1357,7 +1357,7 @@
       "artifactId": {
         "name": "room-rxjava2",
         "group": "androidx.room",
-        "version": "2.1.0"
+        "version": "2.2.2"
       }
     },
     {
@@ -1421,7 +1421,7 @@
       "artifactId": {
         "name": "rxjava",
         "group": "io.reactivex.rxjava2",
-        "version": "2.2.6"
+        "version": "2.2.9"
       }
     },
     {
@@ -1501,7 +1501,7 @@
       "artifactId": {
         "name": "kotlin-stdlib",
         "group": "org.jetbrains.kotlin",
-        "version": "1.3.50"
+        "version": "1.3.60"
       }
     },
     {
@@ -1597,7 +1597,7 @@
       "artifactId": {
         "name": "slf4j-api",
         "group": "org.slf4j",
-        "version": "1.7.25"
+        "version": "1.7.26"
       }
     },
     {
@@ -1613,7 +1613,7 @@
       "artifactId": {
         "name": "kotlin-stdlib-common",
         "group": "org.jetbrains.kotlin",
-        "version": "1.3.40"
+        "version": "1.3.60"
       }
     },
     {
@@ -1709,7 +1709,7 @@
       "artifactId": {
         "name": "kotlin-stdlib-jdk7",
         "group": "org.jetbrains.kotlin",
-        "version": "1.3.50"
+        "version": "1.3.60"
       }
     },
     {
diff --git a/app/src/main/java/org/tasks/data/TagData.java b/app/src/main/java/org/tasks/data/TagData.java
index 5960b9a20..5aafcaa19 100644
--- a/app/src/main/java/org/tasks/data/TagData.java
+++ b/app/src/main/java/org/tasks/data/TagData.java
@@ -76,7 +76,7 @@ public final class TagData implements Parcelable {
     return id;
   }
 
-  public void setId(long id) {
+  public void setId(Long id) {
     this.id = id;
   }
 
@@ -108,7 +108,7 @@ public final class TagData implements Parcelable {
     return color;
   }
 
-  public void setColor(int color) {
+  public void setColor(Integer color) {
     this.color = color;
   }
 
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index a1ccdd277..1f18567bc 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -6,7 +6,7 @@ object Versions {
     const val butterknife = "10.2.0"
     const val work = "2.0.1"
     const val leakcanary = "2.0-beta-5"
-    const val room = "2.1.0"
+    const val room = "2.2.2"
     const val crashlytics = "2.10.1"
     const val firebase = "16.0.9"
     const val okhttp = "3.12.3" // 3.13 minSdk is 21