Update and simplify dependencies of sample apps (#104)

Author: Matthew Dolan

buildSrc/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Babylon Partners Limited
+ * Copyright 2020 Babylon Partners Limited
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

buildSrc/src/main/kotlin/DependencyManagement.kt

@@ -29,20 +29,11 @@ object Versions {
     const val androidxLifecycles = "2.2.0"
     const val androidxAnnotation = "1.1.0"
     const val androidxTesting = "2.1.0"
-    const val androidxAppCompat = "1.1.0"
-    const val androidxConstrainLayout = "1.1.3"
-    const val androidMaterial = "1.1.0"
-    const val androidxNavigation = "2.3.0"
 
     const val rxJava1 = "1.3.8"
     const val rxJava2 = "2.2.19"
     const val rxJava3 = "3.0.4"
 
-    const val koin = "2.1.6"
-    const val groupie = "2.8.1"
-
-    const val lightstreamer = "4.2.1"
-
     const val desugar = "1.0.10"
 
     // Testing
@@ -57,43 +48,16 @@ object Versions {
 
 object ProjectDependencies {
     // Kotlin
-    const val kotlinCoroutines =
-        "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}"
-    const val kotlinCoroutinesRx2 =
-        "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:${Versions.coroutines}"
-    const val kotlinCoroutinesRx3 =
-        "org.jetbrains.kotlinx:kotlinx-coroutines-rx3:${Versions.coroutines}"
+    const val kotlinCoroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}"
+    const val kotlinCoroutinesRx2 = "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:${Versions.coroutines}"
+    const val kotlinCoroutinesRx3 = "org.jetbrains.kotlinx:kotlinx-coroutines-rx3:${Versions.coroutines}"
     const val kotlinTest = "org.jetbrains.kotlin:kotlin-test:${Versions.kotlin}"
 
     // AndroidX
-    const val androidxAppCompat = "androidx.appcompat:appcompat:${Versions.androidxAppCompat}"
     const val androidxAnnotation = "androidx.annotation:annotation:${Versions.androidxAnnotation}"
-    const val androidxConstraintLayout =
-        "androidx.constraintlayout:constraintlayout:${Versions.androidxConstrainLayout}"
-    const val androidxLifecycleComponents =
-        "androidx.lifecycle:lifecycle-extensions:${Versions.androidxLifecycles}"
-    const val androidxLifecycleCompiler =
-        "androidx.lifecycle:lifecycle-compiler:${Versions.androidxLifecycles}"
-    const val androidxLifecycleSavedState =
-        "androidx.lifecycle:lifecycle-viewmodel-savedstate:${Versions.androidxLifecycles}"
-    const val androidxLifecycleKtx =
-        "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.androidxLifecycles}"
-    const val androidMaterial = "com.google.android.material:material:${Versions.androidMaterial}"
-    const val androidxNavigationFragmentKtx = "androidx.navigation:navigation-fragment-ktx:${Versions.androidxNavigation}"
-    const val androidxNavigationUiKtx = "androidx.navigation:navigation-ui-ktx:${Versions.androidxNavigation}"
-
-    // Streaming service
-    const val lightstreamer = "com.lightstreamer:ls-android-client:${Versions.lightstreamer}"
-
-    // Dependency injection
-    const val koinViewModel = "org.koin:koin-androidx-viewmodel:${Versions.koin}"
-    const val koinTest = "org.koin:koin-test:${Versions.koin}"
-
-    // UI
-    const val groupie = "com.xwray:groupie:${Versions.groupie}"
-    const val groupieKotlinAndroidExtensions =
-        "com.xwray:groupie-kotlin-android-extensions:${Versions.groupie}"
-    const val groupieViewBinding = "com.xwray:groupie-viewbinding:${Versions.groupie}"
+    const val androidxLifecycleComponents = "androidx.lifecycle:lifecycle-extensions:${Versions.androidxLifecycles}"
+    const val androidxLifecycleSavedState = "androidx.lifecycle:lifecycle-viewmodel-savedstate:${Versions.androidxLifecycles}"
+    const val androidxLifecycleKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.androidxLifecycles}"
 
     // RxJava
     const val rxJava1 = "io.reactivex:rxjava:${Versions.rxJava1}"
@@ -102,13 +66,10 @@ object ProjectDependencies {
 
     // Tools
     const val detektFormatting = "io.gitlab.arturbosch.detekt:detekt-formatting:${Versions.detektPlugin}"
-    const val desugar = "com.android.tools:desugar_jdk_libs:${Versions.desugar}"
 
     // Test prerequisites
-    const val androidXTesting =
-        "androidx.arch.core:core-testing:${Versions.androidxTesting}"
-    const val junitPlatformConsole =
-        "org.junit.platform:junit-platform-console:${Versions.junitPlatform}"
+    const val androidxTesting = "androidx.arch.core:core-testing:${Versions.androidxTesting}"
+    const val junitPlatformConsole = "org.junit.platform:junit-platform-console:${Versions.junitPlatform}"
     const val assertJ = "org.assertj:assertj-core:${Versions.assertJ}"
     const val mockitoKotlin = "com.nhaarman.mockitokotlin2:mockito-kotlin:${Versions.mockitoKotlin}"
     const val mockitoInline = "org.mockito:mockito-inline:${Versions.mockito}"

gradle.properties

@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Babylon Partners Limited
+# Copyright 2020 Babylon Partners Limited
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

gradle/scripts/detekt.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Babylon Partners Limited
+ * Copyright 2020 Babylon Partners Limited
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

orbit-2-livedata/orbit-2-livedata_build.gradle.kts

@@ -17,7 +17,6 @@
 plugins {
     id("com.android.library")
     kotlin("android")
-    kotlin("kapt")
 }
 
 dependencies {
@@ -28,7 +27,7 @@ dependencies {
 
     // Testing
     testImplementation(project(":orbit-2-test"))
-    testImplementation(ProjectDependencies.androidXTesting)
+    testImplementation(ProjectDependencies.androidxTesting)
     testImplementation(ProjectDependencies.kotlinCoroutines)
     GroupedDependencies.testsImplementation.forEach { testImplementation(it) }
     testRuntimeOnly(ProjectDependencies.junitJupiterEngine)

orbit-2-livedata/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright 2019 Babylon Partners Limited
+  ~ Copyright 2020 Babylon Partners Limited
   ~
   ~  Licensed under the Apache License, Version 2.0 (the "License");
   ~  you may not use this file except in compliance with the License.

orbit-2-viewmodel/orbit-2-viewmodel_build.gradle.kts

@@ -17,7 +17,6 @@
 plugins {
     id("com.android.library")
     kotlin("android")
-    kotlin("kapt")
     id("kotlin-android-extensions")
 }
 

samples/orbit-2-calculator/orbit-2-calculator_build.gradle.kts

@@ -17,7 +17,6 @@
 plugins {
     id("com.android.application")
     kotlin("android")
-    kotlin("kapt")
     id("kotlin-android-extensions")
 }
 
@@ -29,7 +28,6 @@ android {
         versionCode = 1
         versionName = "1.0"
         applicationId = "com.babylon.orbit2.sample.calculator"
-        testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         getByName("release") {
@@ -54,14 +52,16 @@ dependencies {
     implementation(project(":orbit-2-livedata"))
     implementation(project(":orbit-2-viewmodel"))
 
-    implementation(ProjectDependencies.androidxAppCompat)
-    implementation(ProjectDependencies.androidxConstraintLayout)
-    implementation(ProjectDependencies.androidMaterial)
-    implementation(ProjectDependencies.koinViewModel)
+    implementation("androidx.constraintlayout:constraintlayout:1.1.3")
+    implementation("com.google.android.material:material:1.1.0")
+    implementation("org.koin:koin-androidx-viewmodel:2.1.6")
 
     // Testing
     testImplementation(project(":orbit-2-test"))
-    GroupedDependencies.testsImplementation.forEach { testImplementation(it) }
-    testRuntimeOnly(ProjectDependencies.junitJupiterEngine)
-    testImplementation(ProjectDependencies.koinTest)
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.2")
+    testImplementation("org.junit.platform:junit-platform-console:1.6.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:5.6.2")
+    testImplementation("junit:junit:4.13")
+    testImplementation("com.appmattus.fixture:fixture:0.9.4")
 }

samples/orbit-2-posts/orbit-2-posts_build.gradle.kts

@@ -17,7 +17,6 @@
 plugins {
     id("com.android.application")
     kotlin("android")
-    kotlin("kapt")
     id("kotlin-android-extensions")
     id("androidx.navigation.safeargs.kotlin")
 }
@@ -35,7 +34,6 @@ android {
         applicationId = "com.babylon.orbit2.sample.posts"
         versionCode = 1
         versionName = "1.0"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         getByName("release") {
@@ -51,18 +49,8 @@ dependencies {
     implementation(project(":orbit-2-livedata"))
     implementation(project(":orbit-2-viewmodel"))
 
-    // Kotlin
-    implementation(ProjectDependencies.kotlinCoroutines)
-
     // UI
-    implementation("androidx.appcompat:appcompat:1.1.0")
-    implementation("androidx.vectordrawable:vectordrawable:1.1.0")
-    implementation("androidx.annotation:annotation:1.1.0")
-    implementation("androidx.recyclerview:recyclerview:1.1.0")
     implementation("androidx.constraintlayout:constraintlayout:1.1.3")
-    implementation("androidx.core:core-ktx:1.3.1")
-    implementation("androidx.arch.core:core-runtime:2.1.0")
-    implementation("androidx.arch.core:core-common:2.1.0")
     implementation("com.google.android.material:material:1.1.0")
     implementation("com.github.bumptech.glide:glide:4.11.0")
     implementation("com.xwray:groupie:2.8.1")
@@ -76,24 +64,18 @@ dependencies {
     implementation("com.squareup.retrofit2:converter-jackson:2.9.0")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1")
 
+    // Dependency Injection
+    implementation("org.koin:koin-androidx-viewmodel:2.1.6")
+
     // Testing
     testImplementation(project(":orbit-2-test"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.2")
     testImplementation("org.junit.platform:junit-platform-console:1.6.2")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.6.2")
+    testImplementation("junit:junit:4.13")
     testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
     testImplementation("org.mockito:mockito-inline:3.4.6")
     testImplementation("com.appmattus.fixture:fixture:0.9.4")
-    testImplementation("androidx.test:core-ktx:1.2.0")
-    testImplementation("androidx.arch.core:core-testing:2.1.0")
-    testImplementation("org.robolectric:robolectric:4.3.1")
     testImplementation("com.squareup.retrofit2:retrofit-mock:2.9.0")
-
-    // Debugging
-    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.4")
-    implementation("com.squareup.leakcanary:plumber-android:2.4")
-
-    // Dependency Injection
-    implementation("org.koin:koin-androidx-viewmodel:2.1.6")
 }

samples/orbit-2-posts/src/main/java/com/babylon/orbit2/sample/posts/data/posts/PostDataRepository.kt

@@ -42,7 +42,7 @@ class PostDataRepository(
                     post.id,
                     avatarUrlGenerator.generateUrl(user.email),
                     post.title,
-                    user.username
+                    user.name
                 )
             }
         }