Commit 7d78b03f authored by Matthieu's avatar Matthieu

Merge branch 'next_release' into 'master'

Next release

See merge request !270
parents 94cb52e2 6c668633
Pipeline #294 passed with stages
in 5 minutes and 26 seconds
......@@ -24,8 +24,8 @@ android {
applicationId "com.h.pixeldroid"
minSdkVersion 23
targetSdkVersion 30
versionCode 6
versionName "1.0.alpha5"
versionCode 7
versionName "1.0.alpha6"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true'
......
......@@ -20,7 +20,7 @@ import com.h.pixeldroid.objects.Notification
PublicFeedStatusDatabaseEntity::class,
Notification::class
],
version = 1
version = 2
)
@TypeConverters(Converters::class)
abstract class AppDatabase : RoomDatabase() {
......
......@@ -16,6 +16,9 @@ class DatabaseModule(private val context: Context) {
return Room.databaseBuilder(
context,
AppDatabase::class.java, "pixeldroid"
).allowMainThreadQueries().build()
).allowMainThreadQueries()
//TODO remove this for 1.0 release
.fallbackToDestructiveMigration()
.build()
}
}
\ No newline at end of file
......@@ -4,7 +4,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:fadeScrollbars="false">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment