From 8b6ee62b84da2e9d16012be7e25fca2228944e7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Oct 2023 09:17:40 -0300 Subject: [PATCH 1/4] Bump koin from 3.4.3 to 3.5.0 (#212) Bumps `koin` from 3.4.3 to 3.5.0. Updates `io.insert-koin:koin-android` from 3.4.3 to 3.5.0 - [Release notes](https://github.com/InsertKoinIO/koin/releases) - [Changelog](https://github.com/InsertKoinIO/koin/blob/main/CHANGELOG.md) - [Commits](https://github.com/InsertKoinIO/koin/compare/core-3.4.3...3.5.0) Updates `io.insert-koin:koin-core` from 3.4.3 to 3.5.0 - [Release notes](https://github.com/InsertKoinIO/koin/releases) - [Changelog](https://github.com/InsertKoinIO/koin/blob/main/CHANGELOG.md) - [Commits](https://github.com/InsertKoinIO/koin/compare/core-3.4.3...3.5.0) Updates `io.insert-koin:koin-test-junit4` from 3.4.3 to 3.5.0 - [Release notes](https://github.com/InsertKoinIO/koin/releases) - [Changelog](https://github.com/InsertKoinIO/koin/blob/main/CHANGELOG.md) - [Commits](https://github.com/InsertKoinIO/koin/compare/core-3.4.3...3.5.0) --- updated-dependencies: - dependency-name: io.insert-koin:koin-android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.insert-koin:koin-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.insert-koin:koin-test-junit4 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 98f4f1dc..21d71586 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ googleplay_services = "4.3.15" gradle_firebase_crashlytics = "2.9.9" junit_ext = "1.1.5" junit = "4.13.2" -koin = '3.4.3' +koin = '3.5.0' koin_compose = '3.4.5' kotlin = '1.9.10' kotlin_coroutines_test = '1.7.2' From 6e3c76952d5039001f6947c97e2989ff28847b4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Oct 2023 12:35:27 +0000 Subject: [PATCH 2/4] Bump io.insert-koin:koin-androidx-compose from 3.4.5 to 3.5.0 (#211) Bumps [io.insert-koin:koin-androidx-compose](https://github.com/InsertKoinIO/koin) from 3.4.5 to 3.5.0. - [Release notes](https://github.com/InsertKoinIO/koin/releases) - [Changelog](https://github.com/InsertKoinIO/koin/blob/main/CHANGELOG.md) - [Commits](https://github.com/InsertKoinIO/koin/commits/3.5.0) --- updated-dependencies: - dependency-name: io.insert-koin:koin-androidx-compose dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexandre G Pereira --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 21d71586..68e112c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ gradle_firebase_crashlytics = "2.9.9" junit_ext = "1.1.5" junit = "4.13.2" koin = '3.5.0' -koin_compose = '3.4.5' +koin_compose = "3.5.0" kotlin = '1.9.10' kotlin_coroutines_test = '1.7.2' kotlin_coroutines = '1.7.3' From 71648775cd32eb94fe2487ea88b7dee06cd209f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Oct 2023 12:51:31 +0000 Subject: [PATCH 3/4] Bump org.jetbrains.kotlinx:kotlinx-coroutines-test from 1.7.2 to 1.7.3 (#206) Bumps [org.jetbrains.kotlinx:kotlinx-coroutines-test](https://github.com/Kotlin/kotlinx.coroutines) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.7.2...1.7.3) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexandre G Pereira --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 68e112c8..7523b986 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ junit = "4.13.2" koin = '3.5.0' koin_compose = "3.5.0" kotlin = '1.9.10' -kotlin_coroutines_test = '1.7.2' +kotlin_coroutines_test = '1.7.3' kotlin_coroutines = '1.7.3' kotlin_datetime = '0.4.0' kotlinx_serialization = "1.5.1" From 7c74c8b79bc67dbc4db51a4dd98557887dc06573 Mon Sep 17 00:00:00 2001 From: Alexandre G Pereira Date: Sun, 22 Oct 2023 11:13:45 -0300 Subject: [PATCH 4/4] Bump agp plugin to 8.1.2 (#213) --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/TargetConfig.kt | 2 +- .../hunter/detail/ui/State.kt | 33 ++++++++++--------- gradle.properties | 5 +-- gradle/libs.versions.toml | 2 +- .../hunter/ui/compendium/monster/State.kt | 29 ++++++++-------- 6 files changed, 38 insertions(+), 35 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index bfac4ddb..8186212a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -26,6 +26,6 @@ repositories { dependencies { implementation(kotlin("gradle-plugin")) - implementation("com.android.tools.build:gradle:8.1.1") + implementation("com.android.tools.build:gradle:8.1.2") implementation(kotlin("compiler-embeddable")) } diff --git a/buildSrc/src/main/kotlin/TargetConfig.kt b/buildSrc/src/main/kotlin/TargetConfig.kt index 096ce149..1c3518f5 100644 --- a/buildSrc/src/main/kotlin/TargetConfig.kt +++ b/buildSrc/src/main/kotlin/TargetConfig.kt @@ -40,7 +40,7 @@ fun Project.configureTargets( ) { kotlin.apply { if (hasAndroid) { - android() + androidTarget() } if (hasJvm) { jvm() diff --git a/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/State.kt b/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/State.kt index 3ea77926..4c804d2e 100644 --- a/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/State.kt +++ b/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/State.kt @@ -19,6 +19,7 @@ package br.alexandregpereira.hunter.detail.ui import androidx.annotation.DrawableRes import br.alexandregpereira.hunter.detail.R import br.alexandregpereira.hunter.ui.compose.SchoolOfMagicState +import br.alexandregpereira.hunter.ui.R as UiR data class MonsterState( val index: String = "", @@ -119,9 +120,9 @@ enum class DamageTypeState(@DrawableRes val iconRes: Int? = null) { ACID(R.drawable.ic_acid), BLUDGEONING(R.drawable.ic_bludgeoning), COLD(R.drawable.ic_cold), - FIRE(R.drawable.ic_elemental), + FIRE(UiR.drawable.ic_elemental), LIGHTNING(R.drawable.ic_lightning), - NECROTIC(R.drawable.ic_undead), + NECROTIC(UiR.drawable.ic_undead), PIERCING(R.drawable.ic_piercing), POISON(R.drawable.ic_poison), PSYCHIC(R.drawable.ic_psychic), @@ -187,20 +188,20 @@ data class ColorState( } enum class MonsterTypeState(@DrawableRes val iconRes: Int) { - ABERRATION(R.drawable.ic_aberration), - BEAST(R.drawable.ic_beast), - CELESTIAL(R.drawable.ic_celestial), - CONSTRUCT(R.drawable.ic_construct), - DRAGON(R.drawable.ic_dragon), - ELEMENTAL(R.drawable.ic_elemental), - FEY(R.drawable.ic_fey), - FIEND(R.drawable.ic_fiend), - GIANT(R.drawable.ic_giant), - HUMANOID(R.drawable.ic_humanoid), - MONSTROSITY(R.drawable.ic_monstrosity), - OOZE(R.drawable.ic_ooze), - PLANT(R.drawable.ic_plant), - UNDEAD(R.drawable.ic_undead) + ABERRATION(UiR.drawable.ic_aberration), + BEAST(UiR.drawable.ic_beast), + CELESTIAL(UiR.drawable.ic_celestial), + CONSTRUCT(UiR.drawable.ic_construct), + DRAGON(UiR.drawable.ic_dragon), + ELEMENTAL(UiR.drawable.ic_elemental), + FEY(UiR.drawable.ic_fey), + FIEND(UiR.drawable.ic_fiend), + GIANT(UiR.drawable.ic_giant), + HUMANOID(UiR.drawable.ic_humanoid), + MONSTROSITY(UiR.drawable.ic_monstrosity), + OOZE(UiR.drawable.ic_ooze), + PLANT(UiR.drawable.ic_plant), + UNDEAD(UiR.drawable.ic_undead) } data class SpellcastingState( diff --git a/gradle.properties b/gradle.properties index e4d421b1..38263aff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,5 +37,6 @@ android.minSdk=24 xcodeproj=iosApp/MonsterCompendium.xcodeproj kotlin.mpp.androidSourceSetLayoutVersion=2 android.defaults.buildfeatures.buildconfig=true -android.nonTransitiveRClass=false -android.nonFinalResIds=false +android.nonTransitiveRClass=true +android.nonFinalResIds=true +org.gradle.configuration-cache=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7523b986..cfe53e8a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] accompanist = "0.30.1" -android_gradle_plugin = "8.1.1" +android_gradle_plugin = "8.1.2" appcompat = "1.6.1" arch_core_testing = "2.2.0" coil_compose = "2.4.0" diff --git a/ui/monster-compendium/src/main/java/br/alexandregpereira/hunter/ui/compendium/monster/State.kt b/ui/monster-compendium/src/main/java/br/alexandregpereira/hunter/ui/compendium/monster/State.kt index 73717c8e..5d7e06f7 100644 --- a/ui/monster-compendium/src/main/java/br/alexandregpereira/hunter/ui/compendium/monster/State.kt +++ b/ui/monster-compendium/src/main/java/br/alexandregpereira/hunter/ui/compendium/monster/State.kt @@ -17,6 +17,7 @@ package br.alexandregpereira.hunter.ui.compendium.monster import androidx.annotation.DrawableRes +import br.alexandregpereira.hunter.ui.R as UiR data class MonsterCardState( val index: String, @@ -42,18 +43,18 @@ data class ColorState( } enum class MonsterTypeState(@DrawableRes val iconRes: Int) { - ABERRATION(R.drawable.ic_aberration), - BEAST(R.drawable.ic_beast), - CELESTIAL(R.drawable.ic_celestial), - CONSTRUCT(R.drawable.ic_construct), - DRAGON(R.drawable.ic_dragon), - ELEMENTAL(R.drawable.ic_elemental), - FEY(R.drawable.ic_fey), - FIEND(R.drawable.ic_fiend), - GIANT(R.drawable.ic_giant), - HUMANOID(R.drawable.ic_humanoid), - MONSTROSITY(R.drawable.ic_monstrosity), - OOZE(R.drawable.ic_ooze), - PLANT(R.drawable.ic_plant), - UNDEAD(R.drawable.ic_undead) + ABERRATION(UiR.drawable.ic_aberration), + BEAST(UiR.drawable.ic_beast), + CELESTIAL(UiR.drawable.ic_celestial), + CONSTRUCT(UiR.drawable.ic_construct), + DRAGON(UiR.drawable.ic_dragon), + ELEMENTAL(UiR.drawable.ic_elemental), + FEY(UiR.drawable.ic_fey), + FIEND(UiR.drawable.ic_fiend), + GIANT(UiR.drawable.ic_giant), + HUMANOID(UiR.drawable.ic_humanoid), + MONSTROSITY(UiR.drawable.ic_monstrosity), + OOZE(UiR.drawable.ic_ooze), + PLANT(UiR.drawable.ic_plant), + UNDEAD(UiR.drawable.ic_undead) }