Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .gradle/8.13/checksums/checksums.lock
Binary file not shown.
Binary file added .gradle/8.13/checksums/md5-checksums.bin
Binary file not shown.
Binary file added .gradle/8.13/checksums/sha1-checksums.bin
Binary file not shown.
Binary file added .gradle/8.13/executionHistory/executionHistory.lock
Binary file not shown.
Binary file added .gradle/8.13/fileChanges/last-build.bin
Binary file not shown.
Binary file added .gradle/8.13/fileHashes/fileHashes.bin
Binary file not shown.
Binary file added .gradle/8.13/fileHashes/fileHashes.lock
Binary file not shown.
Empty file added .gradle/8.13/gc.properties
Empty file.
Binary file added .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
2 changes: 2 additions & 0 deletions .gradle/buildOutputCleanup/cache.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Mon Jul 21 15:24:14 UTC 2025
gradle.version=8.13
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/\xcb\xff\xf8s\x9f\xe2 !\xac\xcd e\xba\xf1nX\xe4\xa5}\xa3r+SI\xa6U֯y\xcc6x)|\xc3:\xe5Y%P\xe3\xf7r}\xf6\xa1J6q=s\xf5\xd2,\xe4\xfc\xa8\xfdդ\xde*\xf6\xc5hY\x98`B\x80ڱ \xa7\x82A\xec\xb0aFņ\xbd.4v'\xd3b!T\x99\xfcX鉎\xf76\xb2aLԆ\xf5\xd2\xe3Gl\x86\x89I\xe6\xbc
K\x84Z\xc9,p \x961\xa6h \x93\xc5uH\xe1,\xb1]\xd6SFt뀂\xf9\x95\xa3kdcU\xd4\xfb\x85\xf2\xc3\xd8\xf9,\xd4\xd0
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8ae6b4f7-f8b3-4bda-9e04-42f60299a05\xe1
Binary file not shown.
Empty file.
Empty file added .gradle/vcs-1/gc.properties
Empty file.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,10 @@ The app requires the following permissions:

- **Android Studio**: 2024.3.1 (Meerkat) or newer
- **JDK**: 17
- **Android Gradle Plugin**: 8.9.1
- **Gradle**: 8.11.1
- **Android Gradle Plugin**: 8.4.1
- **Gradle**: 8.7

**Note:** The project is currently experiencing a build issue related to the Android SDK location. The build fails with an "SDK location not found" error, even when the `ANDROID_HOME` environment variable is set correctly. This issue is still under investigation.

## 🚀 Installation & Setup

Expand Down
56 changes: 0 additions & 56 deletions app/build.gradle

This file was deleted.

20 changes: 10 additions & 10 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ android {
}

composeOptions {
// Remove explicit kotlinCompilerExtensionVersion - use implicit from Kotlin 2.2.0
// Remove explicit kotlinCompilerExtensionVersion - use implicit from Kotlin 2.0.0
}

packaging {
Expand All @@ -80,21 +80,21 @@ dependencies {
implementation(libs.androidx.material3)

// Additional core dependencies for API 35 compatibility
implementation("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
implementation("androidx.navigation:navigation-compose:2.8.4")
implementation(libs.androidx.core.splashscreen)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.androidx.navigation.compose)

// Room
implementation("androidx.room:room-runtime:2.6.1")
implementation("androidx.room:room-ktx:2.6.1")
ksp("androidx.room:room-compiler:2.6.1")
implementation(libs.androidx.room.runtime)
implementation(libs.androidx.room.ktx)
ksp(libs.androidx.room.compiler)

// Gson (para TypeConverters de Room)
implementation("com.google.code.gson:gson:2.10.1")
implementation(libs.gson)

// Google Play Services
implementation("com.google.android.gms:play-services-auth:21.2.0")
implementation("com.google.android.gms:play-services-fitness:21.2.0")
implementation(libs.play.services.auth)
implementation(libs.play.services.fitness)

// Testing dependencies
testImplementation(libs.junit)
Expand Down
15 changes: 0 additions & 15 deletions build.gradle

This file was deleted.

10 changes: 7 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.compose) apply false
alias(libs.plugins.ksp) apply false
id("com.github.ben-manes.versions") version "0.52.0"
}

tasks.register("clean", Delete::class) {
delete(rootProject.layout.buildDirectory)
allprojects {
tasks.withType<JavaCompile> {
sourceCompatibility = JavaVersion.VERSION_17.toString()
targetCompatibility = JavaVersion.VERSION_17.toString()
}
}
57 changes: 49 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@
[versions]
agp = "8.11.1"
kotlin = "2.2.0"
coreKtx = "1.16.0"
agp = "8.4.1"
kotlin = "2.0.0"
coreKtx = "1.13.1"
junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
lifecycleRuntimeKtx = "2.8.7"
activityCompose = "1.9.3"
composeBom = "2025.06.01"
junitVersion = "1.1.5"
espressoCore = "3.5.1"
lifecycleRuntimeKtx = "2.8.1"
activityCompose = "1.9.0"
composeBom = "2024.05.00"
retrofit = "2.9.0"
converterGson = "2.9.0"
datastorePreferences = "1.1.1"
playServicesLocation = "21.3.0"
gson = "2.10.1"
appcompat = "1.7.0"
activityKtx = "1.9.0"
fragmentKtx = "1.8.0"
lifecycleViewmodelKtx = "2.8.1"
lifecycleLivedataKtx = "2.8.1"
material = "1.12.0"
constraintlayout = "2.1.4"
room = "2.6.1"
playServicesAuth = "21.2.0"
playServicesFitness = "21.2.0"
coreSplashscreen = "1.0.1"
lifecycleViewmodelCompose = "2.8.1"
navigationCompose = "2.7.7"


[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
Expand All @@ -24,8 +43,30 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "converterGson" }
androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastorePreferences" }
play-services-location = { group = "com.google.android.gms", name = "play-services-location", version.ref = "playServicesLocation" }
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activityKtx" }
androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" }
androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
com-google-android-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "playServicesAuth" }
play-services-fitness = { group = "com.google.android.gms", name = "play-services-fitness", version.ref = "playServicesFitness" }
androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "coreSplashscreen" }
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }


[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.21" }
Loading