Revert gradle

Signed-off-by: Mario Danic <mario@lovelyhq.com>

build.gradle

@@ -13,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.4+'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }
@@ -29,7 +29,7 @@ configurations.all {
 }
 
 ext {
-    supportLibraryVersion = '25.3.1'
+    supportLibraryVersion = '25.2.0'
     googleLibraryVersion = '10.2.4'
 
     travisBuild = System.getenv("TRAVIS") == "true"
@@ -63,7 +63,7 @@ android {
     }
 
     compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -143,10 +143,10 @@ android {
             xml.enabled = false
             html.enabled = true
             xml {
-                destination file("$project.buildDir/reports/pmd/pmd.xml")
+                destination "$project.buildDir/reports/pmd/pmd.xml"
             }
             html {
-                destination file("$project.buildDir/reports/pmd/pmd.html")
+                destination "$project.buildDir/reports/pmd/pmd.html"
             }
         }
     }
@@ -165,7 +165,7 @@ android {
             xml.enabled = false
             html.enabled = true
             html {
-                destination file("$project.buildDir/reports/findbugs/findbugs.html")
+                destination "$project.buildDir/reports/findbugs/findbugs.html"
             }
         }
         classpath = files()
@@ -180,47 +180,47 @@ android {
 
 dependencies {
     /// dependencies for app building
-    implementation name: 'touch-image-view'
-    implementation 'com.android.support:multidex:1.0.1'
-    implementation 'com.github.nextcloud:android-library:1.0.22'
-    implementation "com.android.support:support-v4:${supportLibraryVersion}"
-    implementation "com.android.support:design:${supportLibraryVersion}"
-    implementation 'com.jakewharton:disklrucache:2.0.2'
-    implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
-    implementation "com.android.support:cardview-v7:${supportLibraryVersion}"
-    implementation 'com.github.tobiasKaminsky:android-floating-action-button:1.10.2'
-    implementation 'com.google.code.findbugs:annotations:2.0.1'
-    implementation 'commons-io:commons-io:2.5'
-    implementation 'com.github.evernote:android-job:v1.1.11'
-    implementation 'com.jakewharton:butterknife:8.5.1'
+    compile name: 'touch-image-view'
+    compile 'com.android.support:multidex:1.0.1'
+    compile 'com.github.nextcloud:android-library:1.0.22'
+    compile "com.android.support:support-v4:${supportLibraryVersion}"
+    compile "com.android.support:design:${supportLibraryVersion}"
+    compile 'com.jakewharton:disklrucache:2.0.2'
+    compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
+    compile "com.android.support:cardview-v7:${supportLibraryVersion}"
+    compile 'com.github.tobiasKaminsky:android-floating-action-button:1.10.2'
+    compile 'com.google.code.findbugs:annotations:2.0.1'
+    compile 'commons-io:commons-io:2.5'
+    compile 'com.github.evernote:android-job:v1.1.11'
+    compile 'com.jakewharton:butterknife:8.5.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
-    implementation 'org.greenrobot:eventbus:3.0.0'
-    implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.2'
-    implementation 'org.lukhnos:nnio:0.2'
+    compile 'org.greenrobot:eventbus:3.0.0'
+    compile 'com.googlecode.ez-vcard:ez-vcard:0.10.2'
+    compile 'org.lukhnos:nnio:0.2'
     // uncomment for gplay, modified
     // compile "com.google.firebase:firebase-messaging:${googleLibraryVersion}"
     // compile "com.google.android.gms:play-services-base:${googleLibraryVersion}"
-    implementation 'org.parceler:parceler-api:1.1.6'
+    compile 'org.parceler:parceler-api:1.1.6'
     annotationProcessor 'org.parceler:parceler:1.1.6'
-    implementation 'com.github.bumptech.glide:glide:3.7.0'
-    implementation 'com.caverock:androidsvg:1.2.1'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
+    compile 'com.caverock:androidsvg:1.2.1'
     /// dependencies for local unit tests
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
     /// dependencies for instrumented tests
     // JUnit4 Rules
-    androidTestImplementation 'com.android.support.test:rules:0.5'
+    androidTestCompile 'com.android.support.test:rules:0.5'
     // Android JUnit Runner
-    androidTestImplementation 'com.android.support.test:runner:0.5'
+    androidTestCompile 'com.android.support.test:runner:0.5'
     // Android Annotation Support
-    androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
+    androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
     // Espresso core
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests
-    //androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    //androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
     // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
-    //androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
-    implementation 'org.jetbrains:annotations:15.0'
+    //androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
+    compile 'org.jetbrains:annotations:15.0'
 }
 
 configurations.all {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 30 23:39:03 CEST 2017
+#Fri May 05 19:09:31 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip

src/main/java/com/owncloud/android/ui/adapter/FolderSyncAdapter.java

@@ -127,25 +127,19 @@ public class FolderSyncAdapter extends SectionedRecyclerViewAdapter<FolderSyncAd
 
             holder.syncStatusButton.setVisibility(View.VISIBLE);
             holder.syncStatusButton.setTag(section);
-            holder.syncStatusButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mSyncFolderItems.get(section).setEnabled(!mSyncFolderItems.get(section).isEnabled());
-                    setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
-                    mListener.onSyncStatusToggleClick(section, mSyncFolderItems.get(section));
-                }
+            holder.syncStatusButton.setOnClickListener(v -> {
+                mSyncFolderItems.get(section).setEnabled(!mSyncFolderItems.get(section).isEnabled());
+                setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
+                mListener.onSyncStatusToggleClick(section, mSyncFolderItems.get(section));
             });
             setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
 
             holder.syncStatusButton.setVisibility(View.VISIBLE);
             holder.syncStatusButton.setTag(section);
-            holder.syncStatusButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mSyncFolderItems.get(section).setEnabled(!mSyncFolderItems.get(section).isEnabled());
-                    setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
-                    mListener.onSyncStatusToggleClick(section, mSyncFolderItems.get(section));
-                }
+            holder.syncStatusButton.setOnClickListener(v -> {
+                mSyncFolderItems.get(section).setEnabled(!mSyncFolderItems.get(section).isEnabled());
+                setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
+                mListener.onSyncStatusToggleClick(section, mSyncFolderItems.get(section));
             });
             setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
 
@@ -154,22 +148,13 @@ public class FolderSyncAdapter extends SectionedRecyclerViewAdapter<FolderSyncAd
             } else {
                 holder.menuButton.setVisibility(View.VISIBLE);
                 holder.menuButton.setTag(section);
-                holder.menuButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mListener.onSyncFolderSettingsClick(section, mSyncFolderItems.get(section));
-                    }
-                });
+                holder.menuButton.setOnClickListener(v -> mListener.onSyncFolderSettingsClick(section,
+                        mSyncFolderItems.get(section)));
             }
         } else {
             holder.mainHeaderContainer.setVisibility(View.GONE);
             holder.customFolderHeaderContainer.setVisibility(View.VISIBLE);
-            holder.customFolderHeaderContainer.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    EventBus.getDefault().post(new CustomFolderEvent());
-                }
-            });
+            holder.customFolderHeaderContainer.setOnClickListener(v -> EventBus.getDefault().post(new CustomFolderEvent()));
         }
     }