Update room dependency to 2.0.0.
This solves androidx compatibility problem.
Bug: 73950974
Test: run radio app and add/remove favorites.
Change-Id: I0956b848a32834b82a689da148a531c77b00b806
Merged-In: I0956b848a32834b82a689da148a531c77b00b806
(cherry picked from commit 371bfc94eee2b07e6927149574254802dc83f4a8)
(cherry picked from commit 87dbdaae01a95c5de0118aa6d55fbbba5ca8de24)
(cherry picked from commit 9ecb0e5cd5951c87277258b98a62d3ff681f4107)
diff --git a/Android.mk b/Android.mk
index 982b031..943ea60 100644
--- a/Android.mk
+++ b/Android.mk
@@ -40,29 +40,25 @@
LOCAL_JAVA_LIBRARIES += android.car
LOCAL_STATIC_ANDROID_LIBRARIES += \
- androidx.car_car \
androidx-constraintlayout_constraintlayout \
+ androidx.car_car \
car-apps-common \
car-broadcastradio-support \
car-stream-ui-lib
-# Dependency for bcradio-android-arch-room-runtime-nodeps
-LOCAL_STATIC_ANDROID_LIBRARIES += \
- android-support-v4
-
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-arch-lifecycle-livedata \
- android-arch-persistence-db-framework \
- android-arch-persistence-db \
android-support-constraint-layout-solver \
- bcradio-android-arch-room-common-nodeps \
- bcradio-android-arch-room-runtime-nodeps
+ androidx.lifecycle_lifecycle-livedata \
+ androidx.sqlite_sqlite-framework \
+ androidx.sqlite_sqlite \
+ bcradio-androidx-room-common-nodeps \
+ bcradio-androidx-room-runtime-nodeps
LOCAL_ANNOTATION_PROCESSORS := \
- bcradio-android-arch-room-common-nodeps \
- bcradio-android-arch-room-compiler-nodeps \
- bcradio-android-arch-room-migration-nodeps \
- bcradio-android-support-annotations-nodeps \
+ bcradio-androidx-annotation-nodeps \
+ bcradio-androidx-room-common-nodeps \
+ bcradio-androidx-room-compiler-nodeps \
+ bcradio-androidx-room-migration-nodeps \
bcradio-antlr4-nodeps \
bcradio-apache-commons-codec-nodeps \
bcradio-auto-common-nodeps \
@@ -73,7 +69,7 @@
kotlin-stdlib
LOCAL_ANNOTATION_PROCESSOR_CLASSES := \
- android.arch.persistence.room.RoomProcessor
+ androidx.room.RoomProcessor
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
@@ -86,21 +82,20 @@
include $(CLEAR_VARS)
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
- bcradio-android-arch-room-runtime-nodeps:libs/android-arch/room/runtime-1.1.0-beta3.aar \
- bcradio-android-arch-room-common-nodeps:libs/android-arch/room/common-1.1.0-beta3.jar
+ bcradio-androidx-room-runtime-nodeps:libs/androidx.room/room-runtime-2.0.0-alpha1.aar \
+ bcradio-androidx-room-common-nodeps:libs/androidx.room/room-common-2.0.0-alpha1.jar
include $(BUILD_MULTI_PREBUILT)
include $(CLEAR_VARS)
COMMON_LIBS_PATH := ../../../../prebuilts/tools/common/m2/repository
-MAVEN_LIBS_PATH := ../../../../prebuilts/maven_repo/android
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
- bcradio-android-arch-room-common-nodeps:libs/android-arch/room/common-1.1.0-beta3.jar \
- bcradio-android-arch-room-compiler-nodeps:libs/android-arch/room/compiler-1.1.0-beta3.jar \
- bcradio-android-arch-room-migration-nodeps:libs/android-arch/room/migration-1.1.0-beta3.jar \
- bcradio-android-support-annotations-nodeps:$(MAVEN_LIBS_PATH)/com/android/support/support-annotations/27.1.0/support-annotations-27.1.0.jar \
+ bcradio-androidx-room-common-nodeps:libs/androidx.room/room-common-2.0.0-alpha1.jar \
+ bcradio-androidx-room-compiler-nodeps:libs/androidx.room/room-compiler-2.0.0-alpha1.jar \
+ bcradio-androidx-room-migration-nodeps:libs/androidx.room/room-migration-2.0.0-alpha1.jar \
+ bcradio-androidx-annotation-nodeps:libs/annotation-1.0.0-alpha1.jar \
bcradio-antlr4-nodeps:$(COMMON_LIBS_PATH)/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar \
bcradio-apache-commons-codec-nodeps:$(COMMON_LIBS_PATH)/org/eclipse/tycho/tycho-bundles-external/0.18.1/eclipse/plugins/org.apache.commons.codec_1.4.0.v201209201156.jar \
bcradio-auto-common-nodeps:$(COMMON_LIBS_PATH)/com/google/auto/auto-common/0.9/auto-common-0.9.jar \
diff --git a/libs/android-arch/room/common-1.1.0-beta3.jar b/libs/android-arch/room/common-1.1.0-beta3.jar
deleted file mode 100644
index 8539f0b..0000000
--- a/libs/android-arch/room/common-1.1.0-beta3.jar
+++ /dev/null
Binary files differ
diff --git a/libs/android-arch/room/compiler-1.1.0-beta3.jar b/libs/android-arch/room/compiler-1.1.0-beta3.jar
deleted file mode 100644
index 9fe428f..0000000
--- a/libs/android-arch/room/compiler-1.1.0-beta3.jar
+++ /dev/null
Binary files differ
diff --git a/libs/android-arch/room/migration-1.1.0-beta3.jar b/libs/android-arch/room/migration-1.1.0-beta3.jar
deleted file mode 100644
index 61f4559..0000000
--- a/libs/android-arch/room/migration-1.1.0-beta3.jar
+++ /dev/null
Binary files differ
diff --git a/libs/android-arch/room/runtime-1.1.0-beta3.aar b/libs/android-arch/room/runtime-1.1.0-beta3.aar
deleted file mode 100644
index 89093f7..0000000
--- a/libs/android-arch/room/runtime-1.1.0-beta3.aar
+++ /dev/null
Binary files differ
diff --git a/libs/androidx.room/room-common-2.0.0-alpha1.jar b/libs/androidx.room/room-common-2.0.0-alpha1.jar
new file mode 100644
index 0000000..2c09fdf
--- /dev/null
+++ b/libs/androidx.room/room-common-2.0.0-alpha1.jar
Binary files differ
diff --git a/libs/androidx.room/room-compiler-2.0.0-alpha1.jar b/libs/androidx.room/room-compiler-2.0.0-alpha1.jar
new file mode 100644
index 0000000..a95872d
--- /dev/null
+++ b/libs/androidx.room/room-compiler-2.0.0-alpha1.jar
Binary files differ
diff --git a/libs/androidx.room/room-migration-2.0.0-alpha1.jar b/libs/androidx.room/room-migration-2.0.0-alpha1.jar
new file mode 100644
index 0000000..4851df9
--- /dev/null
+++ b/libs/androidx.room/room-migration-2.0.0-alpha1.jar
Binary files differ
diff --git a/libs/androidx.room/room-runtime-2.0.0-alpha1.aar b/libs/androidx.room/room-runtime-2.0.0-alpha1.aar
new file mode 100644
index 0000000..ca797dd
--- /dev/null
+++ b/libs/androidx.room/room-runtime-2.0.0-alpha1.aar
Binary files differ
diff --git a/libs/annotation-1.0.0-alpha1.jar b/libs/annotation-1.0.0-alpha1.jar
new file mode 100644
index 0000000..3bfd348
--- /dev/null
+++ b/libs/annotation-1.0.0-alpha1.jar
Binary files differ
diff --git a/src/com/android/car/radio/storage/Favorite.java b/src/com/android/car/radio/storage/Favorite.java
index 596099b..07f3baf 100644
--- a/src/com/android/car/radio/storage/Favorite.java
+++ b/src/com/android/car/radio/storage/Favorite.java
@@ -16,11 +16,12 @@
package com.android.car.radio.storage;
-import android.arch.persistence.room.Embedded;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.PrimaryKey;
import android.hardware.radio.ProgramSelector;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
+import androidx.room.Embedded;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
import com.android.car.broadcastradio.support.Program;
diff --git a/src/com/android/car/radio/storage/IdentifierEntity.java b/src/com/android/car/radio/storage/IdentifierEntity.java
index ccda8ba..1068f9b 100644
--- a/src/com/android/car/radio/storage/IdentifierEntity.java
+++ b/src/com/android/car/radio/storage/IdentifierEntity.java
@@ -16,11 +16,12 @@
package com.android.car.radio.storage;
-import android.annotation.Nullable;
-import android.arch.persistence.room.Entity;
import android.hardware.radio.ProgramSelector;
import android.hardware.radio.ProgramSelector.IdentifierType;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.room.Entity;
@Entity
class IdentifierEntity {
diff --git a/src/com/android/car/radio/storage/ProgramSelectorConverter.java b/src/com/android/car/radio/storage/ProgramSelectorConverter.java
index a41a527..8354046 100644
--- a/src/com/android/car/radio/storage/ProgramSelectorConverter.java
+++ b/src/com/android/car/radio/storage/ProgramSelectorConverter.java
@@ -16,10 +16,11 @@
package com.android.car.radio.storage;
-import android.arch.persistence.room.TypeConverter;
import android.hardware.radio.ProgramSelector;
import android.net.Uri;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
+import androidx.room.TypeConverter;
import com.android.car.broadcastradio.support.platform.ProgramSelectorExt;
diff --git a/src/com/android/car/radio/storage/RadioDatabase.java b/src/com/android/car/radio/storage/RadioDatabase.java
index 29e9078..4473dd6 100644
--- a/src/com/android/car/radio/storage/RadioDatabase.java
+++ b/src/com/android/car/radio/storage/RadioDatabase.java
@@ -16,20 +16,21 @@
package com.android.car.radio.storage;
-import android.annotation.WorkerThread;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.Transformations;
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Database;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
-import android.arch.persistence.room.Room;
-import android.arch.persistence.room.RoomDatabase;
-import android.arch.persistence.room.TypeConverters;
import android.content.Context;
import android.hardware.radio.ProgramSelector;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Transformations;
+import androidx.room.Dao;
+import androidx.room.Database;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
+import androidx.room.TypeConverters;
import com.android.car.broadcastradio.support.Program;
diff --git a/src/com/android/car/radio/storage/RadioStorage.java b/src/com/android/car/radio/storage/RadioStorage.java
index b77a64c..4598bc3 100644
--- a/src/com/android/car/radio/storage/RadioStorage.java
+++ b/src/com/android/car/radio/storage/RadioStorage.java
@@ -16,9 +16,6 @@
package com.android.car.radio.storage;
-import android.annotation.NonNull;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.Observer;
import android.content.Context;
import android.content.SharedPreferences;
import android.hardware.radio.ProgramSelector;
@@ -26,6 +23,10 @@
import android.os.AsyncTask;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+
import com.android.car.broadcastradio.support.Program;
import com.android.car.radio.utils.ProgramSelectorUtils;
