diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e2c756..0766e0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,12 @@ All notable changes to ComposeDex will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Fixed +- asynchronous DAO queries no longer suspend indefinitely if table is empty. + ## [1.0.0] - 2024-12-30 ### Added -- Initial release of the ComposeDex Android app. \ No newline at end of file +- Initial release of the ComposeDex Android app. \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 72f8e21..2875152 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -45,6 +45,7 @@ android { kotlin { compilerOptions { jvmTarget.set(JvmTarget.JVM_17) + freeCompilerArgs.add("-Xannotation-default-target=param-property") } } detekt { diff --git a/app/src/androidTest/kotlin/de/entikore/composedex/data/local/PokemonLocalDataSourceTest.kt b/app/src/androidTest/kotlin/de/entikore/composedex/data/local/PokemonLocalDataSourceTest.kt index c930355..bf9258c 100644 --- a/app/src/androidTest/kotlin/de/entikore/composedex/data/local/PokemonLocalDataSourceTest.kt +++ b/app/src/androidTest/kotlin/de/entikore/composedex/data/local/PokemonLocalDataSourceTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,7 +91,8 @@ class PokemonLocalDataSourceTest: LocalDataSourceTest() { database.pokemonDao() .getWithSpeciesTypesAndVarietiesByName(expectedEntity.pokemon.pokemonName).test { val actualEntity = awaitItem() - assertThat(actualEntity.sortTypesForComparison()) + assertThat(actualEntity).isNotNull() + assertThat(actualEntity!!.sortTypesForComparison()) .isEqualTo(expectedEntity.sortTypesForComparison()) } } @@ -179,12 +180,14 @@ class PokemonLocalDataSourceTest: LocalDataSourceTest() { localDataSource.insertPokemonWithSpeciesTypesAndVarieties(expectedEntity) val actualEntity = awaitItem() - assertThat(actualEntity.sortTypesForComparison()).isEqualTo(expectedEntity.sortTypesForComparison()) + assertThat(actualEntity).isNotNull() + assertThat(actualEntity!!.sortTypesForComparison()).isEqualTo(expectedEntity.sortTypesForComparison()) assertThat(actualEntity.pokemon.isFavourite).isFalse() database.pokemonDao().updateFavourite(FavouriteUpdate(expectedEntity.pokemon.pokemonId, true)) val favouriteEntity = awaitItem() - assertThat(favouriteEntity.pokemon.isFavourite).isTrue() + assertThat(favouriteEntity).isNotNull() + assertThat(favouriteEntity!!.pokemon.isFavourite).isTrue() val expectedEntitySprite = "newSprite" localDataSource.updatePokemonSprite( @@ -192,7 +195,8 @@ class PokemonLocalDataSourceTest: LocalDataSourceTest() { expectedEntitySprite ) val spriteEntity = awaitItem() - assertThat(spriteEntity.pokemon.localSprite).isEqualTo(expectedEntitySprite) + assertThat(spriteEntity).isNotNull() + assertThat(spriteEntity!!.pokemon.localSprite).isEqualTo(expectedEntitySprite) } } @@ -207,12 +211,14 @@ class PokemonLocalDataSourceTest: LocalDataSourceTest() { localDataSource.insertPokemonWithSpeciesTypesAndVarieties(expectedEntity) val actualEntity = awaitItem() - assertThat(actualEntity.sortTypesForComparison()).isEqualTo(expectedEntity.sortTypesForComparison()) + assertThat(actualEntity).isNotNull() + assertThat(actualEntity!!.sortTypesForComparison()).isEqualTo(expectedEntity.sortTypesForComparison()) assertThat(actualEntity.pokemon.isFavourite).isFalse() database.pokemonDao().updateFavourite(FavouriteUpdate(expectedEntity.pokemon.pokemonId, true)) val favouriteEntity = awaitItem() - assertThat(favouriteEntity.pokemon.isFavourite).isTrue() + assertThat(favouriteEntity).isNotNull() + assertThat(favouriteEntity!!.pokemon.isFavourite).isTrue() val expectedEntitySprite = "newSprite" localDataSource.updatePokemonSprite( @@ -220,7 +226,8 @@ class PokemonLocalDataSourceTest: LocalDataSourceTest() { expectedEntitySprite ) val spriteEntity = awaitItem() - assertThat(spriteEntity.pokemon.localSprite).isEqualTo(expectedEntitySprite) + assertThat(spriteEntity).isNotNull() + assertThat(spriteEntity!!.pokemon.localSprite).isEqualTo(expectedEntitySprite) } } } diff --git a/app/src/main/kotlin/de/entikore/composedex/data/local/dao/GenerationDao.kt b/app/src/main/kotlin/de/entikore/composedex/data/local/dao/GenerationDao.kt index 5a71a74..b6d317c 100644 --- a/app/src/main/kotlin/de/entikore/composedex/data/local/dao/GenerationDao.kt +++ b/app/src/main/kotlin/de/entikore/composedex/data/local/dao/GenerationDao.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ interface GenerationDao : BaseDao { /** Load the [GenerationOverviewEntity]. */ @Query("SELECT * FROM generation_overview WHERE id = 0") - fun getOverview(): Flow + fun getOverview(): Flow /** Load all [GenerationEntity]. */ @Transaction @@ -51,7 +51,7 @@ interface GenerationDao : BaseDao { */ @Transaction @Query("SELECT * FROM generation WHERE generationName = :name") - fun getByName(name: String): Flow + fun getByName(name: String): Flow /** * Load a [GenerationEntity] with the given id. @@ -60,7 +60,7 @@ interface GenerationDao : BaseDao { */ @Transaction @Query("SELECT * FROM generation WHERE generationId = :id") - fun getById(id: Int): Flow + fun getById(id: Int): Flow /** * Load all [PokemonWithSpeciesTypesAndVarieties] belonging to the [GenerationEntity] with the diff --git a/app/src/main/kotlin/de/entikore/composedex/data/local/dao/PokemonDao.kt b/app/src/main/kotlin/de/entikore/composedex/data/local/dao/PokemonDao.kt index 4ce5574..3775a0a 100644 --- a/app/src/main/kotlin/de/entikore/composedex/data/local/dao/PokemonDao.kt +++ b/app/src/main/kotlin/de/entikore/composedex/data/local/dao/PokemonDao.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,7 +123,7 @@ interface PokemonDao : BaseDao { */ @Transaction @Query("SELECT * FROM pokemon WHERE pokemonId = :id") - fun getWithSpeciesTypesAndVarietiesById(id: Int): Flow + fun getWithSpeciesTypesAndVarietiesById(id: Int): Flow /** * Load a [PokemonEntity] with the given name and all associated [SpeciesEntity], [TypeEntity] @@ -135,7 +135,7 @@ interface PokemonDao : BaseDao { @Query("SELECT * FROM pokemon WHERE pokemonName = :name") fun getWithSpeciesTypesAndVarietiesByName( name: String - ): Flow + ): Flow /** * Load a [PokemonEntity] with the given name and all associated [SpeciesEntity], [TypeEntity] diff --git a/app/src/main/kotlin/de/entikore/composedex/data/local/dao/TypeDao.kt b/app/src/main/kotlin/de/entikore/composedex/data/local/dao/TypeDao.kt index 795e65a..f29f230 100644 --- a/app/src/main/kotlin/de/entikore/composedex/data/local/dao/TypeDao.kt +++ b/app/src/main/kotlin/de/entikore/composedex/data/local/dao/TypeDao.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ interface TypeDao : BaseDao { /** Load the [TypeOverviewEntity]. */ @Query("SELECT * FROM type_overview WHERE id = 0") - fun getOverview(): Flow + fun getOverview(): Flow /** * Insert a relation object between [TypeEntity] and [PokemonEntity] into the database. @@ -66,7 +66,7 @@ interface TypeDao : BaseDao { * @param name of the type to load */ @Query("SELECT * FROM type WHERE typeName = :name") - fun getByName(name: String): Flow + fun getByName(name: String): Flow /** * Load all [PokemonWithSpeciesTypesAndVarieties] belonging to the [TypeEntity] with the diff --git a/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/GenerationLocalDataSource.kt b/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/GenerationLocalDataSource.kt index 882ab90..4c32fc5 100644 --- a/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/GenerationLocalDataSource.kt +++ b/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/GenerationLocalDataSource.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,13 +56,13 @@ class GenerationLocalDataSource( } } - fun getGenerationOverview(): Flow = generationDao.getOverview() + fun getGenerationOverview(): Flow = generationDao.getOverview() fun getAllGenerations(): Flow> = generationDao.getAll() - fun getGenerationByName(name: String): Flow = generationDao.getByName(name) + fun getGenerationByName(name: String): Flow = generationDao.getByName(name) - fun getGenerationById(id: Int): Flow = generationDao.getById(id) + fun getGenerationById(id: Int): Flow = generationDao.getById(id) fun getPokemonOfGenerationByName(name: String): Flow> = generationDao.getPokemonWithinGenerationByName(name) diff --git a/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/PokemonLocalDataSource.kt b/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/PokemonLocalDataSource.kt index 8aa971c..179d889 100644 --- a/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/PokemonLocalDataSource.kt +++ b/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/PokemonLocalDataSource.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -98,11 +98,11 @@ class PokemonLocalDataSource( fun getPokemonWithSpeciesTypesAndVarietiesByName( name: String - ): Flow = + ): Flow = pokemonDao.getWithSpeciesTypesAndVarietiesByName(name) fun getPokemonWithSpeciesTypesAndVarietiesById( id: Int - ): Flow = + ): Flow = pokemonDao.getWithSpeciesTypesAndVarietiesById(id) } diff --git a/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/TypeLocalDataSource.kt b/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/TypeLocalDataSource.kt index 01767f8..c64244a 100644 --- a/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/TypeLocalDataSource.kt +++ b/app/src/main/kotlin/de/entikore/composedex/data/local/datasource/TypeLocalDataSource.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,11 +54,11 @@ class TypeLocalDataSource( } } - fun getTypeOverview(): Flow = typeDao.getOverview() + fun getTypeOverview(): Flow = typeDao.getOverview() fun getAllTypes(): Flow> = typeDao.getAll() - fun getTypeByName(name: String): Flow = typeDao.getByName(name) + fun getTypeByName(name: String): Flow = typeDao.getByName(name) fun getPokemonOfType(name: String): Flow> = typeDao.getPokemonWithType(name) diff --git a/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstGenerationRepository.kt b/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstGenerationRepository.kt index f07ebc6..98fa749 100644 --- a/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstGenerationRepository.kt +++ b/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstGenerationRepository.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ class OfflineFirstGenerationRepository( override fun getGenerations(): Flow> = localDataSource.getGenerationOverview() .combine(localDataSource.getAllGenerations()) { overview, generations -> - if (generations.isNotEmpty() && generations.size == overview.names.size) { + if (generations.isNotEmpty() && generations.size == overview!!.names.size) { generations.map { it.asExternalModel() } } else { throw LocalDataException("Not all generations in database") @@ -96,7 +96,7 @@ class OfflineFirstGenerationRepository( override fun getGenerationByName(name: String): Flow { return localDataSource .getGenerationByName(name) - .map { generationEntity -> generationEntity.asExternalModel() } + .map { generationEntity -> generationEntity!!.asExternalModel() } .retryWhen { cause, attempt -> if (cause is NullPointerException && attempt < RETRY_COUNT) { Timber.d( @@ -119,7 +119,7 @@ class OfflineFirstGenerationRepository( override fun getGenerationById(id: Int): Flow { return localDataSource .getGenerationById(id) - .map { generationEntity -> generationEntity.asExternalModel() } + .map { generationEntity -> generationEntity!!.asExternalModel() } .retryWhen { cause, attempt -> if (cause is NullPointerException && attempt < RETRY_COUNT) { Timber.d( diff --git a/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstPokemonRepository.kt b/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstPokemonRepository.kt index 2fd207b..1e9a7e3 100644 --- a/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstPokemonRepository.kt +++ b/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstPokemonRepository.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ class OfflineFirstPokemonRepository( ) : PokemonRepository { override fun getPokemonByName(name: String): Flow { return localDataSource.getPokemonWithSpeciesTypesAndVarietiesByName(name).map { - it.asExternalModel() + it!!.asExternalModel() }.retryWhen { cause, attempt -> if (cause is NullPointerException && attempt < RETRY_COUNT) { Timber.d("Attempt $attempt of $RETRY_COUNT to fetch pokemon $name, failed previously because: $cause") @@ -73,7 +73,7 @@ class OfflineFirstPokemonRepository( override fun getPokemonById(id: Int): Flow { return localDataSource.getPokemonWithSpeciesTypesAndVarietiesById(id).map { - it.asExternalModel() + it!!.asExternalModel() }.retryWhen { cause, attempt -> if (cause is NullPointerException && attempt < RETRY_COUNT) { Timber.d( diff --git a/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstTypeRepository.kt b/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstTypeRepository.kt index 855de3f..b1fe0c6 100644 --- a/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstTypeRepository.kt +++ b/app/src/main/kotlin/de/entikore/composedex/data/repository/OfflineFirstTypeRepository.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ class OfflineFirstTypeRepository( override fun getTypes(): Flow> = localDataSource.getTypeOverview() .combine(localDataSource.getAllTypes()) { overview, types -> - if (types.isNotEmpty() && types.size == overview.names.size) { + if (types.isNotEmpty() && types.size == overview?.names?.size) { types.map { it.asExternalModel() } } else { throw LocalDataException("Not all types in database") @@ -92,7 +92,7 @@ class OfflineFirstTypeRepository( } override fun getTypeByName(name: String): Flow = - localDataSource.getTypeByName(name).map { it.asExternalModel() } + localDataSource.getTypeByName(name).map { it!!.asExternalModel() } .retryWhen { cause, attempt -> if (cause is NullPointerException && attempt < RETRY_COUNT) { Timber.d("Attempt $attempt of $RETRY_COUNT to fetch type $name, failed previously because: $cause") diff --git a/app/src/main/kotlin/de/entikore/composedex/domain/usecase/SaveRemoteImageUseCase.kt b/app/src/main/kotlin/de/entikore/composedex/domain/usecase/SaveRemoteImageUseCase.kt index cb14e42..8ef533a 100644 --- a/app/src/main/kotlin/de/entikore/composedex/domain/usecase/SaveRemoteImageUseCase.kt +++ b/app/src/main/kotlin/de/entikore/composedex/domain/usecase/SaveRemoteImageUseCase.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,10 +66,10 @@ class SaveRemoteImageUseCase @Inject constructor( try { client.newCall(request).execute().use { response -> if (!response.isSuccessful) { - Timber.e("Unsuccessful response: ${response.code()} for $imageAddress") + Timber.e("Unsuccessful response: ${response.code} for $imageAddress") return@withContext null } - response.body()?.byteStream()?.use { inputStream -> + response.body?.byteStream()?.use { inputStream -> BitmapFactory.decodeStream(inputStream) } } diff --git a/app/src/main/kotlin/de/entikore/composedex/domain/usecase/SaveRemoteSoundUseCase.kt b/app/src/main/kotlin/de/entikore/composedex/domain/usecase/SaveRemoteSoundUseCase.kt index 0789355..7b20dfc 100644 --- a/app/src/main/kotlin/de/entikore/composedex/domain/usecase/SaveRemoteSoundUseCase.kt +++ b/app/src/main/kotlin/de/entikore/composedex/domain/usecase/SaveRemoteSoundUseCase.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,10 +58,10 @@ class SaveRemoteSoundUseCase @Inject constructor( try { client.newCall(request).execute().use { response -> if (!response.isSuccessful) { - Timber.e("Unsuccessful response: ${response.code()} for $soundAddress") + Timber.e("Unsuccessful response: ${response.code} for $soundAddress") return@withContext null } - response.body()?.byteStream()?.use { inputStream -> + response.body?.byteStream()?.use { inputStream -> context.openFileOutput(dataName, Context.MODE_PRIVATE).use { outputStream -> inputStream.copyTo(outputStream) } diff --git a/app/src/test/kotlin/de/entikore/composedex/konsist/architecture/ArchitectureCheck.kt b/app/src/test/kotlin/de/entikore/composedex/konsist/architecture/ArchitectureCheck.kt index 6b10a29..a47a1db 100644 --- a/app/src/test/kotlin/de/entikore/composedex/konsist/architecture/ArchitectureCheck.kt +++ b/app/src/test/kotlin/de/entikore/composedex/konsist/architecture/ArchitectureCheck.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024 Entikore + * Copyright 2025 Entikore * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,7 +88,7 @@ class ArchitectureCheck { val hasSingleConstructor = declaration.constructors.size == 1 val constructorParametersHavePrivateModifier = declaration.constructors.first().parameters.all { it.modifiers.isEmpty() || - (it.hasValModifier && it.hasModifier(KoModifier.PRIVATE)) + (it.isVal && it.hasModifier(KoModifier.PRIVATE)) } hasSingleConstructor && constructorParametersHavePrivateModifier } diff --git a/config/detekt.yml b/config/detekt.yml index 0a5a140..acd464e 100644 --- a/config/detekt.yml +++ b/config/detekt.yml @@ -1,6 +1,7 @@ comments: AbsentOrWrongFileLicense: active: true + licenseTemplateIsRegex: true licenseTemplateFile: 'license-header.txt' EndOfSentenceFormat: active: true diff --git a/config/license-header.txt b/config/license-header.txt index 9e2fdaa..fe403e1 100644 --- a/config/license-header.txt +++ b/config/license-header.txt @@ -1,15 +1,15 @@ -/* - * Copyright 2024 Entikore - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ \ No newline at end of file +\/\* + \* Copyright 202[4-5]{1} Entikore + \* + \* Licensed under the Apache License, Version 2\.0 \(the "License"\); + \* you may not use this file except in compliance with the License\. + \* You may obtain a copy of the License at + \* + \* http:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0 + \* + \* Unless required by applicable law or agreed to in writing, software + \* distributed under the License is distributed on an "AS IS" BASIS, + \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\. + \* See the License for the specific language governing permissions and + \* limitations under the License\. + \*\/ \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 89777d2..bddb10f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,43 +1,44 @@ [versions] # SDK versions -compileSdk = "35" -targetSdk = "35" +compileSdk = "36" +targetSdk = "36" minSdk = "24" # Dependency versions -androidGradlePlugin = "8.9.1" -androidxComposeBom = "2025.03.01" -androidxTestVersion = "1.6.1" +androidGradlePlugin = "8.11.0" +androidxComposeBom = "2025.06.01" +androidxTest = "1.6.1" +androidxTestRunner = "1.6.2" archTesting = "2.2.0" -coil = "3.0.4" -coreKtx = "1.15.0" +coil = "3.2.0" +coreKtx = "1.16.0" coreSplash = "1.0.1" -coroutineTest = "1.9.0" -dataStore = "1.1.4" -detekt = "1.23.7" -detektCompose = "0.4.11" -exoPlayer = "1.6.0" -hiltAndroid = "2.53.1" +coroutineTest = "1.10.2" +dataStore = "1.1.7" +detekt = "1.23.8" +detektCompose = "0.4.22" +exoPlayer = "1.7.1" +hiltAndroid = "2.56.2" hiltNavigation = "1.2.0" -hiltTest = "2.53.1" -junit5Plugin = "1.10.2.0" -junit5 = "5.11.3" +hiltTest = "2.56.2" +junit5Plugin = "1.13.0.0" +junit5 = "5.13.2" junitVersion = "1.2.1" -konsist = "0.15.1" -kotlinAndroid = "2.1.0" -ksp = "2.1.0-1.0.29" -mockitoCore = "5.3.1" -mockitoAndroid = "4.3.1" -mockitoKotlin = "5.0.0" +konsist = "0.17.3" +kotlinAndroid = "2.2.0" +ksp = "2.2.0-2.0.2" +mockitoCore = "5.18.0" +mockitoAndroid = "5.18.0" +mockitoKotlin = "5.4.0" mockwebserver = "4.12.0" -moshi = "1.15.1" -navigation = "2.8.9" -retrofit = "2.11.0" -room = "2.6.1" +moshi = "1.15.2" +navigation = "2.9.0" +retrofit = "3.0.0" +room = "2.7.2" timber = "5.0.1" truth = "1.4.4" -turbine = "1.2.0" +turbine = "1.2.1" [libraries] androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" } @@ -57,7 +58,7 @@ androidx-navigation-test = { group = "androidx.navigation", name = "navigation-t androidx-room = { group = "androidx.room", name = "room-runtime", version.ref = "room" } androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } -androidx-test-core = { group = "androidx.test", name = "core-ktx", version.ref = "androidxTestVersion" } +androidx-test-core = { group = "androidx.test", name = "core-ktx", version.ref = "androidxTest" } coil = { group = "io.coil-kt.coil3", name = "coil", version.ref = "coil" } coil-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coil" } @@ -76,8 +77,8 @@ retrofit-converter-moshi = { group = "com.squareup.retrofit2", name = "converter timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" } # Development Environment Dependencies -androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestVersion" } -androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestVersion" } +androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" } +androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTest" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-arch-core = { group = "androidx.arch.core", name = "core-testing", version.ref = "archTesting" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..1b33c55 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d71c4e4..ff23a68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Mon Aug 05 19:39:07 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 4f906e0..23d15a9 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,81 +15,115 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..db3a6ac 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal