wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Android Gradle plugin to 3.0.1

Browse source
This commit is contained in:
cketti 2018-02-17 04:05:09 +01:00
parent 3c14fe653d
commit 698aa0cf60
5 changed files with 46 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -2,7 +2,7 @@ language: android
android: android:
components: components:
- tools - tools
- build-tools-25.0.2 - build-tools-27.0.3
- android-25 - android-25
- extra-android-m2repository - extra-android-m2repository

3
build.gradle
View file

@ -1,10 +1,11 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.android.tools.build:gradle:3.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
} }
} }

2
gradle.properties
View file

@ -1,6 +1,6 @@
kotlinVersion=1.1.4-3 kotlinVersion=1.1.4-3
androidCompileSdkVersion=25 androidCompileSdkVersion=25
androidBuildToolsVersion=25.0.2 androidBuildToolsVersion=27.0.3
androidSupportLibraryVersion=25.2.0 androidSupportLibraryVersion=25.2.0
timberVersion=4.5.1 timberVersion=4.5.1

34
k9mail-library/build.gradle
View file

@ -15,23 +15,27 @@ repositories {
} }
dependencies { dependencies {
compile 'org.apache.james:apache-mime4j-core:0.8.1' implementation 'org.apache.james:apache-mime4j-core:0.8.1'
compile 'org.apache.james:apache-mime4j-dom:0.8.1' implementation 'org.apache.james:apache-mime4j-dom:0.8.1'
compile "com.squareup.okio:okio:${okioVersion}" implementation "com.squareup.okio:okio:${okioVersion}"
compile 'commons-io:commons-io:2.4' implementation 'commons-io:commons-io:2.4'
compile 'com.jcraft:jzlib:1.0.7' implementation 'com.jcraft:jzlib:1.0.7'
compile 'com.beetstra.jutf7:jutf7:1.0.0' implementation 'com.beetstra.jutf7:jutf7:1.0.0'
compile "com.android.support:support-annotations:${androidSupportLibraryVersion}" implementation "com.android.support:support-annotations:${androidSupportLibraryVersion}"
compile "com.jakewharton.timber:timber:${timberVersion}" implementation "com.jakewharton.timber:timber:${timberVersion}"
androidTestCompile 'com.android.support.test:runner:0.4.1' androidTestImplementation 'com.android.support.test:runner:0.4.1'
androidTestCompile 'com.madgag.spongycastle:pg:1.51.0.0' androidTestImplementation 'com.madgag.spongycastle:pg:1.51.0.0'
testCompile "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}" testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}"
testCompile "org.robolectric:robolectric:${robolectricVersion}" testImplementation "org.robolectric:robolectric:${robolectricVersion}"
testCompile "junit:junit:${junitVersion}" testImplementation "junit:junit:${junitVersion}"
testCompile "com.google.truth:truth:${truthVersion}" testImplementation "com.google.truth:truth:${truthVersion}"
testCompile "org.mockito:mockito-core:${mockitoVersion}" testImplementation "org.mockito:mockito-core:${mockitoVersion}"
// The Android Gradle plugin doesn't seem to put the Apache HTTP Client on the runtime classpath anymore when
// running JVM tests.
testImplementation 'org.apache.httpcomponents:httpclient:4.5.5'
} }
android { android {

45
k9mail/build.gradle
View file

@ -22,30 +22,31 @@ configurations.all {
} }
dependencies { dependencies {
compile project(':k9mail-library') implementation project(':k9mail-library')
compile project(':plugins:HoloColorPicker') implementation project(':plugins:HoloColorPicker')
compile project(':plugins:openpgp-api-lib:openpgp-api') implementation project(':plugins:openpgp-api-lib:openpgp-api')
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}" implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}"
compile "com.squareup.okio:okio:${okioVersion}" implementation "com.squareup.okio:okio:${okioVersion}"
compile 'commons-io:commons-io:2.4' implementation 'commons-io:commons-io:2.4'
compile "com.android.support:support-v4:${androidSupportLibraryVersion}" implementation "com.android.support:support-v4:${androidSupportLibraryVersion}"
compile 'org.jsoup:jsoup:1.11.2' implementation 'org.jsoup:jsoup:1.11.2'
compile 'de.cketti.library.changelog:ckchangelog:1.2.1' implementation 'de.cketti.library.changelog:ckchangelog:1.2.1'
compile 'com.github.bumptech.glide:glide:3.6.1' implementation 'com.github.bumptech.glide:glide:3.6.1'
compile 'com.splitwise:tokenautocomplete:2.0.7' implementation 'com.splitwise:tokenautocomplete:2.0.7'
compile 'de.cketti.safecontentresolver:safe-content-resolver-v14:0.9.0' implementation 'de.cketti.safecontentresolver:safe-content-resolver-v14:0.9.0'
compile 'com.github.amlcurran.showcaseview:library:5.4.1' implementation 'com.github.amlcurran.showcaseview:library:5.4.1'
compile 'com.squareup.moshi:moshi:1.2.0' implementation 'com.squareup.moshi:moshi:1.2.0'
compile "com.jakewharton.timber:timber:${timberVersion}" implementation "com.jakewharton.timber:timber:${timberVersion}"
compile 'net.jcip:jcip-annotations:1.0' implementation 'net.jcip:jcip-annotations:1.0'
implementation 'org.apache.james:apache-mime4j-core:0.8.1'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
testCompile "org.robolectric:robolectric:${robolectricVersion}" testImplementation "org.robolectric:robolectric:${robolectricVersion}"
testCompile "junit:junit:${junitVersion}" testImplementation "junit:junit:${junitVersion}"
testCompile "com.google.truth:truth:${truthVersion}" testImplementation "com.google.truth:truth:${truthVersion}"
testCompile "org.mockito:mockito-core:${mockitoVersion}" testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testCompile "org.jdom:jdom2:2.0.6" testImplementation "org.jdom:jdom2:2.0.6"
} }
android { android {