Remove build flavors for pre and post 21 since Android Studio does this automagically in 2.3

.gitlab-ci.yml

@@ -21,4 +21,4 @@ stages:
 build:
   stage: build
   script:
-    - ./gradlew testFdroidDevDebug
\ No newline at end of file
+    - ./gradlew testFdroidDebug
\ No newline at end of file

app/build.gradle

@@ -42,25 +42,12 @@ android {
         multiDexEnabled true
     }
-    flavorDimensions "TYPE", "API"
-
     productFlavors {
-        // https://developer.android.com/tools/building/multidex.html#dev-build
-        dev {
-            dimension "API"
-            minSdkVersion 21
-        }
-        prod {
-            dimension "API"
-        }
-
         normal {
-            dimension "TYPE"
         }
         fdroid {
-            dimension "TYPE"
         }
     }
@@ -94,7 +81,7 @@ ext {
     parcelerVersion = '1.1.6'
     reptarVersion = '2.3.0'
     adapterLayout = '1.1.0'
-    materialDialogsVersion = '0.9.3.0'
+    materialDialogsVersion = '0.9.4.1'
 }
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
@@ -102,6 +89,7 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     compile "com.android.support:appcompat-v7:$supportLibVersion"
+    compile "com.android.support:support-v13:$supportLibVersion"
     compile "com.android.support:design:$supportLibVersion"
     compile "com.android.support:recyclerview-v7:$supportLibVersion"
     compile "com.android.support:cardview-v7:$supportLibVersion"
@@ -133,12 +121,12 @@ dependencies {
     compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'io.reactivex.rxjava2:rxjava:2.0.1'
+    compile 'io.reactivex.rxjava2:rxjava:2.0.7'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
     compile 'com.trello.rxlifecycle2:rxlifecycle-components:2.0.1'
-    compile 'net.danlew:android.joda:2.9.5.1'
+    compile 'net.danlew:android.joda:2.9.7'
     compile "org.parceler:parceler-api:$parcelerVersion"
     kapt "org.parceler:parceler:$parcelerVersion"
@@ -160,7 +148,7 @@ dependencies {
     compile 'com.github.Commit451.Alakazam:alakazam:1.0.1@aar'
     compile 'com.github.Commit451:Lift:1.2.0'
     compile 'com.github.Commit451:OkioProGuardRules:1.11.0.0'
-    compile 'com.github.Commit451:RetrofitProguardRules:2.1.0.0'
+    compile 'com.github.Commit451:RetrofitProguardRules:2.2.0.0'
     compile 'com.github.Commit451:LoganSquareProGuardRules:1.3.7.0'
     compile 'com.github.Commit451:EventBusProGuardRules:3.0.0.0'
@@ -176,9 +164,7 @@ dependencies {
     compile 'com.github.alorma:diff-textview:1.3.0'
-    compile 'com.wdullaer:materialdatetimepicker:3.1.2'
-
-    compile 'com.wefika:flowlayout:0.4.1'
+    compile 'com.wdullaer:materialdatetimepicker:3.1.3'
     compile 'com.github.novoda:simple-chrome-custom-tabs:0.1.4'
@@ -197,7 +183,7 @@ dependencies {
         transitive = true;
     }
-    normalCompile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
+    normalCompile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
         transitive = true;
     }
@@ -206,5 +192,5 @@ dependencies {
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
     testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.2.2'
+    testCompile 'org.robolectric:robolectric:3.3.1'
 }

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         //check with ./gradlew dependencyUpdates
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'