Merge branch 'master' of https://github.com/roudikk/guia

roudikk · Aug 14, 2023 · aeff8b2 · aeff8b2
2 parents 7a8b4a8 + b9d32ef
commit aeff8b2
Show file tree

Hide file tree

Showing 38 changed files with 400 additions and 281 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,43 +1,39 @@
 [versions]
 
-composeAnimation = "1.4.0-rc01"
-composeCompiler = "1.4.3"
-composeFoundation = "1.4.0-rc01"
-composeMaterial = "1.4.0-rc01"
-composeMatieral3 = "1.0.1"
-composeRuntime = "1.4.0-rc01"
-composeViewModel = "2.6.0"
-composeUi = "1.4.0-rc01"
-composeActivity = "1.7.0-rc01"
-detektGradlePlugin = "1.21.0"
-dokkaGradlePlugin = "1.6.10"
-gradle = "7.4.2"
-gradleMavenPublishPlugin = "0.24.0"
+composeBom = "2023.08.00"
+composeCompiler = "1.5.1"
+composeViewModel = "2.6.1"
+composeActivity = "1.7.2"
+detektGradlePlugin = "1.23.1"
+dokkaGradlePlugin = "1.8.20"
+gradle = "8.1.0"
+gradleMavenPublishPlugin = "0.25.3"
 junit4 = "4.13.2"
-detekt = "1.22.0"
-coroutines = "1.6.4"
-kotlin = "1.8.10"
+detekt = "1.23.1"
+coroutines = "1.7.3"
+kotlin = "1.9.0"
 junitAndroid = "1.1.5"
 espresso = "3.5.1"
-accompanist = "0.28.0"
-kotlinGradlePlugin = "1.8.10"
-lottie = "5.2.0"
-googleMaterial = "1.8.0"
+accompanist = "0.30.1"
+kotlinGradlePlugin = "1.9.0"
+lottie = "6.1.0"
+googleMaterial = "1.9.0"
 googleTruth = "1.1.3"
 androidxTestCore = "1.5.0"
 
 [libraries]
 
 compose-viewModel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "composeViewModel" }
-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "composeUi" }
-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "composeUi" }
-compose-ui-junit = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "composeUi" }
-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "composeUi" }
-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "composeMatieral3" }
-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "composeMaterial" }
-compose-material-icons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "composeMaterial" }
-compose-animation = { group = "androidx.compose.animation", name = "animation", version.ref = "composeAnimation" }
-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeFoundation" }
+compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+compose-ui = { group = "androidx.compose.ui", name = "ui" }
+compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+compose-ui-junit = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+compose-material3 = { group = "androidx.compose.material3", name = "material3" }
+compose-material = { group = "androidx.compose.material", name = "material" }
+compose-material-icons = { group = "androidx.compose.material", name = "material-icons-extended" }
+compose-animation = { group = "androidx.compose.animation", name = "animation" }
+compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
 compose-activity = { group = "androidx.activity", name = "activity-compose", version.ref = "composeActivity" }
 coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
@@ -49,7 +45,7 @@ gradle-maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-pl
 junit = { group = "junit", name = "junit", version.ref = "junit4" }
 junit-android = { group = "androidx.test.ext", name = "junit", version.ref = "junitAndroid" }
 androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" }
-espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "junitAndroid" }
+espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
 lottie = { group = "com.airbnb.android", name = "lottie-compose", version.ref = "lottie" }
 accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 29 20:50:46 AEDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists