Skip to content

Commit 500f18a

Browse files
committed
Merge branch 'dev'
# Conflicts: # app/src/main/java/com/mohandass/botforge/common/CommonModule.kt
2 parents 24ab545 + 63c66cd commit 500f18a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2401
-113
lines changed

.idea/deploymentTargetDropDown.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ android {
2929
applicationId = "com.mohandass.botforge"
3030
minSdk = 28
3131
targetSdk = 33
32-
versionCode = 28
33-
versionName = "1.2.8"
32+
versionCode = 30
33+
versionName = "1.3.0"
3434

3535
vectorDrawables.useSupportLibrary = true
3636

@@ -186,6 +186,7 @@ dependencies {
186186
implementation("com.google.accompanist:accompanist-navigation-animation:$accompanistVersion")
187187
implementation("com.google.accompanist:accompanist-systemuicontroller:$accompanistVersion")
188188
implementation("com.google.accompanist:accompanist-placeholder-material:$accompanistVersion")
189+
implementation("com.google.accompanist:accompanist-flowlayout:$accompanistVersion")
189190

190191
// Compose Markdown
191192
implementation("com.github.jeziellago:compose-markdown:$composeMarkdownVersion")

0 commit comments

Comments
 (0)