Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump deps versions #794

Merged
merged 2 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -34,6 +34,7 @@ android {
isMinifyEnabled = true
isShrinkResources = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
signingConfig = signingConfigs.getByName("debug")
}

debug {
Expand Down
7 changes: 4 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -23,18 +23,19 @@ 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)
}


subprojects {
repositories {
google()
mavenCentral()
maven("https://jitpack.io")
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

android {
compileSdk = 33
compileSdk = 34

defaultConfig {
minSdk = 23
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
3 changes: 1 addition & 2 deletions shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}