From ad41d614ec427f755de6a94811c1febfb492e3d0 Mon Sep 17 00:00:00 2001 From: tateisu Date: Sun, 23 Aug 2020 07:15:27 +0900 Subject: [PATCH] Android Studio 4.0.0, Android gradple plugin 4.0.1, Gradle 6.1.1, kotlin 1.4.0, espresso-core:3.3.0-rc03, androidx.test:runner:1.3.0-rc03, androidx.appcompat 1.2.0, androidx.core-ktx 1.3.1, androidx.drawerlayout 1.1.0, androidx.preference 1.1.1, com.google.android.material 1.2.0, firebase-messaging 20.2.4, com.google.android:flexbox 2.0.1, junit 4.13 --- .idea/compiler.xml | 20 +++----------------- apng/build.gradle | 2 +- apng_android/build.gradle | 6 +++--- app/build.gradle | 12 ++++++------ build.gradle | 11 +++++++---- colorpicker/build.gradle | 2 +- exif/build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- sample_apng/build.gradle | 6 +++--- 9 files changed, 29 insertions(+), 40 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43ef..56f11ae9 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,22 +1,8 @@ - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/apng/build.gradle b/apng/build.gradle index d54c6ed5..d061bce3 100644 --- a/apng/build.gradle +++ b/apng/build.gradle @@ -6,7 +6,7 @@ dependencies { //noinspection DifferentStdlibGradleVersion implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testImplementation group: 'junit', name: 'junit', version: '4.12' + testImplementation "junit:junit:$junit_version" } sourceCompatibility = "1.7" diff --git a/apng_android/build.gradle b/apng_android/build.gradle index ab042801..04296208 100644 --- a/apng_android/build.gradle +++ b/apng_android/build.gradle @@ -28,9 +28,9 @@ repositories { } dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.3.0-alpha02' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02' + testImplementation "junit:junit:$junit_version" + androidTestImplementation 'androidx.test:runner:1.3.0-rc03' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc03' api project(':apng') // 'api' に指定した依存関係はこのライブラリの利用者に公開されます diff --git a/app/build.gradle b/app/build.gradle index c121811e..7aef3eb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,13 +99,13 @@ dependencies { implementation "androidx.appcompat:appcompat:$appcompat_version" // DrawerLayout - implementation "androidx.drawerlayout:drawerlayout:1.1.0-beta01" + implementation "androidx.drawerlayout:drawerlayout:1.1.0" // NavigationView - implementation "com.google.android.material:material:1.1.0" + implementation "com.google.android.material:material:1.2.0" // PreferenceManager - implementation "androidx.preference:preference-ktx:1.1.0" + implementation "androidx.preference:preference-ktx:1.1.1" // CustomTabs implementation "androidx.browser:browser:1.2.0" @@ -116,7 +116,7 @@ dependencies { kapt 'androidx.annotation:annotation:1.1.0' // https://firebase.google.com/support/release-notes/android - implementation "com.google.firebase:firebase-messaging:20.1.5" + implementation "com.google.firebase:firebase-messaging:20.2.4" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" @@ -134,7 +134,7 @@ dependencies { //implementation "org.jetbrains.anko:anko-sdk25-coroutines:$anko_version" //implementation "org.jetbrains.anko:anko-appcompat-v7-coroutines:$anko_version" - testImplementation 'junit:junit:4.13' // しばらくはkotlin-testとjunitを併用 + testImplementation "junit:junit:$junit_version" // しばらくはkotlin-testとjunitを併用 implementation 'com.squareup.okhttp3:okhttp:4.1.0' implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.1.0' @@ -168,7 +168,7 @@ dependencies { implementation 'org.hjson:hjson:3.0.0' - implementation 'com.google.android:flexbox:1.1.0' // 1.1.0 から AndroidX 依存 + implementation 'com.google.android:flexbox:2.0.1' // 1.1.0 から AndroidX 依存 implementation 'com.astuetz:pagerslidingtabstrip:1.0.1' diff --git a/build.gradle b/build.gradle index df64a67f..b38416df 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,14 @@ buildscript { ext.min_sdk_version = 21 ext.target_sdk_version = 29 - ext.appcompat_version='1.1.0' + ext.appcompat_version='1.2.0' - ext.kotlin_version = '1.3.71' - ext.kotlinx_coroutines_version = '1.3.1' + ext.kotlin_version = '1.4.0' + ext.kotlinx_coroutines_version = '1.3.9' ext.anko_version='0.10.8' + ext.junit_version='4.13' + repositories { google() jcenter() @@ -15,9 +17,10 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.2' + classpath 'com.android.tools.build:gradle:4.0.1' classpath 'com.google.gms:google-services:4.3.3' + //noinspection DifferentKotlinGradleVersion classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'de.mobilej.unmock:UnMockPlugin:0.7.3' diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle index b565ea42..6a501d48 100644 --- a/colorpicker/build.gradle +++ b/colorpicker/build.gradle @@ -19,7 +19,7 @@ android { dependencies { implementation "androidx.appcompat:appcompat:$appcompat_version" - implementation 'com.google.android:flexbox:1.1.0' + implementation 'com.google.android:flexbox:2.0.1' } diff --git a/exif/build.gradle b/exif/build.gradle index 23e7d82b..58293e3d 100644 --- a/exif/build.gradle +++ b/exif/build.gradle @@ -34,14 +34,14 @@ unMock { dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.3.0-alpha02' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02' + testImplementation "junit:junit:$junit_version" + androidTestImplementation 'androidx.test:runner:1.3.0-rc03' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc03' implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'commons-io:commons-io:2.6' implementation 'androidx.annotation:annotation:1.1.0' - implementation "androidx.core:core-ktx:1.1.0" + implementation "androidx.core:core-ktx:1.3.1" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" unmock 'org.robolectric:android-all:5.0.0_r2-robolectric-0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 63ceea32..63a9d46a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/sample_apng/build.gradle b/sample_apng/build.gradle index 3878b667..d408eeaf 100644 --- a/sample_apng/build.gradle +++ b/sample_apng/build.gradle @@ -35,9 +35,9 @@ dependencies { implementation project(':apng_android') implementation "androidx.appcompat:appcompat:$appcompat_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.3.0-alpha02' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02' + testImplementation "junit:junit:$junit_version" + androidTestImplementation 'androidx.test:runner:1.3.0-rc03' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc03' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"