Browse Source

update to gradle gradle-4.1 & fixing deprecated gradle API calls

AndyScherzinger 7 years ago
parent
commit
2e4722ccb3
2 changed files with 35 additions and 35 deletions
  1. 34 34
      build.gradle
  2. 1 1
      gradle/wrapper/gradle-wrapper.properties

+ 34 - 34
build.gradle

@@ -145,10 +145,10 @@ android {
             xml.enabled = false
             html.enabled = true
             xml {
-                destination "$project.buildDir/reports/pmd/pmd.xml"
+                destination = file("$project.buildDir/reports/pmd/pmd.xml")
             }
             html {
-                destination "$project.buildDir/reports/pmd/pmd.html"
+                destination = file("$project.buildDir/reports/pmd/pmd.html")
             }
         }
     }
@@ -167,7 +167,7 @@ android {
             xml.enabled = false
             html.enabled = true
             html {
-                destination "$project.buildDir/reports/findbugs/findbugs.html"
+                destination  = file("$project.buildDir/reports/findbugs/findbugs.html")
             }
         }
         classpath = files()
@@ -182,48 +182,48 @@ android {
 
 dependencies {
     /// dependencies for app building
-    compile name: 'touch-image-view'
-    compile 'com.android.support:multidex:1.0.2'
-    compile 'com.github.nextcloud:android-library:1.0.23'
-    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.android.support:exifinterface:${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'
+    implementation name: 'touch-image-view'
+    implementation 'com.android.support:multidex:1.0.2'
+    implementation 'com.github.nextcloud:android-library:1.0.23'
+    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.android.support:exifinterface:${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'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
-    compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'com.googlecode.ez-vcard:ez-vcard:0.10.2'
-    compile 'org.lukhnos:nnio:0.2'
+    implementation 'org.greenrobot:eventbus:3.0.0'
+    implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.2'
+    implementation '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}"
-    compile 'org.parceler:parceler-api:1.1.6'
+    // implementation "com.google.firebase:firebase-messaging:${googleLibraryVersion}"
+    // implementation "com.google.android.gms:play-services-base:${googleLibraryVersion}"
+    implementation 'org.parceler:parceler-api:1.1.6'
     annotationProcessor 'org.parceler:parceler:1.1.6'
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.caverock:androidsvg:1.2.1'
+    implementation 'com.github.bumptech.glide:glide:3.7.0'
+    implementation 'com.caverock:androidsvg:1.2.1'
     /// dependencies for local unit tests
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
     /// dependencies for instrumented tests
     // JUnit4 Rules
-    androidTestCompile 'com.android.support.test:rules:0.5'
+    androidTestImplementation 'com.android.support.test:rules:0.5'
     // Android JUnit Runner
-    androidTestCompile 'com.android.support.test:runner:0.5'
+    androidTestImplementation 'com.android.support.test:runner:0.5'
     // Android Annotation Support
-    androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
+    androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
     // Espresso core
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+    androidTestImplementation '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
-    //androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    //androidTestImplementation '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
-    //androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
-    compile 'org.jetbrains:annotations:15.0'
+    //androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
+    implementation 'org.jetbrains:annotations:15.0'
 }
 
 configurations.all {

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip