Skip to content

Commit

Permalink
version 462
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinbonnin
martinbonnin committed Jul 5, 2021
1 parent 1cf5eb9 commit 597f71e
Show file tree
Hide file tree
Showing 11 changed files with 1,471 additions and 105 deletions.
8 changes: 4 additions & 4 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ val googleServicesFile = File(project.projectDir, "google-services.json")

if (!googleServicesFile.exists()) {
throw Exception("no google-services.json found. You can use the mock one:\n" +
"cp app/google-services.json.mock app/google-services.json")
"cp app/google-services.json.mock app/google-services.json")
}


Expand Down Expand Up @@ -110,15 +110,15 @@ android {
applicationId = "net.mbonnin.arcanetracker"
minSdkVersion(Versions.minSdkVersion)
targetSdkVersion(Versions.targetSdkVersion)
versionCode = 461
versionName = "4.61"
versionCode = 462
versionName = "4.62"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled = true

javaCompileOptions {
annotationProcessorOptions {
arguments = mapOf("room.schemaLocation" to "$projectDir/schemas")
arguments["room.schemaLocation"] = "$projectDir/schemas"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/raw/cards.json
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/src/main/res/values/changelogs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@
<string name="changelog_459" translatable="false">Mini-set support</string>
<string name="changelog_460" translatable="false">Added cards from the barrens</string>
<string name="changelog_461" translatable="false">Tentative support for Android 11</string>
<string name="changelog_462" translatable="false">Added cards from 20.8</string>
</resources>
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ object Versions {
const val targetSdkVersion = 29
const val compileSdkVersion = 29
const val kotlin = "1.4.31"
const val androidPlugin = "3.6.2"
const val androidPlugin = "4.1.3"
const val playServicesPlugin = "4.3.3"
const val crashlyticsPlugin = "2.1.1"
const val coroutines = "1.3.5"
Expand Down
2 changes: 1 addition & 1 deletion detector/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ android {

externalNativeBuild {
cmake {
setPath("CMakeLists.txt")
path = file("CMakeLists.txt")
}
}
compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ android.useAndroidX=true
org.gradle.jvmargs=-Xmx3072m

// workaround for https://youtrack.jetbrains.com/issue/KT-43128
kotlin.native.cacheKind=none
kotlin.native.cacheKind=none
3 changes: 2 additions & 1 deletion kotlin-hsmodel/src/commonMain/kotlin/net/hearthsim/hsmodel/Card.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ data class Card(
HSSet.DEMON_HUNTER_INITIATE,
HSSet.SCHOLOMANCE,
HSSet.DARKMOON_FAIRE,
HSSet.THE_BARRENS
HSSet.THE_BARRENS,
HSSet.STORMWIND
)
val HALL_OF_FAME_CARDS = setOf(
CardId.ICE_BLOCK,
Expand Down
24 changes: 20 additions & 4 deletions kotlin-hsmodel/src/commonMain/kotlin/net/hearthsim/hsmodel/battlegrounds/Battlegrounds.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,33 @@ class BattlegroundMinion(
)

val battlegroundsMinions: List<BattlegroundMinion> = listOf(
BattlegroundMinion("BAR_073", 3),
BattlegroundMinion("BG20_100", 1),
BattlegroundMinion("BG20_101", 2),
BattlegroundMinion("BG20_102", 2),
BattlegroundMinion("BG20_103", 3),
BattlegroundMinion("BG20_104", 4),
BattlegroundMinion("BG20_105", 3),
BattlegroundMinion("BG20_106", 4),
BattlegroundMinion("BG20_201", 3),
BattlegroundMinion("BG20_202", 3),
BattlegroundMinion("BG20_203", 2),
BattlegroundMinion("BG20_204", 5),
BattlegroundMinion("BG20_205", 5),
BattlegroundMinion("BG20_206", 6),
BattlegroundMinion("BG20_207", 4),
BattlegroundMinion("BG20_210", 4),
BattlegroundMinion("BG20_301", 1),
BattlegroundMinion("BG20_302", 5),
BattlegroundMinion("BG20_303", 6),
BattlegroundMinion("BG20_304", 6),
BattlegroundMinion("BGS_001", 2),
BattlegroundMinion("BGS_002", 3),
BattlegroundMinion("BGS_004", 1),
BattlegroundMinion("BGS_006", 5),
BattlegroundMinion("BGS_008", 6),
BattlegroundMinion("BGS_009", 5),
BattlegroundMinion("BGS_010", 5),
BattlegroundMinion("BGS_012", 6),
BattlegroundMinion("BGS_012", 5),
BattlegroundMinion("BGS_014", 2),
BattlegroundMinion("BGS_017", 2),
BattlegroundMinion("BGS_018", 6),
Expand Down Expand Up @@ -106,7 +124,6 @@ val battlegroundsMinions: List<BattlegroundMinion> = listOf(
BattlegroundMinion("EX1_062", 2),
BattlegroundMinion("EX1_093", 4),
BattlegroundMinion("EX1_103", 3),
BattlegroundMinion("EX1_185", 4),
BattlegroundMinion("EX1_506", 1),
BattlegroundMinion("EX1_507", 2),
BattlegroundMinion("EX1_509", 1),
Expand Down Expand Up @@ -137,7 +154,6 @@ val battlegroundsMinions: List<BattlegroundMinion> = listOf(
BattlegroundMinion("TRL_232", 5),
BattlegroundMinion("ULD_217", 1),
BattlegroundMinion("UNG_073", 1),
BattlegroundMinion("VAN_EX1_509", 1),
BattlegroundMinion("YOD_026", 1)
)

Loading

1 comment on commit 597f71e

@Dracklifex
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked on a xiaomi, the card library is up to date but does not detect the cards being drawn. It does not record ranked games. Will it be a permission problem when starting? Which folder should be selected? Good afternoon everyone.

Please sign in to comment.