diff --git a/Android/.gitignore b/Android/.gitignore
index 69f24fc..331c81c 100644
--- a/Android/.gitignore
+++ b/Android/.gitignore
@@ -1,16 +1,20 @@
-*.iml
+.artifacts
.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-/.idea/dictionaries
-/build
-/captures
+.idea/appInsightsSettings.xml
+.idea/caches
+.idea/compiler.xml
+.idea/deploymentTargetSelector.xml
+.idea/deviceManager.xml
+.idea/gradle.xml
+.idea/markdown.xml
+.idea/migrations.xml
+.idea/planningMode.xml
+.idea/studiobot.xml
+.idea/workspace.xml
+.DS_Store
.externalNativeBuild
.cxx
-/app/debug
-/app/release
+*.iml
+build
+captures
+local.properties
diff --git a/Android/.idea/.gitignore b/Android/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/Android/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/Android/.idea/AndroidProjectSystem.xml b/Android/.idea/AndroidProjectSystem.xml
new file mode 100644
index 0000000..4a53bee
--- /dev/null
+++ b/Android/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Android/.idea/appInsightsSettings.xml b/Android/.idea/appInsightsSettings.xml
new file mode 100644
index 0000000..13574c8
--- /dev/null
+++ b/Android/.idea/appInsightsSettings.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Android/.idea/compiler.xml b/Android/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/Android/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml
deleted file mode 100644
index 23a89bb..0000000
--- a/Android/.idea/gradle.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Android/.idea/misc.xml b/Android/.idea/misc.xml
index 6c2e59d..21aefeb 100644
--- a/Android/.idea/misc.xml
+++ b/Android/.idea/misc.xml
@@ -1,49 +1,57 @@
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/Android/.idea/runConfigurations.xml b/Android/.idea/runConfigurations.xml
index e497da9..72f00ed 100644
--- a/Android/.idea/runConfigurations.xml
+++ b/Android/.idea/runConfigurations.xml
@@ -3,7 +3,14 @@
-
+
+
+
+
+
+
+
+
diff --git a/Android/.idea/runConfigurations/app.xml b/Android/.idea/runConfigurations/app.xml
new file mode 100644
index 0000000..4bd11a0
--- /dev/null
+++ b/Android/.idea/runConfigurations/app.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Android/.idea/vcs.xml b/Android/.idea/vcs.xml
index 94a25f7..6c0b863 100644
--- a/Android/.idea/vcs.xml
+++ b/Android/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
index 1d8cad7..95c153a 100644
--- a/Android/app/build.gradle
+++ b/Android/app/build.gradle
@@ -11,22 +11,23 @@ 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 = '3.3.0'
-def nav_version = '2.3.5'
-def room_version = '2.3.0'
-def rxjava_version = '3.0.0'
-def flipper_version = '0.87.0'
-def soloader_version = '0.10.1'
-def gson_version = '2.8.6'
+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 flipper_version = '0.230.0'
+def soloader_version = '0.11.0'
+def gson_version = '2.11.0'
android {
- compileSdkVersion 30
- buildToolsVersion '30.0.3'
+ namespace "com.majinnaibu.monstercards"
+ compileSdk 35
defaultConfig {
applicationId "com.majinnaibu.monstercards"
- minSdkVersion 22
- targetSdkVersion 30
+ minSdkVersion 23
+ targetSdk 35
versionCode 1
versionName "1.0"
buildConfigField "String", "APPCENTER_SECRET", "\"${appCenterSecret}\""
@@ -57,11 +58,12 @@ android {
}
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
}
buildFeatures {
viewBinding true
+ buildConfig true
}
}
@@ -88,7 +90,7 @@ dependencies {
// Room DB
implementation "io.reactivex.rxjava3:rxjava:$rxjava_version"
- implementation "io.reactivex.rxjava3:rxandroid:$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"
diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
index eaa2137..384648d 100644
--- a/Android/app/src/main/AndroidManifest.xml
+++ b/Android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
+ android:launchMode="singleTask"
+ android:exported="true">
diff --git a/Android/build.gradle b/Android/build.gradle
index b3530b4..00d3989 100644
--- a/Android/build.gradle
+++ b/Android/build.gradle
@@ -5,9 +5,9 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.2'
+ classpath 'com.android.tools.build:gradle:9.3.1'
- def nav_version = "2.3.0"
+ def nav_version = "2.9.8"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
// NOTE: Do not place your application dependencies here; they belong
@@ -15,15 +15,6 @@ buildscript {
}
}
-allprojects {
- repositories {
- google()
- mavenCentral()
- // maven { url "https://oss.jfrog.org/libs-snapshot" }
- // maven { url 'http://repo1.maven.org/maven2' }
- }
-}
-
task clean(type: Delete) {
delete rootProject.buildDir
}
diff --git a/Android/gradle.properties b/Android/gradle.properties
index c52ac9b..2f74af9 100644
--- a/Android/gradle.properties
+++ b/Android/gradle.properties
@@ -6,14 +6,23 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=false
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
+android.uniquePackageNames=false
+android.dependency.useConstraints=false
+android.javaCompile.suppressSourceTargetDeprecationWarning=true
+android.r8.strictFullModeForKeepRules=false
+org.gradle.configuration-cache=true
diff --git a/Android/gradle/gradle-daemon-jvm.properties b/Android/gradle/gradle-daemon-jvm.properties
new file mode 100644
index 0000000..baa28d1
--- /dev/null
+++ b/Android/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,13 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7083b89563e7ce20943037b8cd2b8cc2/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/060bbb778a1f55ea705fdebd2ccfeab9/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d09679dc60fe5aa05ef7d03efdefac20/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ed4e3bf2f5e7c5d9aabc4cbd8acd555e/redirect
+toolchainVendor=JETBRAINS
+toolchainVersion=21
diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties
index 6872ac3..b47ef32 100644
--- a/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat May 01 23:00:30 PDT 2021
+#Fri Aug 14 17:08:57 PDT 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/Android/settings.gradle b/Android/settings.gradle
index 6c72eee..02c60fd 100644
--- a/Android/settings.gradle
+++ b/Android/settings.gradle
@@ -1,2 +1,26 @@
+pluginManagement {
+ repositories {
+ google {
+ content {
+ includeGroupByRegex("com\\.android.*")
+ includeGroupByRegex("com\\.google.*")
+ includeGroupByRegex("androidx.*")
+ }
+ }
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
+plugins {
+ id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}
+dependencyResolutionManagement {
+ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+ repositories {
+ google()
+ mavenCentral()
+ }
+}
+
+rootProject.name = "MonsterCards"
include ':app'
-rootProject.name = "MonsterCards"
\ No newline at end of file