Skip to content

Commit 1eb5b4e

Browse files
committed
Resolve conflict.
1 parent e0bf81e commit 1eb5b4e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ dependencies {
1414
implementation "com.github.LibChecker:LibChecker-Rules-Bundle:${latest_version}"
1515
1616
// Required: AndroidX Room
17-
implementation 'androidx.room:room-runtime:2.4.2'
18-
implementation 'androidx.room:room-ktx:2.4.2'
17+
implementation 'androidx.room:room-runtime:2.5.0'
18+
implementation 'androidx.room:room-ktx:2.5.0'
1919
2020
// Required: Kotlin Coroutines
2121
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'

library/src/main/java/com/absinthe/rulesbundle/RuleDatabase_Impl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void dropAllTables(SupportSQLiteDatabase _db) {
5252
}
5353

5454
@Override
55-
protected void onCreate(SupportSQLiteDatabase _db) {
55+
public void onCreate(SupportSQLiteDatabase _db) {
5656
if (mCallbacks != null) {
5757
for (int _i = 0, _size = mCallbacks.size(); _i < _size; _i++) {
5858
mCallbacks.get(_i).onCreate(_db);
@@ -81,7 +81,7 @@ public void onPostMigrate(SupportSQLiteDatabase _db) {
8181
}
8282

8383
@Override
84-
protected ValidationResult onValidateSchema(SupportSQLiteDatabase _db) {
84+
public ValidationResult onValidateSchema(SupportSQLiteDatabase _db) {
8585
final HashMap<String, Column> _columnsRulesTable = new HashMap<String, Column>(7);
8686
_columnsRulesTable.put("_id", new Column("_id", "INTEGER", true, 1, null, TableInfo.CREATED_FROM_ENTITY));
8787
_columnsRulesTable.put("name", new Column("name", "TEXT", true, 0, null, TableInfo.CREATED_FROM_ENTITY));

0 commit comments

Comments
 (0)