maj/MonsterCards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates dependencies to latest versions.

Browse Source
This commit is contained in:
Tom Hicks
2026-09-21 11:06:04 -07:00
committed by Tom
parent e888bbf8a8
commit 339e413f82
9 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Android/app/build.gradle
View File

@@ -11,21 +11,15 @@ if (propertiesFile.exists()) {
def appCenterLocalSecret = properties.getProperty('appCenter.localSecret')
def appCenterEnvSecret = System.getenv('APPCENTER_SECRET')
def appCenterSecret = appCenterLocalSecret != null ? appCenterLocalSecret : appCenterEnvSecret != null ? appCenterEnvSecret : ""
def appCenterSdkVersion = '5.0.4'
def nav_version = '2.9.8'
def room_version = '2.8.4'
def rxjava_version = '3.1.8'
def rxandroid_version = '3.0.2'
def gson_version = '2.11.0'
android {
namespace "com.majinnaibu.monstercards"
compileSdk 35
compileSdk 37
defaultConfig {
applicationId "com.majinnaibu.monstercards"
minSdkVersion 23
targetSdk 35
minSdkVersion 24
targetSdk 36
versionCode 1
versionName "1.0"
buildConfigField "String", "APPCENTER_SECRET", "\"${appCenterSecret}\""
@@ -76,35 +70,35 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
// Google
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation "androidx.navigation:navigation-fragment:$nav_version"
implementation "androidx.navigation:navigation-ui:$nav_version"
implementation 'androidx.appcompat:appcompat:1.8.0'
implementation 'com.google.android.material:material:1.14.0'
implementation 'androidx.constraintlayout:constraintlayout:2.2.2'
implementation "androidx.navigation:navigation-fragment:2.10.1"
implementation "androidx.navigation:navigation-ui:2.10.1"
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
implementation 'androidx.recyclerview:recyclerview:1.4.0'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.11.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0'
// Testing
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
// Room DB
implementation "io.reactivex.rxjava3:rxjava:$rxjava_version"
implementation "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-rxjava3:$room_version"
//testImplementation "androidx.room:room-testing:$room_version"
implementation "io.reactivex.rxjava3:rxjava:3.1.12"
implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
implementation "androidx.room:room-runtime:2.8.5"
annotationProcessor "androidx.room:room-compiler:2.8.5"
implementation "androidx.room:room-rxjava3:2.8.5"
//testImplementation "androidx.room:room-testing:2.8.5"
// AppCenter
debugImplementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
debugImplementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"
debugImplementation "com.microsoft.appcenter:appcenter-analytics:5.0.6"
debugImplementation "com.microsoft.appcenter:appcenter-crashes:5.0.6"
// Other 3rd Party
implementation 'com.atlassian.commonmark:commonmark:0.15.2'
implementation "com.google.code.gson:gson:$gson_version"
implementation 'com.atlassian.commonmark:commonmark:0.17.0'
implementation "com.google.code.gson:gson:2.14.0"
}

4
Android/app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.majinnaibu.monstercards">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
@@ -11,6 +10,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:intentMatchingFlags="enforceIntentFilter"
android:theme="@style/AppTheme">
<activity
android:name=".SplashActivity"

2
Android/app/src/main/java/com/majinnaibu/monstercards/models/Collection.java
View File

@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.Ignore;
import androidx.room.PrimaryKey;
import java.util.Objects;
@@ -30,6 +31,7 @@ public class Collection {
this.description = "";
}
@Ignore
public Collection(@NonNull String name, @NonNull String description) {
this.id = UUID.randomUUID();
this.name = name;

2
Android/app/src/main/java/com/majinnaibu/monstercards/models/CollectionMonster.java
View File

@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.ForeignKey;
import androidx.room.Ignore;
import androidx.room.Index;
import androidx.room.PrimaryKey;
@@ -52,6 +53,7 @@ public class CollectionMonster {
this.ordinal = 0;
}
@Ignore
public CollectionMonster(@NonNull UUID collectionId, @NonNull UUID monsterId, int ordinal) {
this.collectionId = collectionId;
this.monsterId = monsterId;

2
Android/app/src/main/java/com/majinnaibu/monstercards/models/CollectionWithCount.java
View File

@@ -1,6 +1,7 @@
package com.majinnaibu.monstercards.models;
import androidx.room.Embedded;
import androidx.room.Ignore;
public class CollectionWithCount {
@Embedded
@@ -13,6 +14,7 @@ public class CollectionWithCount {
this.monsterCount = 0;
}
@Ignore
public CollectionWithCount(Collection collection, int monsterCount) {
this.collection = collection;
this.monsterCount = monsterCount;

2
Android/app/src/main/java/com/majinnaibu/monstercards/models/DashboardMonster.java
View File

@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.ForeignKey;
import androidx.room.Ignore;
import androidx.room.Index;
import androidx.room.PrimaryKey;
@@ -36,6 +37,7 @@ public class DashboardMonster {
this.ordinal = 0;
}
@Ignore
public DashboardMonster(@NonNull UUID monsterId, int ordinal) {
this.monsterId = monsterId;
this.ordinal = ordinal;

2
Android/app/src/main/java/com/majinnaibu/monstercards/models/DashboardMonsterWithMonster.java
View File

@@ -1,6 +1,7 @@
package com.majinnaibu.monstercards.models;
import androidx.room.Embedded;
import androidx.room.Ignore;
import androidx.room.Relation;
public class DashboardMonsterWithMonster {
@@ -16,6 +17,7 @@ public class DashboardMonsterWithMonster {
public DashboardMonsterWithMonster() {
}
@Ignore
public DashboardMonsterWithMonster(DashboardMonster dashboardEntry, Monster monster) {
this.dashboardEntry = dashboardEntry;
this.monster = monster;

6
Android/build.gradle
View File

@@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:9.3.2'
classpath 'com.android.tools.build:gradle:9.4.1'
def nav_version = "2.9.8"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
@@ -15,6 +15,6 @@ buildscript {
}
}
task clean(type: Delete) {
delete rootProject.buildDir
tasks.register('clean', Delete) {
delete rootProject.layout.buildDirectory
}