aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2022-07-06 21:56:52 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2022-07-07 11:28:59 +0530
commit78a1381b638993715db2e92b3b78dde66d5fc0ee (patch)
tree0432c63cfd01615e313585658b0ebc8c068ade81
parentd4bfa8e6604c9c73481b4e8ed18a5c457496aefd (diff)
gradle: bump all versions
-rw-r--r--build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommon.kt2
-rw-r--r--gradle/libs.versions.toml41
-rw-r--r--ui-compose/build.gradle.kts2
3 files changed, 23 insertions, 22 deletions
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommon.kt b/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommon.kt
index 63679850..9cf3b9f5 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommon.kt
+++ b/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommon.kt
@@ -10,7 +10,7 @@ import org.gradle.kotlin.dsl.configure
object AndroidCommon {
fun configure(project: Project) {
project.extensions.configure<TestedExtension> {
- setCompileSdkVersion(31)
+ setCompileSdkVersion(32)
defaultConfig {
minSdk = 23
targetSdk = 31
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 819d7883..10cf30b6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,25 +1,26 @@
[versions]
agp = "7.2.1"
-androidx_activity = "1.5.0-rc01"
+androidx_activity = "1.6.0-alpha05"
bouncycastle = "1.71"
-compose = "1.2.0-alpha08"
+composeFoundation = "1.2.0-alpha08"
+composeUi = "1.2.0-alpha08"
coroutines = "1.6.3"
flowbinding = "1.2.0"
hilt = "2.42"
kotlin = "1.7.0"
leakcanary = "2.9.1"
-lifecycle = "2.5.0-rc01"
+lifecycle = "2.6.0-alpha01"
[libraries]
android-desugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5"
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx_activity" }
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx_activity" }
androidx-annotation = "androidx.annotation:annotation:1.4.0-beta01"
-androidx-appcompat = "androidx.appcompat:appcompat:1.5.0-alpha01"
+androidx-appcompat = "androidx.appcompat:appcompat:1.6.0-alpha05"
androidx-autofill = "androidx.autofill:autofill:1.2.0-beta01"
androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha04"
-androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.0-alpha01"
-androidx-core-ktx = "androidx.core:core-ktx:1.8.0-rc01"
+androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.0-alpha03"
+androidx-core-ktx = "androidx.core:core-ktx:1.9.0-alpha05"
androidx-documentfile = "androidx.documentfile:documentfile:1.1.0-alpha01"
androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.5.0-rc01"
androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" }
@@ -28,7 +29,7 @@ androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-
androidx-lifecycle-viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
androidx-material = "com.google.android.material:material:1.7.0-alpha02"
androidx-preference = "androidx.preference:preference:1.2.0"
-androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0-alpha02"
+androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0-beta01"
androidx-recyclerviewSelection = "androidx.recyclerview:recyclerview-selection:1.2.0-alpha01"
androidx-security = "androidx.security:security-crypto:1.1.0-alpha03"
androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
@@ -45,19 +46,19 @@ build-sentry = "io.sentry.android.gradle:io.sentry.android.gradle.gradle.plugin:
build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.8.0"
build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:0.5.1"
build-versions = "com.github.ben-manes:gradle-versions-plugin:0.42.0"
-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose" }
-compose-foundation-core = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "compose" }
+compose-animation = "androidx.compose.animation:animation:1.1.1"
+compose-compiler = "androidx.compose.compiler:compiler:1.2.0"
+compose-foundation-core = { module = "androidx.compose.foundation:foundation", version.ref = "composeFoundation" }
+compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "composeFoundation" }
compose-hilt = "androidx.hilt:hilt-navigation-compose:1.0.0"
-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
-compose-material3 = "androidx.compose.material3:material3:1.0.0-alpha10"
-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
-compose-ui-core = { module = "androidx.compose.ui:ui", version.ref = "compose" }
-compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
-compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "compose" }
-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "compose" }
+compose-material = "androidx.compose.material:material:1.2.0-alpha08"
+compose-material3 = "androidx.compose.material3:material3:1.0.0-alpha14"
+compose-runtime = "androidx.compose.runtime:runtime:1.2.0-alpha08"
+compose-ui-core = { module = "androidx.compose.ui:ui", version.ref = "composeUi" }
+compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "composeUi" }
+compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeUi" }
+compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "composeUi" }
+compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "composeUi" }
dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "hilt" }
@@ -87,7 +88,7 @@ thirdparty-plumber = { module = "com.squareup.leakcanary:plumber-android-startup
thirdparty-sshauth = "com.github.open-keychain.open-keychain:sshauthentication-api:5.7.5"
# TODO: Remove the explicit bcpkix dependency when upgrading this to a BC 1.71 compatible version
thirdparty-sshj = "com.hierynomus:sshj:0.33.0"
-thirdparty-whatthestack = "com.github.haroldadmin:WhatTheStack:0.3.1"
+thirdparty-whatthestack = "com.github.haroldadmin:WhatTheStack:1.0.0-alpha04"
[bundles]
androidxLifecycle = [
diff --git a/ui-compose/build.gradle.kts b/ui-compose/build.gradle.kts
index 19b06532..e2499b3f 100644
--- a/ui-compose/build.gradle.kts
+++ b/ui-compose/build.gradle.kts
@@ -9,7 +9,7 @@ android {
compose = true
composeOptions {
useLiveLiterals = false
- kotlinCompilerExtensionVersion = libs.versions.compose.get()
+ kotlinCompilerExtensionVersion = libs.compose.compiler.get().versionConstraint.requiredVersion
}
}
namespace = "dev.msfjarvis.aps.ui.compose"