Skip to content

Commit

Permalink
Bump agp plugin to 8.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandregpereira committed Oct 22, 2023
1 parent f70a976 commit c853fdf
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 35 deletions.
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/TargetConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fun Project.configureTargets(
) {
kotlin.apply {
if (hasAndroid) {
android()
androidTarget()
}
if (hasJvm) {
jvm()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "",
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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(
Expand Down
5 changes: 3 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
}

0 comments on commit c853fdf

Please sign in to comment.