diff options
| -rw-r--r-- | build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts | 7 | ||||
| -rw-r--r-- | dependency-sync/build.gradle.kts | 24 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 24 |
3 files changed, 30 insertions, 25 deletions
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts index 7ef59be9..e61b03a8 100644 --- a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts +++ b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts @@ -10,7 +10,12 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent import org.gradle.kotlin.dsl.withType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -val additionalCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn") +val additionalCompilerArgs = + listOf( + "-Xopt-in=kotlin.RequiresOptIn", + "-P", + "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true", + ) tasks.withType<JavaCompile>().configureEach { sourceCompatibility = JavaVersion.VERSION_11.toString() diff --git a/dependency-sync/build.gradle.kts b/dependency-sync/build.gradle.kts index b45a295a..ab54fbbe 100644 --- a/dependency-sync/build.gradle.kts +++ b/dependency-sync/build.gradle.kts @@ -7,12 +7,12 @@ plugins { id("com.rickbusarow.gradle-dependency-sync") version "0.11.4" } dependencies { // Build tooling - dependencySync("com.android.tools.build:gradle:7.0.3") + dependencySync("com.android.tools.build:gradle:7.0.4") dependencySync("org.jetbrains.kotlinx:binary-compatibility-validator:0.8.0") dependencySync("org.jetbrains.dokka:dokka-gradle-plugin:1.6.0") dependencySync("de.undercouch:gradle-download-task:4.1.2") dependencySync("com.google.dagger:hilt-android-gradle-plugin:2.40.5") - dependencySync("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0") + dependencySync("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") dependencySync("com.vanniktech:gradle-maven-publish-plugin:0.18.0") dependencySync("com.squareup.okhttp3:okhttp:4.9.3") dependencySync("com.vdurmont:semver4j:3.1.0") @@ -28,19 +28,19 @@ dependencies { dependencySync("androidx.activity:activity-compose:1.4.0") dependencySync("androidx.annotation:annotation:1.3.0") dependencySync("androidx.autofill:autofill:1.2.0-beta01") - dependencySync("androidx.appcompat:appcompat:1.4.0-rc01") - dependencySync("androidx.biometric:biometric-ktx:1.2.0-alpha03") - dependencySync("androidx.constraintlayout:constraintlayout:2.1.1") - dependencySync("androidx.core:core-ktx:1.7.0") + dependencySync("androidx.appcompat:appcompat:1.4.0") + dependencySync("androidx.biometric:biometric-ktx:1.2.0-alpha04") + dependencySync("androidx.constraintlayout:constraintlayout:2.1.2") + dependencySync("androidx.core:core-ktx:1.8.0-alpha01") dependencySync("androidx.documentfile:documentfile:1.1.0-alpha01") - dependencySync("androidx.fragment:fragment-ktx:1.4.0-rc01") - dependencySync("androidx.hilt:hilt-navigation-compose:1.0.0-alpha03") + dependencySync("androidx.fragment:fragment-ktx:1.4.0") + dependencySync("androidx.hilt:hilt-navigation-compose:1.0.0-beta01") dependencySync("androidx.lifecycle:lifecycle-common:2.4.0") dependencySync("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0") dependencySync("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0") - dependencySync("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07") + dependencySync("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0") dependencySync("com.google.android.material:material:1.6.0-alpha01") - dependencySync("androidx.preference:preference:1.2.0-alpha02") + dependencySync("androidx.preference:preference:1.2.0-beta01") dependencySync("androidx.recyclerview:recyclerview:1.3.0-alpha01") dependencySync("androidx.recyclerview:recyclerview-selection:1.2.0-alpha01") dependencySync("androidx.security:security-crypto:1.1.0-alpha03") @@ -88,11 +88,11 @@ dependencies { dependencySync("com.hierynomus:sshj:0.32.0") dependencySync("com.github.open-keychain.open-keychain:sshauthentication-api:5.7.5") dependencySync("com.github.haroldadmin:WhatTheStack:0.3.1") - dependencySync("com.google.android.gms:play-services-auth-api-phone:17.5.1") + dependencySync("com.google.android.gms:play-services-auth-api-phone:18.0.0") // Testing dependencies dependencySync("junit:junit:4.13.2") - dependencySync("org.jetbrains.kotlin:kotlin-test-junit:1.6.0") + dependencySync("org.jetbrains.kotlin:kotlin-test-junit:1.6.10") dependencySync("org.robolectric:robolectric:4.7.3") dependencySync("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") dependencySync("org.jetbrains.kotlin:kotlin-test-junit:1.6.0") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa34f38a..53e0acc4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ composeSnapshot = "-" coroutines = "1.6.0-RC2" flowbinding = "1.2.0" hilt = "2.40.5" -kotlin = "1.6.0" +kotlin = "1.6.10" lifecycle = "2.4.0" [libraries] @@ -18,32 +18,32 @@ androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref androidx-annotation = "androidx.annotation:annotation:1.3.0" -androidx-appcompat = "androidx.appcompat:appcompat:1.4.0-rc01" +androidx-appcompat = "androidx.appcompat:appcompat:1.4.0" androidx-autofill = "androidx.autofill:autofill:1.2.0-beta01" -androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03" +androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha04" androidx-compose-material3 = "androidx.compose.material3:material3:1.0.0-alpha02" -androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.1" +androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.2" -androidx-core-ktx = "androidx.core:core-ktx:1.7.0" +androidx-core-ktx = "androidx.core:core-ktx:1.8.0-alpha01" androidx-documentfile = "androidx.documentfile:documentfile:1.1.0-alpha01" -androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-rc01" +androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0" -androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03" +androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0-beta01" androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" } androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" } -androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07" +androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } androidx-lifecycle-viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" } androidx-material = "com.google.android.material:material:1.6.0-alpha01" -androidx-preference = "androidx.preference:preference:1.2.0-alpha02" +androidx-preference = "androidx.preference:preference:1.2.0-beta01" androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0-alpha01" androidx-recyclerviewSelection = "androidx.recyclerview:recyclerview-selection:1.2.0-alpha01" @@ -59,7 +59,7 @@ aps-sublimeFuzzy = "com.github.android-password-store:sublime-fuzzy:1.0.0" aps-zxingAndroidEmbedded = "com.github.android-password-store:zxing-android-embedded:4.2.1" testing-sharedPrefsMock = "com.github.android-password-store:shared-preferences-fake:2.0.0" -build-agp = "com.android.tools.build:gradle:7.0.3" +build-agp = "com.android.tools.build:gradle:7.0.4" build-binarycompat = "org.jetbrains.kotlinx:binary-compatibility-validator:0.8.0" build-kover = "org.jetbrains.kotlinx:kover:0.4.4" @@ -76,7 +76,7 @@ dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "hilt" } -build-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0" +build-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } build-mavenpublish = "com.vanniktech:gradle-maven-publish-plugin:0.18.0" @@ -129,7 +129,7 @@ thirdparty-logcat = "com.squareup.logcat:logcat:0.1" thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.2.1" -thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-services-auth-api-phone:17.5.1" +thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-services-auth-api-phone:18.0.0" thirdparty-pgpainless = "org.pgpainless:pgpainless-core:1.0.0-rc6" |