From 3e95bb7064ade1e82bbc65519fa7e27b77e87bb4 Mon Sep 17 00:00:00 2001 From: tateisu Date: Sat, 15 Sep 2018 01:36:05 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apng/build.gradle | 1 + apng_sample/build.gradle | 8 ++++---- app/build.gradle | 3 ++- build.gradle | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apng/build.gradle b/apng/build.gradle index 6b02464d..701fc186 100644 --- a/apng/build.gradle +++ b/apng/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'kotlin' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + //noinspection DifferentStdlibGradleVersion implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation group: 'junit', name: 'junit', version: '4.12' diff --git a/apng_sample/build.gradle b/apng_sample/build.gradle index 509703fc..008d88a0 100644 --- a/apng_sample/build.gradle +++ b/apng_sample/build.gradle @@ -38,11 +38,11 @@ dependencies { implementation "com.android.support:appcompat-v7:$asl_version" testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version" } diff --git a/app/build.gradle b/app/build.gradle index a3eeedc6..31310666 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -85,7 +85,8 @@ dependencies { 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" - // compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.21.2' + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version" // Anko Layouts implementation "org.jetbrains.anko:anko:$anko_version" diff --git a/build.gradle b/build.gradle index eb06746f..ae88d269 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext.kotlin_version = '1.2.70' - ext.kotlin_coroutines_version = '0.25.3' + ext.kotlinx_coroutines_version = '0.25.3' ext.anko_version='0.10.5' ext.asl_version='27.1.1' ext.target_sdk_version = 27