Skip to content

Commit

Permalink
Merge branch 'master' into process_refactorings_from_todo_list
Browse files Browse the repository at this point in the history
  • Loading branch information
marcopla99 authored Apr 26, 2023
2 parents 414752c + 9934dff commit f24d33a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.4.5'
kotlinCompilerExtensionVersion '1.4.6'
}

packagingOptions {
Expand Down Expand Up @@ -78,12 +78,12 @@ ktlint {
dependencies {
ktlintRuleset "io.nlopez.compose.rules:ktlint:0.1.5"

def composeBom = platform('androidx.compose:compose-bom:2023.04.00')
def composeBom = platform('androidx.compose:compose-bom:2023.04.01')

implementation composeBom
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.0'
implementation 'androidx.activity:activity-compose:1.7.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "androidx.compose.material:material"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit f24d33a

Please sign in to comment.