Merge branch 'develop' into fix/scancode-fallback

sds100 · web-flow · commit bd8581545ebc · 2025-03-29T09:10:42.000+01:00
diff --git a/app/src/main/java/io/github/sds100/keymapper/backup/BackupManager.kt b/app/src/main/java/io/github/sds100/keymapper/backup/BackupManager.kt
@@ -241,6 +241,9 @@ class BackupManagerImpl(
 
                 // Do nothing because this just add the floating layouts table and indexes.
                 JsonMigration(13, 14) { json -> json },
+
+                // Do nothing just added floating button entity columns
+                JsonMigration(14, 15) { json -> json },
             )
 
             if (keyMapListJsonArray != null) {
diff --git a/app/version.properties b/app/version.properties
@@ -1,3 +1,3 @@
 VERSION_NAME=3.0.0-beta.3
-VERSION_CODE=84
+VERSION_CODE=85
 VERSION_NUM=0

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,9 @@ class BackupManagerImpl(`
`241`	`241`
`242`	`242`	`// Do nothing because this just add the floating layouts table and indexes.`
`243`	`243`	`JsonMigration(13, 14) { json -> json },`
	`244`	`+`
	`245`	`+ // Do nothing just added floating button entity columns`
	`246`	`+ JsonMigration(14, 15) { json -> json },`
`244`	`247`	`)`
`245`	`248`
`246`	`249`	`if (keyMapListJsonArray != null) {`