diff --git a/app/build.gradle b/app/build.gradle index bc2bca96..286e6bb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,13 +27,13 @@ android { dependencies { - compile project(':library') - compile project(':library-image-loader') + implementation project(':library') + implementation project(':library-image-loader') - compile 'ru.noties:debug:3.0.0@jar' + implementation 'ru.noties:debug:3.0.0@jar' - compile OK_HTTP + implementation OK_HTTP - compile 'com.google.dagger:dagger:2.10' + implementation 'com.google.dagger:dagger:2.10' annotationProcessor 'com.google.dagger:dagger-compiler:2.10' } diff --git a/build.gradle b/build.gradle index 036e147b..ef441eaf 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } @@ -22,7 +22,7 @@ task clean(type: Delete) { } task wrapper(type: Wrapper) { - gradleVersion '4.3' + gradleVersion '4.5' distributionType 'all' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265ee..27768f1b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 590f0e81..610ad4c5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip diff --git a/library-image-loader/build.gradle b/library-image-loader/build.gradle index 3a909101..5c8f993b 100644 --- a/library-image-loader/build.gradle +++ b/library-image-loader/build.gradle @@ -19,10 +19,10 @@ android { } dependencies { - compile project(':library') - compile ANDROID_SVG - compile ANDROID_GIF - compile OK_HTTP + api project(':library') + api ANDROID_SVG + api ANDROID_GIF + api OK_HTTP } if (project.hasProperty('release')) { diff --git a/library-view/build.gradle b/library-view/build.gradle index c0675588..bb6073b7 100644 --- a/library-view/build.gradle +++ b/library-view/build.gradle @@ -14,8 +14,8 @@ android { } dependencies { - compile project(':library') - provided SUPPORT_APP_COMPAT + api project(':library') + compileOnly SUPPORT_APP_COMPAT } if (project.hasProperty('release')) { diff --git a/library/build.gradle b/library/build.gradle index c384c1b6..702b609b 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,10 +14,10 @@ android { } dependencies { - compile SUPPORT_ANNOTATIONS - compile COMMON_MARK - compile COMMON_MARK_STRIKETHROUGHT - compile COMMON_MARK_TABLE + api SUPPORT_ANNOTATIONS + api COMMON_MARK + api COMMON_MARK_STRIKETHROUGHT + api COMMON_MARK_TABLE } if (project.hasProperty('release')) { diff --git a/sample-custom-extension/build.gradle b/sample-custom-extension/build.gradle index 91749f0a..dc6139d7 100644 --- a/sample-custom-extension/build.gradle +++ b/sample-custom-extension/build.gradle @@ -15,5 +15,5 @@ android { } dependencies { - compile project(':library') + implementation project(':library') }