Skip to content

Commit

Permalink
versions updated
Browse files Browse the repository at this point in the history
  • Loading branch information
MFlisar committed Mar 30, 2024
1 parent 8196e37 commit 848855c
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 26 deletions.
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions gradle/androidx.versions.toml

This file was deleted.

10 changes: 1 addition & 9 deletions gradle/compose.versions.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
[versions]
composeBom = "2024.02.01"
composeBom = "2024.03.00"
compiler = "1.5.10"

lifecycle = "2.7.0"
activity = "1.8.2"
accompanist = "0.32.0"

[libraries]
bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
animation = { group = "androidx.compose.animation", name = "animation" }
foundation = { group = "androidx.compose.foundation", name = "foundation" }
material = { group = "androidx.compose.material", name = "material" }
runtime = { group = "androidx.compose.runtime", name = "runtime" }
ui = { group = "androidx.compose.ui", name = "ui" }
ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
material-extendedicons = { group = "androidx.compose.material", name = "material-icons-extended" }
material3 = { group = "androidx.compose.material3", name = "material3" }

lifecycle = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" }
activity = { module = "androidx.activity:activity-compose", version.ref = "activity" }

systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanist" }
6 changes: 3 additions & 3 deletions gradle/dependencies.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]

# mflisar
kotpreferences = "0.3"
composedemobaseactivity = "0.5"
kotpreferences = "0.4"
composedemobaseactivity = "0.6"

# ---------
# libraries
Expand All @@ -14,7 +14,7 @@ composedemobaseactivity = "0.5"
kotpreferences-core = { module = "com.github.MFlisar.KotPreferences:core", version.ref = "kotpreferences" }
kotpreferences-compose = { module = "com.github.MFlisar.KotPreferences:compose", version.ref = "kotpreferences" }
kotpreferences-datastore = { module = "com.github.MFlisar.KotPreferences:datastore", version.ref = "kotpreferences" }
kotpreferences-encryption-aes = { module = "com.github.MFlisar.KotPreferences:encryption-aes", version.ref = "kotpreferences" }

composedemobaseactivity = { module = "com.github.MFlisar:ComposeDemoBaseActivity", version.ref = "composedemobaseactivity" }

# -------
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
5 changes: 1 addition & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@ dependencyResolutionManagement {
val kotlin = "1.9.22"
val ksp = "1.9.22-1.0.17"
val coroutines = "1.7.3"
val gradle = "8.2.2"
val gradle = "8.3.1"

// TOML Files
create("androidx") {
from(files("gradle/androidx.versions.toml"))
}
create("deps") {
from(files("gradle/dependencies.versions.toml"))
}
Expand Down

0 comments on commit 848855c

Please sign in to comment.