diff --git a/build.gradle b/build.gradle index a6fc3ae6..a3220f7f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' // https://inthecheesefactory.com/blog/how-to-upload-library-to-jcenter-maven-central-as-dependency/en // https://www.theguardian.com/technology/developer-blog/2016/dec/06/how-to-publish-an-android-library-a-mysterious-conversation classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' @@ -24,7 +24,7 @@ allprojects { ext { compileSdkVersion = 26 - buildToolsVersion = "26.0.1" + buildToolsVersion = "26.0.2" supportLibVersion = '26.1.0' minSdkVersion = 15 targetSdkVersion = 26 diff --git a/cameraview/build.gradle b/cameraview/build.gradle index adba97e6..dfe4f5af 100644 --- a/cameraview/build.gradle +++ b/cameraview/build.gradle @@ -39,17 +39,17 @@ android { } dependencies { - 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' - androidTestCompile 'com.android.support.test:runner:1.0.1' - androidTestCompile 'com.android.support.test:rules:1.0.1' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test:rules:1.0.1' + androidTestImplementation 'com.google.dexmaker:dexmaker:1.2' + androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - compile "com.android.support:exifinterface:$supportLibVersion" - compile "com.android.support:support-annotations:$supportLibVersion" + implementation "com.android.support:exifinterface:$supportLibVersion" + implementation "com.android.support:support-annotations:$supportLibVersion" } //endregion @@ -178,9 +178,7 @@ apply plugin: 'jacoco' def reportsDirectory = "$buildDir/reports/" jacoco { - // Using a different version might get 0 coverage reports. - // No time to investigate now. - toolVersion = "0.7.6.201602180812" + toolVersion = "0.7.4+" reportsDir = file(reportsDirectory) } diff --git a/demo/build.gradle b/demo/build.gradle index fb063b1f..4098460b 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -21,7 +21,7 @@ android { } dependencies { - compile project(':cameraview') - compile "com.android.support:appcompat-v7:$supportLibVersion" - compile "com.android.support:design:$supportLibVersion" + implementation project(':cameraview') + implementation "com.android.support:appcompat-v7:$supportLibVersion" + implementation "com.android.support:design:$supportLibVersion" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 97b47927..bb725f70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip