diff --git a/.gradle/8.13/checksums/checksums.lock b/.gradle/8.13/checksums/checksums.lock new file mode 100644 index 0000000..9c1fe09 Binary files /dev/null and b/.gradle/8.13/checksums/checksums.lock differ diff --git a/.gradle/8.13/checksums/md5-checksums.bin b/.gradle/8.13/checksums/md5-checksums.bin new file mode 100644 index 0000000..f2dff13 Binary files /dev/null and b/.gradle/8.13/checksums/md5-checksums.bin differ diff --git a/.gradle/8.13/checksums/sha1-checksums.bin b/.gradle/8.13/checksums/sha1-checksums.bin new file mode 100644 index 0000000..265f6d3 Binary files /dev/null and b/.gradle/8.13/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.13/executionHistory/executionHistory.lock b/.gradle/8.13/executionHistory/executionHistory.lock new file mode 100644 index 0000000..4b4f793 Binary files /dev/null and b/.gradle/8.13/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.13/fileChanges/last-build.bin b/.gradle/8.13/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/8.13/fileChanges/last-build.bin differ diff --git a/.gradle/8.13/fileHashes/fileHashes.bin b/.gradle/8.13/fileHashes/fileHashes.bin new file mode 100644 index 0000000..415c3d0 Binary files /dev/null and b/.gradle/8.13/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.13/fileHashes/fileHashes.lock b/.gradle/8.13/fileHashes/fileHashes.lock new file mode 100644 index 0000000..2331834 Binary files /dev/null and b/.gradle/8.13/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.13/gc.properties b/.gradle/8.13/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..f5095c1 Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..2571116 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Mon Jul 21 15:24:14 UTC 2025 +gradle.version=8.13 diff --git a/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/.globals.work.bin b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/.globals.work.bin new file mode 100644 index 0000000..22e49e7 Binary files /dev/null and b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/.globals.work.bin differ diff --git a/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/.strings.work.bin b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/.strings.work.bin new file mode 100644 index 0000000..5b22b5f Binary files /dev/null and b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/.strings.work.bin differ diff --git a/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/_app.work.bin b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/_app.work.bin new file mode 100644 index 0000000..20c0302 --- /dev/null +++ b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/_app.work.bin @@ -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 \ No newline at end of file diff --git a/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/buildfingerprint.bin b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/buildfingerprint.bin new file mode 100644 index 0000000..7e0d847 Binary files /dev/null and b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/buildfingerprint.bin differ diff --git a/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/entry.bin b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/entry.bin new file mode 100644 index 0000000..4cbb45b Binary files /dev/null and b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/entry.bin differ diff --git a/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/projectfingerprint.bin b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/projectfingerprint.bin new file mode 100644 index 0000000..1f6a1f0 Binary files /dev/null and b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/projectfingerprint.bin differ diff --git a/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/work.bin b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/work.bin new file mode 100644 index 0000000..b44c2b4 Binary files /dev/null and b/.gradle/configuration-cache/8ae6b4f7-f8b3-4bda-9e04-42f60299a05a/work.bin differ diff --git a/.gradle/configuration-cache/bx1kx1iuocqdm3kr6tubz7h3f/candidates.bin b/.gradle/configuration-cache/bx1kx1iuocqdm3kr6tubz7h3f/candidates.bin new file mode 100644 index 0000000..32b6c70 --- /dev/null +++ b/.gradle/configuration-cache/bx1kx1iuocqdm3kr6tubz7h3f/candidates.bin @@ -0,0 +1 @@ +8ae6b4f7-f8b3-4bda-9e04-42f60299a05\xe1 \ No newline at end of file diff --git a/.gradle/configuration-cache/configuration-cache.lock b/.gradle/configuration-cache/configuration-cache.lock new file mode 100644 index 0000000..b804528 Binary files /dev/null and b/.gradle/configuration-cache/configuration-cache.lock differ diff --git a/.gradle/configuration-cache/gc.properties b/.gradle/configuration-cache/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/README.md b/README.md index c6f49e3..d0fe48c 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index 8556af9..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' - -android { - // ¡IMPORTANTE! 'namespace' debe estar dentro del bloque 'android' - namespace "com.example.sunday_android" - compileSdk 33 // Asegúrate de que este SDK esté instalado en tu entorno de CI/local - - defaultConfig { - applicationId "com.example.sunday_android" - minSdk 21 - targetSdk 33 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 // Asegúrate de que tu JDK sea 17 o superior - targetCompatibility JavaVersion.VERSION_17 - } - - kotlinOptions { - jvmTarget = '17' // Asegúrate de que el target JVM sea compatible con tu JDK - } -} - -dependencies { - // Tus dependencias - implementation 'com.squareup.retrofit2:retrofit:2.9.0' - implementation 'com.squareup.retrofit2:converter-gson:2.9.0' - implementation "androidx.datastore:datastore-preferences:1.1.1" - implementation 'com.google.android.gms:play-services-location:21.3.0' - implementation 'com.google.code.gson:gson:2.10.1' - implementation 'androidx.core:core-ktx:1.13.1' - implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.activity:activity-ktx:1.9.0' - implementation 'androidx.fragment:fragment-ktx:1.8.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.0' - implementation 'com.google.android.material:material:1.12.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - - // Dependencias de testing - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' -} diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fc8a535..8ff5ebb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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 { @@ -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) diff --git a/build.gradle b/build.gradle deleted file mode 100644 index f19d029..0000000 --- a/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -plugins { - id 'com.android.application' version '8.11.1' apply false - id 'com.android.library' version '8.11.1' apply false - id 'org.jetbrains.kotlin.android' version '2.2.0' apply false -id 'org.jetbrains.kotlin.plugin.compose' version '2.2.0' apply false -id 'com.google.devtools.ksp' version '2.2.0-2.0.2' apply false - id "com.github.ben-manes.versions" version "0.52.0" -} - -allprojects { - tasks.withType(JavaCompile) { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 89b5b32..1d6a4d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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 { + sourceCompatibility = JavaVersion.VERSION_17.toString() + targetCompatibility = JavaVersion.VERSION_17.toString() + } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3ef443c..bf1a9d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" } @@ -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" }