Merge branch 'bendikv-master'

simonebortolin · simonebortolin · commit 74d957db6355 · 2017-12-31T18:08:39.000+01:00
diff --git a/flowlayoutmanager/build.gradle b/flowlayoutmanager/build.gradle
@@ -35,9 +35,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    dexOptions {
-        incremental true
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,6 @@ android {`
`35`	`35`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`- dexOptions {`
`39`		`- incremental true`
`40`		`- }`
`41`	`38`	`compileOptions {`
`42`	`39`	`sourceCompatibility JavaVersion.VERSION_1_7`
`43`	`40`	`targetCompatibility JavaVersion.VERSION_1_7`