summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2021-06-25 00:28:05 +0530
committerGitHub <noreply@github.com>2021-06-25 00:28:05 +0530
commitaf27a330da4a37ae66f2169f8724ac0a228b18c4 (patch)
treede5a113f644ffe4c5641b246a6fe2064204b7c8b
parent29041cf5611dfb8c15a68581167fe3b09753d1f8 (diff)
build: upgrade dependencies (#1444)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
-rw-r--r--buildSrc/build.gradle.kts2
-rw-r--r--buildSrc/src/main/java/BaseProjectConfig.kt7
-rw-r--r--gradle.properties3
-rw-r--r--gradle/libs.versions.toml16
4 files changed, 9 insertions, 19 deletions
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index e76bcc15..518e2c89 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -43,7 +43,7 @@ gradlePlugin {
dependencies {
implementation("com.android.tools.build:gradle:4.2.1")
implementation("com.diffplug.spotless:spotless-plugin-gradle:5.12.4")
- implementation("com.google.dagger:hilt-android-gradle-plugin:2.35.1")
+ implementation("com.google.dagger:hilt-android-gradle-plugin:2.37")
implementation("com.squareup.okhttp3:okhttp:4.9.0")
implementation("com.vanniktech:gradle-maven-publish-plugin:0.15.1")
implementation("com.vdurmont:semver4j:3.1.0")
diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index 808d428d..b80efd6e 100644
--- a/buildSrc/src/main/java/BaseProjectConfig.kt
+++ b/buildSrc/src/main/java/BaseProjectConfig.kt
@@ -33,13 +33,6 @@ internal fun Project.configureForAllProjects() {
repositories {
google()
mavenCentral()
- @Suppress("DEPRECATION")
- jcenter {
- content {
- // https://github.com/zhanghai/AndroidFastScroll/issues/35
- includeModule("me.zhanghai.android.fastscroll", "library")
- }
- }
maven("https://jitpack.io") {
name = "JitPack"
content {
diff --git a/gradle.properties b/gradle.properties
index 15b0e3d4..34e53bdf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,9 +12,6 @@ org.gradle.vfs.watch=true
# Enable Kotlin incremental compilation
kotlin.incremental=true
-# Enable parallel tasks execution for Kotlin Gradle plugin
-kotlin.parallel.tasks.in.project=true
-
# Kotlin code style
kotlin.code.style=official
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f72a98bb..f8f0a851 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
# Centralized versions for dependencies that share versions
[versions]
-androidx_activity = "1.3.0-beta01"
-androidx_test = "1.4.0-beta02"
-compose = "1.0.0-beta08"
+androidx_activity = "1.3.0-beta02"
+androidx_test = "1.4.0-rc01"
+compose = "1.0.0-beta09"
composeSnapshot = "-"
coroutines = "1.5.0"
hilt = "2.37"
kotlin = "1.5.10"
-lifecycle = "2.4.0-alpha01"
+lifecycle = "2.4.0-alpha02"
[libraries]
# buildSrc dependencies
@@ -35,10 +35,10 @@ androidx-autofill = "androidx.autofill:autofill:1.2.0-alpha02"
androidx-appcompat = "androidx.appcompat:appcompat:1.3.0"
androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03"
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.0-beta02"
-androidx-core-ktx = "androidx.core:core-ktx:1.6.0-beta02"
+androidx-core-ktx = "androidx.core:core-ktx:1.6.0-rc01"
androidx-documentfile = "androidx.documentfile:documentfile:1.0.1"
-androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-alpha02"
-androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha02"
+androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-alpha03"
+androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03"
androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref="lifecycle" }
androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref="lifecycle" }
androidx-lifecycle-viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref="lifecycle" }
@@ -80,7 +80,7 @@ aps-zxingAndroidEmbedded = "com.github.android-password-store:zxing-android-embe
thirdparty-bouncycastle = "org.bouncycastle:bcprov-jdk15on:1.69"
thirdparty-commons_codec = "commons-codec:commons-codec:1.14"
thirdparty-eddsa = "net.i2p.crypto:eddsa:0.3.0"
-thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.1.5"
+thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.1.7"
thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r"
thirdparty-kotlinResult = "com.michael-bull.kotlin-result:kotlin-result:1.1.12"
thirdparty-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.7"