Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle.kts
#	buildSrc/src/main/kotlin/ConfigData.kt
  • Loading branch information
mslalith committed Aug 31, 2022
2 parents 853b04f + c6fe144 commit 54c8d02
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ apply(from = "./buildScripts/install-git-hooks.gradle.kts")
apply(plugin = "kover")

plugins {
id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
id("com.github.ben-manes.versions") version "0.42.0"
id("org.jetbrains.kotlinx.kover") version Versions.KOTLINX_KOVER
id("com.google.devtools.ksp") version Versions.KSP
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/ConfigData.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ object ConfigData {
const val TARGET_SDK = 32

const val VERSION_CODE = 4
const val VERSION_NAME = "0.2.0"
const val VERSION_NAME = "0.1.1"
}

0 comments on commit 54c8d02

Please sign in to comment.