From 9c854d445e40cb354539974aa71d385275153c2e Mon Sep 17 00:00:00 2001 From: Yogesh Choudhary Paliyal Date: Fri, 1 Mar 2024 20:42:42 +0530 Subject: [PATCH] bump deps versions --- app/build.gradle.kts | 5 +++-- build.gradle.kts | 7 ++++--- buildSrc/src/main/kotlin/Versions.kt | 2 +- common/build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- settings.gradle.kts | 4 ++-- shared/build.gradle.kts | 3 +-- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 526d8f44..5b20db98 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,13 +11,13 @@ plugins { val appPackageId = "com.yogeshpaliyal.keypass" android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = appPackageId minSdk = 23 - targetSdk = 33 + targetSdk = 34 versionCode = 1423 versionName = "1.4.23" @@ -34,6 +34,7 @@ android { isMinifyEnabled = true isShrinkResources = true proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + signingConfig = signingConfigs.getByName("debug") } debug { diff --git a/build.gradle.kts b/build.gradle.kts index 629ad88f..11c54783 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath ("com.android.tools.build:gradle:8.1.4") + classpath ("com.android.tools.build:gradle:8.2.2") classpath ("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") classpath ("com.google.gms:google-services:4.4.0") @@ -23,11 +23,11 @@ plugins { kotlin("android") version("1.8.0") apply false id("com.android.application") version("7.4.2") apply false id("com.android.library") version("7.4.2") apply false - id("org.jetbrains.compose") version "1.5.11" apply false + id("org.jetbrains.compose") version "1.6.0" apply false id ("com.diffplug.spotless") version("6.18.0") id("org.jetbrains.kotlin.kapt") version(Versions.kotlin) id("com.google.dagger.hilt.android") version ("2.48.1") apply false - id("com.gradle.enterprise") version("3.15.1") apply false + id("com.gradle.enterprise") version("3.16.2") apply false id("org.jetbrains.kotlin.plugin.serialization") version (Versions.kotlin) } @@ -35,6 +35,7 @@ plugins { subprojects { repositories { google() + mavenCentral() maven("https://jitpack.io") } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 702fbdb7..60595b81 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -4,7 +4,7 @@ object Versions { const val room = "2.5.2" const val navigation = "2.5.3" const val hilt = "2.48.1" - const val compose = "1.4.3" + const val compose = "1.6.2" const val activity = "1.7.1" const val agp = "7.3.0" const val composeMultiplatform = "1.3.0" diff --git a/common/build.gradle.kts b/common/build.gradle.kts index c2126b6c..b752f2b8 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 23 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c747538f..23b2c0d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ +#Fri Mar 01 20:16:37 IST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index 3e3d5698..ebfd5775 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,14 +1,14 @@ pluginManagement { repositories { - gradlePluginPortal() google() + gradlePluginPortal() mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositoriesMode.set(RepositoriesMode.PREFER_PROJECT) repositories { google() mavenCentral() diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index c64d5add..1523bc81 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -44,11 +44,10 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") defaultConfig { minSdk = 21 - targetSdk = 33 } namespace = "com.yogeshpaliyal.keypass.common" }