Skip to content

Commit

Permalink
Merge branch 'release/0.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
subsymbolic committed Jan 11, 2018
2 parents 914d427 + 6474d78 commit 69926fe
Show file tree
Hide file tree
Showing 313 changed files with 3,216 additions and 498 deletions.
32 changes: 22 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
apply from: '../versioning.gradle'

ext {
VERSION_NAME = "0.8.0"
VERSION_NAME = "0.9.0"
}

android {
Expand All @@ -20,6 +20,12 @@ android {
versionName VERSION_NAME
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
archivesBaseName = "duckduckgo-$versionName"

javaCompileOptions {
annotationProcessorOptions {
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
}
}
}
signingConfigs {
release
Expand Down Expand Up @@ -79,7 +85,7 @@ android {
ext {
supportLibrary = "27.0.2"
architectureComponents = "1.0.0"
dagger = "2.13"
dagger = "2.14.1"
retrofit = "2.3.0"
}

Expand All @@ -94,29 +100,35 @@ dependencies {
implementation "com.squareup.retrofit2:retrofit:$retrofit"
implementation "com.squareup.retrofit2:converter-moshi:$retrofit"
implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
implementation "io.reactivex.rxjava2:rxjava:2.1.7"
implementation "io.reactivex.rxjava2:rxjava:2.1.8"
implementation "io.reactivex.rxjava2:rxandroid:2.0.1"
implementation "com.jakewharton.timber:timber:4.6.0"
implementation "android.arch.lifecycle:extensions:$architectureComponents"
implementation "android.arch.lifecycle:reactivestreams:$architectureComponents"
implementation "android.arch.persistence.room:runtime:$architectureComponents"
implementation "com.google.dagger:dagger-android:$dagger"
implementation "com.google.dagger:dagger-android-support:$dagger"
releaseImplementation 'com.faendir:acra:4.10.0'

// ViewModel and LiveData
implementation "android.arch.lifecycle:extensions:$architectureComponents"
kapt "android.arch.lifecycle:compiler:$architectureComponents"
testImplementation "android.arch.core:core-testing:$architectureComponents"
androidTestImplementation "android.arch.core:core-testing:$architectureComponents"

// Room
implementation "android.arch.persistence.room:runtime:$architectureComponents"
kapt "android.arch.persistence.room:compiler:$architectureComponents"
testImplementation "android.arch.persistence.room:testing:$architectureComponents"

// Dagger
kapt "com.google.dagger:dagger-android-processor:$dagger"
kapt "com.google.dagger:dagger-compiler:$dagger"
kapt "android.arch.persistence.room:compiler:$architectureComponents"

testImplementation "org.mockito:mockito-core:2.13.0"
testImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
testImplementation "junit:junit:4.12"
testImplementation "android.arch.core:core-testing:$architectureComponents"
testImplementation "android.arch.persistence.room:testing:$architectureComponents"

androidTestImplementation "com.android.support.test:runner:1.0.1"
androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.1"
androidTestImplementation "org.mockito:mockito-android:2.13.0"
androidTestImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
androidTestImplementation "android.arch.core:core-testing:$architectureComponents"

}
2 changes: 2 additions & 0 deletions app/lint.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
<lint>
<issue id="IconColors">
<ignore path="src/main/res/drawable*/privacygrade_icon_*" />
<ignore path="src/main/res/drawable*/icon_fire*" />
</issue>
<issue id="IconExpectedSize">
<ignore path="src/main/res/drawable-*/privacygrade_icon_*" />
</issue>
<issue id="UnusedResources">
<ignore path="src/main/res/drawable-*/network_pill_*" />
<ignore path="src/main/res/drawable-*/network_logo_*" />
</issue>
</lint>
71 changes: 71 additions & 0 deletions app/schemas/com.duckduckgo.app.global.db.AppDatabase/2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"formatVersion": 1,
"database": {
"version": 2,
"identityHash": "e91e82a2b5c652807026be5f72a6c56e",
"entities": [
{
"tableName": "https_upgrade_domain",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`domain` TEXT NOT NULL, PRIMARY KEY(`domain`))",
"fields": [
{
"fieldPath": "domain",
"columnName": "domain",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"domain"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "disconnect_tracker",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`url` TEXT NOT NULL, `category` TEXT NOT NULL, `networkName` TEXT NOT NULL, `networkUrl` TEXT NOT NULL, PRIMARY KEY(`url`))",
"fields": [
{
"fieldPath": "url",
"columnName": "url",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "category",
"columnName": "category",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "networkName",
"columnName": "networkName",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "networkUrl",
"columnName": "networkUrl",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"url"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
}
],
"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, \"e91e82a2b5c652807026be5f72a6c56e\")"
]
}
}
98 changes: 98 additions & 0 deletions app/schemas/com.duckduckgo.app.global.db.AppDatabase/3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
{
"formatVersion": 1,
"database": {
"version": 3,
"identityHash": "edcb0f51325e54c85c931334898d7916",
"entities": [
{
"tableName": "https_upgrade_domain",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`domain` TEXT NOT NULL, PRIMARY KEY(`domain`))",
"fields": [
{
"fieldPath": "domain",
"columnName": "domain",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"domain"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "disconnect_tracker",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`url` TEXT NOT NULL, `category` TEXT NOT NULL, `networkName` TEXT NOT NULL, `networkUrl` TEXT NOT NULL, PRIMARY KEY(`url`))",
"fields": [
{
"fieldPath": "url",
"columnName": "url",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "category",
"columnName": "category",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "networkName",
"columnName": "networkName",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "networkUrl",
"columnName": "networkUrl",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"url"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "network_leaderboard",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`networkName` TEXT NOT NULL, `domainVisited` TEXT NOT NULL, PRIMARY KEY(`networkName`, `domainVisited`))",
"fields": [
{
"fieldPath": "networkName",
"columnName": "networkName",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "domainVisited",
"columnName": "domainVisited",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"networkName",
"domainVisited"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
}
],
"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, \"edcb0f51325e54c85c931334898d7916\")"
]
}
}
124 changes: 124 additions & 0 deletions app/schemas/com.duckduckgo.app.global.db.AppDatabase/4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{
"formatVersion": 1,
"database": {
"version": 4,
"identityHash": "df2202389ba5b11018b57a417457b11b",
"entities": [
{
"tableName": "https_upgrade_domain",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`domain` TEXT NOT NULL, PRIMARY KEY(`domain`))",
"fields": [
{
"fieldPath": "domain",
"columnName": "domain",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"domain"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "disconnect_tracker",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`url` TEXT NOT NULL, `category` TEXT NOT NULL, `networkName` TEXT NOT NULL, `networkUrl` TEXT NOT NULL, PRIMARY KEY(`url`))",
"fields": [
{
"fieldPath": "url",
"columnName": "url",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "category",
"columnName": "category",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "networkName",
"columnName": "networkName",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "networkUrl",
"columnName": "networkUrl",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"url"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "network_leaderboard",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`networkName` TEXT NOT NULL, `domainVisited` TEXT NOT NULL, PRIMARY KEY(`networkName`, `domainVisited`))",
"fields": [
{
"fieldPath": "networkName",
"columnName": "networkName",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "domainVisited",
"columnName": "domainVisited",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"networkName",
"domainVisited"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "app_configuration",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `appConfigurationDownloaded` INTEGER NOT NULL, PRIMARY KEY(`key`))",
"fields": [
{
"fieldPath": "key",
"columnName": "key",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "appConfigurationDownloaded",
"columnName": "appConfigurationDownloaded",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"key"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
}
],
"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, \"df2202389ba5b11018b57a417457b11b\")"
]
}
}
Loading

0 comments on commit 69926fe

Please sign in to comment.