From 3f944c1bb27221557af999a0c9774c6848c5bbdc Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Mon, 17 Jul 2023 21:09:21 -0400 Subject: [PATCH 1/2] Fix MigrationTestHelper deprecation --- .../java/org/schabi/newpipe/database/DatabaseMigrationTest.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt b/app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt index 5e9fc6d9e31..88e7372051b 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt +++ b/app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt @@ -4,7 +4,6 @@ import android.content.ContentValues import android.database.sqlite.SQLiteDatabase import androidx.room.Room import androidx.room.testing.MigrationTestHelper -import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry @@ -33,8 +32,7 @@ class DatabaseMigrationTest { @get:Rule val testHelper = MigrationTestHelper( InstrumentationRegistry.getInstrumentation(), - AppDatabase::class.java.canonicalName, - FrameworkSQLiteOpenHelperFactory() + AppDatabase::class.java ) @Test From a01e59e9dbc772232e2311e9928e0c0223a0a06e Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Mon, 17 Jul 2023 21:09:44 -0400 Subject: [PATCH 2/2] Update AndroidX Room library --- app/build.gradle | 2 +- .../database/feed/model/FeedGroupSubscriptionEntity.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 00e7a857427..6ea465ed5fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -110,7 +110,7 @@ ext { checkstyleVersion = '10.12.1' androidxLifecycleVersion = '2.5.1' - androidxRoomVersion = '2.4.3' + androidxRoomVersion = '2.5.2' androidxWorkVersion = '2.7.1' icepickVersion = '3.2.0' diff --git a/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupSubscriptionEntity.kt b/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupSubscriptionEntity.kt index 40f7d203bd4..b114a734c5c 100644 --- a/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupSubscriptionEntity.kt +++ b/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupSubscriptionEntity.kt @@ -3,7 +3,6 @@ package org.schabi.newpipe.database.feed.model import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.ForeignKey -import androidx.room.ForeignKey.CASCADE import androidx.room.Index import org.schabi.newpipe.database.feed.model.FeedGroupSubscriptionEntity.Companion.FEED_GROUP_SUBSCRIPTION_TABLE import org.schabi.newpipe.database.feed.model.FeedGroupSubscriptionEntity.Companion.GROUP_ID @@ -19,14 +18,14 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity entity = FeedGroupEntity::class, parentColumns = [FeedGroupEntity.ID], childColumns = [GROUP_ID], - onDelete = CASCADE, onUpdate = CASCADE, deferred = true + onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true ), ForeignKey( entity = SubscriptionEntity::class, parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID], childColumns = [SUBSCRIPTION_ID], - onDelete = CASCADE, onUpdate = CASCADE, deferred = true + onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true ) ] )