Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
apply plugin: 'checkstyle'

android {
compileSdk 35
compileSdk 36
buildFeatures {
viewBinding true
}
Expand All @@ -13,7 +13,7 @@ android {
defaultConfig {
applicationId "com.nicue.onetwo"
minSdkVersion 21
targetSdkVersion 35
targetSdkVersion 36
versionCode 41
versionName "2.1.4"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<property
android:name="android.window.PROPERTY_COMPAT_ALLOW_RESTRICTED_RESIZABILITY"
android:value="true" />
</activity>
</application>

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@
<string name="colon">:</string>
<string name="content_desc_add_counter">Agregar contador</string>
<string name="content_desc_roll_dice">Lanzar dados</string>
<string name="content_desc_lock_die">Bloquear dado</string>
<string name="content_desc_unlock_die">Desbloquear dado</string>
<string name="menu_mtg_life">Contador de Vidas</string>
<string name="mtg_setup_title">Nueva Partida</string>
<string name="mtg_setup_players">Jugadores</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
<string name="colon">:</string>
<string name="content_desc_add_counter">Ajouter un score</string>
<string name="content_desc_roll_dice">Lancer les dés</string>
<string name="content_desc_lock_die">Verrouiller le dé</string>
<string name="content_desc_unlock_die">Déverrouiller le dé</string>
<string name="mtg_setup_turn_timer">Minuteur de tour</string>
<string name="mtg_setup_time">Temps</string>
<string name="mtg_pass_turn">Passer</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
<string name="colon">:</string>
<string name="content_desc_add_counter">カウンターを追加</string>
<string name="content_desc_roll_dice">サイコロを振る</string>
<string name="content_desc_lock_die">サイコロをロック</string>
<string name="content_desc_unlock_die">サイコロのロックを解除</string>
<string name="mtg_setup_turn_timer">ターンタイマー</string>
<string name="mtg_setup_time">時間</string>
<string name="mtg_pass_turn">パス</string>
Expand Down
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
buildscript {
ext {
agpVersion = '9.2.1'
spotlessVersion = '7.2.1'
spotlessVersion = '8.10.2'
roomVersion = '2.6.1'
lifecycleVersion = '2.7.0'
navVersion = '2.7.7'
lifecycleVersion = '2.8.7'
navVersion = '2.9.0'
preferenceVersion = '1.2.1'
appcompatVersion = '1.6.1'
appcompatVersion = '1.7.0'
cardviewVersion = '1.0.0'
constraintLayoutVersion = '2.1.4'
materialVersion = '1.12.0'
constraintLayoutVersion = '2.2.2'
materialVersion = '1.13.0'

junitVersion = '4.13.2'
espressoVersion = '3.5.1'
testCoreVersion = '1.5.0'
espressoVersion = '3.6.1'
testCoreVersion = '1.6.1'
archCoreTestingVersion = '2.2.0'
robolectricVersion = '4.16.1'
fragmentTestingVersion = '1.6.2'
robolectricVersion = '4.17'
fragmentTestingVersion = '1.8.6'
}
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading