Merge branch 'release/5.14.0'

duckduckgo · Nov 30, 2018 · 34b91b5 · 34b91b5
2 parents 2613f76 + 7aa1264
commit 34b91b5
Show file tree

Hide file tree

Showing 217 changed files with 2,584 additions and 587 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,15 @@ Are you a talented cross-platform mobile developer? We are looking for a Senior
 
 Contact us at https://duckduckgo.com/feedback if you have feedback, questions or want to chat.
 
+## Building the Project
+We use git submodules and so when you are checking out the app, you'll need to ensure the submodules are initialized properly. You can use the `--recursive` flag when cloning the project to do this.
+
+    git clone --recursive https://github.com/duckduckgo/android.git
+
+Alternatively, if you already have the project checked out, you can initialize the submodules manually.
+
+    git submodule update --init
+
 ## Reporting Bugs
 
 We want our app to be as stable as possible thus your bug reports are immensely valuable. When reporting bugs let us know the:

diff --git a/app/build.gradle b/app/build.gradle
@@ -77,42 +77,53 @@ android {
 }
 
 ext {
-    supportLibrary = "28.0.0-rc01"
+    androidX = "1.0.1"
+    materialDesign = "1.1.0-alpha01"
     architectureComponents = "1.1.1"
     architectureComponentsExtensions = "1.1.1"
-    androidKtx = "0.3"
-    dagger = "2.15"
+    androidKtx = "1.0.1"
+    androidTestRunner = "1.0.2"
+    constraintLayout = "2.0.0-alpha2"
+    lifecycle = "2.0.0"
+    room = "2.1.0-alpha02"
+
+    dagger = "2.18"
     retrofit = "2.3.0"
     ankoVersion = "0.10.4"
-    glide = "4.6.1"
-    androidTestRunner = "1.0.2"
+    glide = "4.8.0"
     lottieVersion = "2.6.0-beta19"
     okHttp = "3.10.0"
+    rxJava = "2.1.10"
+    rxAndroid = "2.0.2"
+    timber = "4.6.1"
+    rxRelay = "2.0.0"
+    leakCanary = "1.5.4"
+    mockito = "2.23.0"
 }
 
 
 dependencies {
-    implementation "com.android.support:support-v4:$supportLibrary"
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
-    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanary"
+    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanary"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.android.support:appcompat-v7:$supportLibrary"
-    implementation "com.android.support:design:$supportLibrary"
-    implementation "com.android.support.constraint:constraint-layout:1.1.0"
+    implementation "androidx.appcompat:appcompat:$androidX"
+    implementation "com.google.android.material:material:$materialDesign"
+    implementation "androidx.constraintlayout:constraintlayout:$constraintLayout"
     implementation "com.squareup.okhttp3:okhttp:$okHttp"
     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.10"
-    implementation "io.reactivex.rxjava2:rxandroid:2.0.2"
-    implementation "com.jakewharton.timber:timber:4.6.1"
+    implementation "io.reactivex.rxjava2:rxjava:$rxJava"
+    implementation "io.reactivex.rxjava2:rxandroid:$rxAndroid"
+    implementation "com.jakewharton.timber:timber:$timber"
     implementation "com.google.dagger:dagger-android:$dagger"
     implementation "com.google.dagger:dagger-android-support:$dagger"
 
     // RxRelay
-    implementation "com.jakewharton.rxrelay2:rxrelay:2.0.0"
+    implementation "com.jakewharton.rxrelay2:rxrelay:$rxRelay"
 
     // Anko
     implementation "org.jetbrains.anko:anko-commons:$ankoVersion"
@@ -122,16 +133,16 @@ dependencies {
     implementation "androidx.core:core-ktx:$androidKtx"
 
     // ViewModel and LiveData
-    implementation "android.arch.lifecycle:extensions:$architectureComponentsExtensions"
-    kapt "android.arch.lifecycle:compiler:$architectureComponents"
-    testImplementation "android.arch.core:core-testing:$architectureComponents"
-    androidTestImplementation "android.arch.core:core-testing:$architectureComponents"
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle"
+    kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle"
+    testImplementation "androidx.arch.core:core-testing:$lifecycle"
+    androidTestImplementation "androidx.arch.core:core-testing:$lifecycle"
 
     // Room
-    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"
+    implementation "androidx.room:room-runtime:$room"
+    kapt "androidx.room:room-compiler:$room"
+    testImplementation "androidx.room:room-testing:$room"
+    androidTestImplementation "androidx.room:room-testing:$room"
 
     // Dagger
     kapt "com.google.dagger:dagger-android-processor:$dagger"
@@ -147,18 +158,20 @@ dependencies {
     implementation "com.airbnb.android:lottie:$lottieVersion"
 
     // Apache commons
-    implementation 'org.apache.commons:commons-math3:3.6.1'
+    implementation "org.apache.commons:commons-math3:3.6.1"
 
-    testImplementation "org.mockito:mockito-core:2.15.0"
+    testImplementation "org.mockito:mockito-core:$mockito"
     testImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
     testImplementation "junit:junit:4.12"
 
-    androidTestImplementation "com.android.support.test:runner:$androidTestRunner"
-    androidTestImplementation "com.android.support.test:rules:$androidTestRunner"
-    androidTestUtil "com.android.support.test:orchestrator:1.0.2"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.2"
-    androidTestImplementation "org.mockito:mockito-android:2.15.0"
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test:rules:1.1.0'
+    androidTestUtil "androidx.test:orchestrator:1.1.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.1.0"
+    androidTestImplementation "org.mockito:mockito-android:$mockito"
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:$okHttp"
     androidTestImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
 
+    kapt "com.android.tools.build.jetifier:jetifier-core:$jetifier"
+    annotationProcessor "com.android.tools.build.jetifier:jetifier-core:$jetifier"
 }