Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2.0.x #161

Merged
merged 7 commits into from
Feb 20, 2024
Merged

V2.0.x #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ed70db
Fix exceptions for old voices in DB when upgrading to App version 2.0.x
lumpidu Feb 12, 2024
26bef12
Database Migration 7 => 8 fix empty voice_table and current_voice_id
lumpidu Feb 12, 2024
e4d8eaf
Merge pull request #160 from grammatek/fix/db_schemas
lumpidu Feb 12, 2024
1c501de
Update version info for deployment
lumpidu Feb 12, 2024
2f24dfe
Merge remote-tracking branch 'github/v2.0.x' into v2.0.x
lumpidu Feb 12, 2024
baf1826
AppData.java: need to set a default value for schemaVersion
lumpidu Feb 12, 2024
c63b149
app/build.gradle: bump versionCode and update firebase base bom
lumpidu Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ android {
minSdkVersion 26
compileSdkVersion 34
targetSdkVersion 34
versionCode 31
versionName "2.0-beta1"
versionCode 34
versionName "2.0.2"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -253,7 +253,7 @@ dependencies {

// Import the Firebase BoM
// When using the BoM, don't specify versions in Firebase dependencies
implementation platform('com.google.firebase:firebase-bom:30.5.0')
implementation platform('com.google.firebase:firebase-bom:32.7.2')

// Add the dependency for the Firebase SDKs
implementation 'com.google.firebase:firebase-crashlytics'
Expand Down
201 changes: 201 additions & 0 deletions app/schemas/com.grammatek.simaromur.db.ApplicationDb/6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
{
"formatVersion": 1,
"database": {
"version": 6,
"identityHash": "164d16ba8d0a9234b245829c0eba2bc9",
"entities": [
{
"tableName": "voice_table",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`voiceId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `gender` TEXT NOT NULL, `internal_name` TEXT NOT NULL, `language_code` TEXT NOT NULL, `language_name` TEXT NOT NULL, `variant` TEXT NOT NULL, `type` TEXT, `update_time` TEXT, `download_time` TEXT, `url` TEXT, `download_path` TEXT, `version` TEXT, `md5_sum` TEXT, `local_size` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "voiceId",
"columnName": "voiceId",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "gender",
"columnName": "gender",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "internalName",
"columnName": "internal_name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "languageCode",
"columnName": "language_code",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "languageName",
"columnName": "language_name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "variant",
"columnName": "variant",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "updateTime",
"columnName": "update_time",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "downloadTime",
"columnName": "download_time",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "url",
"columnName": "url",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "downloadPath",
"columnName": "download_path",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "version",
"columnName": "version",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "md5Sum",
"columnName": "md5_sum",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "size",
"columnName": "local_size",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"voiceId"
]
},
"indices": [
{
"name": "index_voice_table_internal_name_gender_language_code_type",
"unique": true,
"columnNames": [
"internal_name",
"gender",
"language_code",
"type"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_voice_table_internal_name_gender_language_code_type` ON `${TABLE_NAME}` (`internal_name`, `gender`, `language_code`, `type`)"
}
],
"foreignKeys": []
},
{
"tableName": "app_data_table",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`appDataId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `schema_version` TEXT, `current_voice_id` INTEGER NOT NULL, `flite_voice_list_path` TEXT, `flite_voice_list_update_time` TEXT, `sim_voice_list_path` TEXT, `sim_voice_list_update_time` TEXT, `privacy_info_dialog_accepted` INTEGER NOT NULL DEFAULT 0, `crash_lytics_user_consent_accepted` INTEGER NOT NULL DEFAULT 0)",
"fields": [
{
"fieldPath": "appDataId",
"columnName": "appDataId",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "schemaVersion",
"columnName": "schema_version",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "currentVoiceId",
"columnName": "current_voice_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "fliteVoiceListPath",
"columnName": "flite_voice_list_path",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "fliteVoiceListUpdateTime",
"columnName": "flite_voice_list_update_time",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "simVoiceListPath",
"columnName": "sim_voice_list_path",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "simVoiceListUpdateTime",
"columnName": "sim_voice_list_update_time",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "privacyInfoDialogAccepted",
"columnName": "privacy_info_dialog_accepted",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "crashLyticsUserConsentGiven",
"columnName": "crash_lytics_user_consent_accepted",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"appDataId"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '164d16ba8d0a9234b245829c0eba2bc9')"
]
}
}
Loading
Loading