Update gradle dependency / fix typo
This commit is contained in:
David Luhmer
parent
632cac0e2a
commit
51463ca472
5 changed files with 63 additions and 58 deletions
|
|
@ -92,83 +92,83 @@ repositories {
|
|||
|
||||
}
|
||||
|
||||
final SUPPORT_VERSION = '27.0.2'
|
||||
final SUPPORT_VERSION = '27.1.1'
|
||||
|
||||
dependencies {
|
||||
// core android studio module
|
||||
//compile project(':core')
|
||||
// You must install or update the Google Repository through the SDK manager to use this dependency.
|
||||
// The Google Repository (separate from the corresponding library) can be found in the Extras category.
|
||||
// compile 'com.google.android.gms:play-services:4.2.42'
|
||||
compile project(path: ':ownCloud-Account-Importer', configuration: 'default')
|
||||
compile "com.android.support:support-v4:${SUPPORT_VERSION}"
|
||||
compile "com.android.support:support-compat:${SUPPORT_VERSION}"
|
||||
compile "com.android.support:appcompat-v7:${SUPPORT_VERSION}"
|
||||
compile "com.android.support:design:${SUPPORT_VERSION}"
|
||||
compile "com.android.support:palette-v7:${SUPPORT_VERSION}"
|
||||
compile "com.android.support:recyclerview-v7:${SUPPORT_VERSION}"
|
||||
compile "com.android.support:customtabs:${SUPPORT_VERSION}"
|
||||
compile "com.android.support:cardview-v7:${SUPPORT_VERSION}"
|
||||
compile 'de.mrmaffen:holocircularprogressbar:1.0.1'
|
||||
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
|
||||
compile 'com.google.code.gson:gson:2.8.0'
|
||||
compile 'com.jakewharton:butterknife:8.8.1'
|
||||
// implementation 'com.google.android.gms:play-services:4.2.42'
|
||||
implementation project(path: ':ownCloud-Account-Importer', configuration: 'default')
|
||||
implementation "com.android.support:support-v4:${SUPPORT_VERSION}"
|
||||
implementation "com.android.support:support-compat:${SUPPORT_VERSION}"
|
||||
implementation "com.android.support:appcompat-v7:${SUPPORT_VERSION}"
|
||||
implementation "com.android.support:design:${SUPPORT_VERSION}"
|
||||
implementation "com.android.support:palette-v7:${SUPPORT_VERSION}"
|
||||
implementation "com.android.support:recyclerview-v7:${SUPPORT_VERSION}"
|
||||
implementation "com.android.support:customtabs:${SUPPORT_VERSION}"
|
||||
implementation "com.android.support:cardview-v7:${SUPPORT_VERSION}"
|
||||
implementation 'de.mrmaffen:holocircularprogressbar:1.0.1'
|
||||
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
|
||||
implementation 'com.google.code.gson:gson:2.8.0'
|
||||
implementation 'com.jakewharton:butterknife:8.8.1'
|
||||
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
|
||||
|
||||
compileOnly 'com.google.auto.value:auto-value:1.5.1'
|
||||
annotationProcessor 'com.google.auto.value:auto-value:1.5.1'
|
||||
compileOnly 'com.google.auto.value:auto-value:1.5.2'
|
||||
annotationProcessor 'com.google.auto.value:auto-value:1.5.2'
|
||||
|
||||
compile 'com.sothree.slidinguppanel:library:3.2.1'
|
||||
implementation 'com.sothree.slidinguppanel:library:3.2.1'
|
||||
|
||||
compile 'org.greenrobot:eventbus:3.0.0'
|
||||
compile 'de.greenrobot:greendao:2.0.0'
|
||||
compile 'de.greenrobot:greendao-generator:2.0.0'
|
||||
//compile 'org.freemarker:freemarker:2.3.23' //Required for DAO generation
|
||||
compile 'org.apache.commons:commons-lang3:3.4'
|
||||
compile 'com.github.gabrielemariotti.changeloglib:changelog:2.0.0'
|
||||
compile 'org.jsoup:jsoup:1.7.2'
|
||||
compile ('net.rdrei.android.dirchooser:library:3.0@aar') { transitive = true; }
|
||||
implementation 'org.greenrobot:eventbus:3.0.0'
|
||||
implementation 'de.greenrobot:greendao:2.0.0'
|
||||
implementation 'de.greenrobot:greendao-generator:2.0.0'
|
||||
//implementation 'org.freemarker:freemarker:2.3.23' //Required for DAO generation
|
||||
implementation 'org.apache.commons:commons-lang3:3.4'
|
||||
implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.0.0'
|
||||
implementation 'org.jsoup:jsoup:1.7.2'
|
||||
implementation ('net.rdrei.android.dirchooser:library:3.0@aar') { transitive = true; }
|
||||
|
||||
|
||||
compile 'com.google.dagger:dagger:2.9'
|
||||
implementation 'com.google.dagger:dagger:2.9'
|
||||
annotationProcessor "com.google.dagger:dagger-compiler:2.9"
|
||||
provided 'javax.annotation:jsr250-api:1.0'
|
||||
compileOnly 'javax.annotation:jsr250-api:1.0'
|
||||
|
||||
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
|
||||
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
|
||||
// Because RxAndroid releases are few and far between, it is recommended you also
|
||||
// explicitly depend on RxJava's latest version for bug fixes and new features.
|
||||
compile 'io.reactivex.rxjava2:rxjava:2.1.0'
|
||||
compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
|
||||
implementation 'io.reactivex.rxjava2:rxjava:2.1.0'
|
||||
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
|
||||
|
||||
compile 'com.squareup.retrofit2:retrofit:2.3.0'
|
||||
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
|
||||
compile 'com.squareup.okhttp3:okhttp:3.8.0'
|
||||
compile 'com.squareup.okhttp3:logging-interceptor:3.8.0'
|
||||
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
|
||||
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
|
||||
implementation 'com.squareup.okhttp3:okhttp:3.8.0'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:3.8.0'
|
||||
|
||||
compile project(path: ':MaterialShowcaseView:library', configuration: 'default')
|
||||
compile 'com.nbsp:library:1.02' // MaterialFilePicker
|
||||
implementation project(path: ':MaterialShowcaseView:library', configuration: 'default')
|
||||
implementation 'com.nbsp:library:1.02' // MaterialFilePicker
|
||||
|
||||
extraCompile 'com.github.tommus:youtube-android-player-api:1.2.2'
|
||||
extraImplementation 'com.github.tommus:youtube-android-player-api:1.2.2'
|
||||
|
||||
testCompile 'org.robolectric:robolectric:3.0-rc3'
|
||||
testCompile 'junit:junit:4.12'
|
||||
testCompile("org.mockito:mockito-core:1.10.19") {
|
||||
testImplementation 'org.robolectric:robolectric:3.0-rc3'
|
||||
testImplementation 'junit:junit:4.12'
|
||||
testImplementation("org.mockito:mockito-core:1.10.19") {
|
||||
exclude group: 'org.hamcrest'
|
||||
}
|
||||
testCompile 'com.google.dexmaker:dexmaker:1.2'
|
||||
testCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
|
||||
testCompile 'com.squareup.okhttp3:mockwebserver:3.8.0'
|
||||
testImplementation 'com.google.dexmaker:dexmaker:1.2'
|
||||
testImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
|
||||
testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.0'
|
||||
|
||||
//androidTestCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
|
||||
// https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver
|
||||
androidTestCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.8.0'
|
||||
androidTestImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.8.0'
|
||||
|
||||
|
||||
androidTestCompile "com.android.support:support-annotations:${SUPPORT_VERSION}"
|
||||
androidTestCompile 'com.android.support.test:runner:1.0.1'
|
||||
androidTestCompile 'com.android.support.test:rules:1.0.1'
|
||||
androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
|
||||
androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2') {
|
||||
androidTestImplementation "com.android.support:support-annotations:${SUPPORT_VERSION}"
|
||||
androidTestImplementation 'com.android.support.test:runner:1.0.1'
|
||||
androidTestImplementation 'com.android.support.test:rules:1.0.1'
|
||||
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
|
||||
androidTestImplementation('com.android.support.test.espresso:espresso-contrib:2.2') {
|
||||
// this library uses the newest app compat v22 but the espresso contrib still v21.
|
||||
// you have to specifically exclude the older versions of the contrib library or
|
||||
// there will be some conflicts
|
||||
|
|
@ -177,10 +177,10 @@ dependencies {
|
|||
exclude module: 'recyclerview-v7'
|
||||
}
|
||||
|
||||
androidTestCompile 'tools.fastlane:screengrab:0.3.1'
|
||||
androidTestCompile("org.mockito:mockito-core:1.10.19") {
|
||||
androidTestImplementation 'tools.fastlane:screengrab:0.3.1'
|
||||
androidTestImplementation("org.mockito:mockito-core:1.10.19") {
|
||||
exclude group: 'org.hamcrest'
|
||||
}
|
||||
androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
|
||||
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
|
||||
androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
|
||||
androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
<string name="action_link_open">Open Link in Browser</string>
|
||||
<string name="action_link_copy">Copy Link</string>
|
||||
<string name="toast_img_download_wait">Downloading… please wait</string>
|
||||
<string name="toast_img_saved">Image saved.</string>
|
||||
<string name="toast_img_saved">Image saved</string>
|
||||
<string name="toast_img_notwriteable">Failed to write Image.</string>
|
||||
<string name="toast_copied_to_clipboard">Copied to clipboard</string>
|
||||
<string name="error_download_failed">Download failed</string>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<paths>
|
||||
<external-path
|
||||
name="external_files" path="." />
|
||||
</paths>
|
||||
|
|
@ -6,7 +6,7 @@ buildscript {
|
|||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.0.1'
|
||||
classpath 'com.android.tools.build:gradle:3.1.2'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#Tue Nov 07 15:51:44 CET 2017
|
||||
#Sun Apr 22 09:31:34 CEST 2018
|
||||
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.4-all.zip
|
||||
|
|
|
|||
Loading…
Reference in a new issue