From f6acef21a5b646608abd6c54a84d3845e32c19c7 Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Thu, 16 May 2019 17:26:28 -0700 Subject: [PATCH] Dependency upgrades, add Recyclical --- app/build.gradle | 3 ++- common/build.gradle | 2 +- dependencies.gradle | 15 ++++++++------- engine/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- notifications/build.gradle | 2 +- testutil/build.gradle | 2 +- theming/build.gradle | 2 +- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8f0b7c6..8ef3683 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation project(':theming') // Kotlin - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:' + versions.kotlin implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:' + versions.coroutines implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:' + versions.coroutines @@ -43,6 +43,7 @@ dependencies { implementation 'com.afollestad.material-dialogs:core:' + versions.materialDialogs implementation 'com.afollestad.material-dialogs:files:' + versions.materialDialogs implementation 'com.afollestad:assent:' + versions.assent + implementation 'com.afollestad:recyclical:' + versions.recyclical // Glide implementation 'com.github.bumptech.glide:glide:' + versions.glide diff --git a/common/build.gradle b/common/build.gradle index d58d591..8011a7d 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -15,7 +15,7 @@ android { dependencies { // Kotlin - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:' + versions.kotlin implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:' + versions.coroutines implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:' + versions.coroutines diff --git a/dependencies.gradle b/dependencies.gradle index 0031c32..a06d6c6 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,15 +7,15 @@ ext.versions = [ publishVersionCode : 28, // Plugins - gradlePlugin : '3.4.0', + gradlePlugin : '3.4.1', spotlessPlugin : '3.22.0', versionPlugin : '0.21.0', googleServices : '4.2.0', fabricPlugin : '1.+', // Kotlin - kotlin : '1.3.30', - coroutines : '1.2.0', + kotlin : '1.3.31', + coroutines : '1.2.1', koin : '1.0.2', // AndroidX @@ -26,16 +26,17 @@ ext.versions = [ androidxBrowser : '1.0.0', // Other Google - firebaseCore : '16.0.8', + firebaseCore : '16.0.9', lifecycle : '2.0.0', // Glide glide : '4.9.0', // afollestad - materialDialogs : '2.8.1', + materialDialogs : '3.0.0-alpha2', rxkPrefs : '1.2.5', - assent : '2.2.3', + assent : '2.3.0', + recyclical : '0.8.0', // RxJava rxJava : '2.2.6', @@ -46,7 +47,7 @@ ext.versions = [ // Debug timber : '4.7.1', - fabric : '2.9.9@aar', + fabric : '2.10.0@aar', // Test junit : '4.12', diff --git a/engine/build.gradle b/engine/build.gradle index e16f421..134e8f9 100644 --- a/engine/build.gradle +++ b/engine/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation project(':theming') // Kotlin - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:' + versions.kotlin // afollestad implementation 'com.afollestad.material-dialogs:core:' + versions.materialDialogs diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c4486d4..f4d7b2b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/notifications/build.gradle b/notifications/build.gradle index 4522159..39ca3ba 100644 --- a/notifications/build.gradle +++ b/notifications/build.gradle @@ -23,7 +23,7 @@ dependencies { implementation project(':common') // Kotlin - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:' + versions.kotlin implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:' + versions.coroutines implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:' + versions.coroutines diff --git a/testutil/build.gradle b/testutil/build.gradle index dbfbb03..ca10642 100644 --- a/testutil/build.gradle +++ b/testutil/build.gradle @@ -15,7 +15,7 @@ android { dependencies { implementation 'org.koin:koin-android:' + versions.koin - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:' + versions.kotlin implementation 'junit:junit:' + versions.junit implementation 'androidx.arch.core:core-testing:' + versions.archTesting implementation 'androidx.lifecycle:lifecycle-extensions:' + versions.lifecycle diff --git a/theming/build.gradle b/theming/build.gradle index 0d2ee89..d82c587 100644 --- a/theming/build.gradle +++ b/theming/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation 'com.afollestad.material-dialogs:core:' + versions.materialDialogs // Kotlin - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:' + versions.kotlin // Google/AndroidX api 'com.google.android.material:material:' + versions.androidxMaterial