diff --git a/app/build.gradle b/app/build.gradle index c5f19a3c..d01f0a77 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,8 +59,8 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) @@ -69,59 +69,59 @@ dependencies { implementation project(':emoji') implementation project(':apng_android') - compile 'com.android.support:support-v4:27.1.0' - compile 'com.android.support:appcompat-v7:27.1.0' - compile 'com.android.support:design:27.1.0' - compile 'com.android.support:customtabs:27.1.0' - compile 'com.android.support:support-v13:27.1.0' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.android.support:appcompat-v7:27.1.0' + implementation 'com.android.support:design:27.1.0' + implementation 'com.android.support:customtabs:27.1.0' + implementation 'com.android.support:support-v13:27.1.0' - compile 'com.google.firebase:firebase-core:11.8.0' - compile 'com.google.firebase:firebase-messaging:11.8.0' + implementation 'com.google.firebase:firebase-core:12.0.0' + implementation 'com.google.firebase:firebase-messaging:12.0.0' - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" - testCompile 'junit:junit:4.12' // しばらくはjunitと併用 + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version" + testImplementation 'junit:junit:4.12' // しばらくはjunitと併用 // compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.21.2' - compile 'uk.co.chrisjenx:calligraphy:2.3.0' - compile 'com.github.woxthebox:draglistview:1.5.1' - compile 'com.github.omadahealth:swipy:1.2.3@aar' + implementation 'uk.co.chrisjenx:calligraphy:2.3.0' + implementation 'com.github.woxthebox:draglistview:1.5.1' + implementation 'com.github.omadahealth:swipy:1.2.3@aar' // compile 'com.jrummyapps:colorpicker:2.1.7' - compile 'com.github.kenglxn.QRGen:android:2.3.0' + implementation 'com.github.kenglxn.QRGen:android:2.3.0' - compile 'com.squareup.okhttp3:okhttp:3.9.1' + implementation 'com.squareup.okhttp3:okhttp:3.9.1' testImplementation 'com.squareup.okhttp3:mockwebserver:3.9.1' - androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.9.1' + androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.9.1' - compile 'commons-io:commons-io:2.6' + implementation 'commons-io:commons-io:2.6' - compile 'com.github.bumptech.glide:glide:4.5.0' - compile 'com.github.bumptech.glide:okhttp3-integration:4.5.0' - compile 'com.github.bumptech.glide:annotations:4.5.0' + implementation 'com.github.bumptech.glide:glide:4.5.0' + implementation 'com.github.bumptech.glide:okhttp3-integration:4.5.0' + implementation 'com.github.bumptech.glide:annotations:4.5.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0' - compile 'org.hjson:hjson:3.0.0' + implementation 'org.hjson:hjson:3.0.0' - compile 'com.google.android:flexbox:0.3.1' + implementation 'com.google.android:flexbox:0.3.1' - compile 'com.astuetz:pagerslidingtabstrip:1.0.1' + implementation 'com.astuetz:pagerslidingtabstrip:1.0.1' implementation 'com.google.android.exoplayer:exoplayer:r2.5.4' - compile "org.jetbrains.anko:anko:$anko_version" + implementation "org.jetbrains.anko:anko:$anko_version" // Anko Layouts - compile "org.jetbrains.anko:anko-sdk25:$anko_version" // sdk15, sdk19, sdk21, sdk23 are also available - compile "org.jetbrains.anko:anko-appcompat-v7:$anko_version" + implementation "org.jetbrains.anko:anko-sdk25:$anko_version" // sdk15, sdk19, sdk21, sdk23 are also available + implementation "org.jetbrains.anko:anko-appcompat-v7:$anko_version" // Coroutine listeners for Anko Layouts - //compile "org.jetbrains.anko:anko-sdk25-coroutines:$anko_version" - //compile "org.jetbrains.anko:anko-appcompat-v7-coroutines:$anko_version" + //implementation "org.jetbrains.anko:anko-sdk25-coroutines:$anko_version" + //implementation "org.jetbrains.anko:anko-appcompat-v7-coroutines:$anko_version" - // compile 'com.simplecityapps:recyclerview-fastscroll:1.0.16' + // implementation 'com.simplecityapps:recyclerview-fastscroll:1.0.16' implementation 'me.drakeet.support:toastcompat:1.0.2' } diff --git a/build.gradle b/build.gradle index 8d48c357..2d449378 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.kotlin_version = '1.2.30' + ext.kotlin_version = '1.2.31' ext.kotlin_coroutines_version = '0.21.2' ext.anko_version='0.10.4' @@ -10,7 +10,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' classpath 'com.google.gms:google-services:3.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle index ac8b2ebe..2d919773 100644 --- a/colorpicker/build.gradle +++ b/colorpicker/build.gradle @@ -16,7 +16,7 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:27.1.0' + implementation 'com.android.support:appcompat-v7:27.1.0' } //apply plugin: 'com.getkeepsafe.dexcount' diff --git a/exif/build.gradle b/exif/build.gradle index e6157cca..77309ea0 100644 --- a/exif/build.gradle +++ b/exif/build.gradle @@ -20,6 +20,6 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'commons-io:commons-io:2.6' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'commons-io:commons-io:2.6' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 862f49c7..782f572c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jan 18 01:59:02 JST 2018 +#Tue Mar 27 11:23:31 JST 2018 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.4-all.zip