Skip to content

Commit dad0b6e

Browse files
authored
Use env variable to specify keystore for signing (safe-global#804)
1 parent a1265b2 commit dad0b6e

File tree

8 files changed

+87
-292
lines changed

8 files changed

+87
-292
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ android {
5858
storeFile file("../debug.keystore")
5959
}
6060
release {
61-
storeFile file(getKey("SIGNING_KEYFILE_PATH", "../gnosis-upload.jks"))
61+
storeFile file(getKey("SIGNING_STORE_FILE", "../gnosis-multisig-upload.jks"))
6262
storePassword getKey("SIGNING_STORE_PASSWORD")
6363
keyAlias "gnosis"
6464
keyPassword getKey("SIGNING_KEY_PASSWORD")

app/src/main/java/io/gnosis/safe/di/modules/DatabaseModule.kt

-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ class DatabaseModule {
1717
@Singleton
1818
fun provideSafeDatabase(@ApplicationContext context: Context): HeimdallDatabase =
1919
Room.databaseBuilder(context, HeimdallDatabase::class.java, HeimdallDatabase.DB_NAME)
20-
.addMigrations(
21-
HeimdallDatabase.MIGRATION_1_2,
22-
HeimdallDatabase.MIGRATION_1_3,
23-
HeimdallDatabase.MIGRATION_2_3)
2420
.build()
2521

2622
@Provides

ci/upload_to_github.sh

-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# fail if any commands fails
33
set -e
44

5-
65
# Buildkite uses a clean state for each step (for concurrency)
76
source ./ci/prepare_env_buildkite.sh
87

@@ -13,7 +12,6 @@ echo "INFURA_API_KEY=$INFURA_API_KEY" > project_keys
1312

1413
./gradlew assembleRinkeby assembleRelease
1514

16-
1715
# -------- Upload to github ----------
1816
REPO="https://api.github.com/repos/gnosis/safe-android"
1917
TAGS="$REPO/releases/tags/$BUILDKITE_BRANCH"

data/schemas/io.gnosis.data.db.HeimdallDatabase/1.json

+84-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"formatVersion": 1,
33
"database": {
44
"version": 1,
5-
"identityHash": "9b91c7dbbbc37a67ed988ca4cfdba9e0",
5+
"identityHash": "b615b807dc0704ad3f4969bbbc39228b",
66
"entities": [
77
{
88
"tableName": "safes",
@@ -29,12 +29,94 @@
2929
},
3030
"indices": [],
3131
"foreignKeys": []
32+
},
33+
{
34+
"tableName": "safe_meta_data",
35+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`address` TEXT NOT NULL, `registered_notifications` INTEGER NOT NULL, PRIMARY KEY(`address`), FOREIGN KEY(`address`) REFERENCES `safes`(`address`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
36+
"fields": [
37+
{
38+
"fieldPath": "address",
39+
"columnName": "address",
40+
"affinity": "TEXT",
41+
"notNull": true
42+
},
43+
{
44+
"fieldPath": "registeredNotifications",
45+
"columnName": "registered_notifications",
46+
"affinity": "INTEGER",
47+
"notNull": true
48+
}
49+
],
50+
"primaryKey": {
51+
"columnNames": [
52+
"address"
53+
],
54+
"autoGenerate": false
55+
},
56+
"indices": [],
57+
"foreignKeys": [
58+
{
59+
"table": "safes",
60+
"onDelete": "CASCADE",
61+
"onUpdate": "CASCADE",
62+
"columns": [
63+
"address"
64+
],
65+
"referencedColumns": [
66+
"address"
67+
]
68+
}
69+
]
70+
},
71+
{
72+
"tableName": "erc20_tokens",
73+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`address` TEXT NOT NULL, `name` TEXT NOT NULL, `symbol` TEXT NOT NULL, `decimals` INTEGER NOT NULL, `logoUrl` TEXT NOT NULL, PRIMARY KEY(`address`))",
74+
"fields": [
75+
{
76+
"fieldPath": "address",
77+
"columnName": "address",
78+
"affinity": "TEXT",
79+
"notNull": true
80+
},
81+
{
82+
"fieldPath": "name",
83+
"columnName": "name",
84+
"affinity": "TEXT",
85+
"notNull": true
86+
},
87+
{
88+
"fieldPath": "symbol",
89+
"columnName": "symbol",
90+
"affinity": "TEXT",
91+
"notNull": true
92+
},
93+
{
94+
"fieldPath": "decimals",
95+
"columnName": "decimals",
96+
"affinity": "INTEGER",
97+
"notNull": true
98+
},
99+
{
100+
"fieldPath": "logoUrl",
101+
"columnName": "logoUrl",
102+
"affinity": "TEXT",
103+
"notNull": true
104+
}
105+
],
106+
"primaryKey": {
107+
"columnNames": [
108+
"address"
109+
],
110+
"autoGenerate": false
111+
},
112+
"indices": [],
113+
"foreignKeys": []
32114
}
33115
],
34116
"views": [],
35117
"setupQueries": [
36118
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
37-
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9b91c7dbbbc37a67ed988ca4cfdba9e0')"
119+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b615b807dc0704ad3f4969bbbc39228b')"
38120
]
39121
}
40122
}

data/schemas/io.gnosis.data.db.HeimdallDatabase/2.json

-84
This file was deleted.

data/schemas/io.gnosis.data.db.HeimdallDatabase/3.json

-122
This file was deleted.

0 commit comments

Comments
 (0)