Merge branch 'release/4.0.0'

duckduckgo · Jan 19, 2018 · 03aded3 · 03aded3
2 parents 3697a95 + b8e44c3
commit 03aded3
Show file tree

Hide file tree

Showing 104 changed files with 3,527 additions and 908 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,14 +6,14 @@ apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
 ext {
-    VERSION_NAME = "0.10.0"
+    VERSION_NAME = "4.0.0"
 }
 
 android {
     compileSdkVersion 27
     buildToolsVersion "26.0.2"
     defaultConfig {
-        applicationId "com.duckduckgo.app"
+        applicationId "com.duckduckgo.mobile.android"
         minSdkVersion 21
         targetSdkVersion 27
         versionCode buildVersionCode()
@@ -32,7 +32,6 @@ android {
     }
     buildTypes {
         debug {
-            testCoverageEnabled = true
         }
         release {
             minifyEnabled false
@@ -75,6 +74,7 @@ ext {
     architectureComponents = "1.0.0"
     dagger = "2.14.1"
     retrofit = "2.3.0"
+    ankoVersion = "0.10.4"
 }
 
 
@@ -95,6 +95,13 @@ dependencies {
     implementation "com.google.dagger:dagger-android-support:$dagger"
     releaseImplementation 'com.faendir:acra:4.10.0'
 
+    // RxRelay
+    implementation "com.jakewharton.rxrelay2:rxrelay:2.0.0"
+
+    // Anko
+    compile "org.jetbrains.anko:anko-commons:$ankoVersion"
+    compile "org.jetbrains.anko:anko-design:$ankoVersion"
+
     // ViewModel and LiveData
     implementation "android.arch.lifecycle:extensions:$architectureComponents"
     kapt "android.arch.lifecycle:compiler:$architectureComponents"
@@ -105,6 +112,7 @@ dependencies {
     implementation "android.arch.persistence.room:runtime:$architectureComponents"
     kapt "android.arch.persistence.room:compiler:$architectureComponents"
     testImplementation "android.arch.persistence.room:testing:$architectureComponents"
+    androidTestImplementation "android.arch.persistence.room:testing:$architectureComponents"
 
     // Dagger
     kapt "com.google.dagger:dagger-android-processor:$dagger"

diff --git a/...ckduckgo.app.global.db.AppDatabase/4.json → ...ckduckgo.app.global.db.AppDatabase/1.json b/...ckduckgo.app.global.db.AppDatabase/4.json → ...ckduckgo.app.global.db.AppDatabase/1.json
@@ -1,8 +1,8 @@
 {
   "formatVersion": 1,
   "database": {
-    "version": 4,
-    "identityHash": "df2202389ba5b11018b57a417457b11b",
+    "version": 1,
+    "identityHash": "cf29693b9b6c4b791ee9c6cc434e0ee6",
     "entities": [
       {
         "tableName": "https_upgrade_domain",
@@ -114,11 +114,43 @@
         },
         "indices": [],
         "foreignKeys": []
+      },
+      {
+        "tableName": "bookmarks",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT, `url` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "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\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"cf29693b9b6c4b791ee9c6cc434e0ee6\")"
     ]
   }
 }
diff --git a/app/schemas/com.duckduckgo.app.global.db.AppDatabase/2.json b/app/schemas/com.duckduckgo.app.global.db.AppDatabase/2.json
diff --git a/app/schemas/com.duckduckgo.app.global.db.AppDatabase/3.json b/app/schemas/com.duckduckgo.app.global.db.AppDatabase/3.json