diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5aabef8a..94639dab 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.app) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.ksp) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.serialization) @@ -53,7 +52,6 @@ android { getByName("release") { isMinifyEnabled = true isShrinkResources = true - aaptOptions.cruncherEnabled = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") signingConfig = releaseSigningConfig @@ -61,7 +59,6 @@ android { getByName("debug") { applicationIdSuffix = ".debug" isDebuggable = true - aaptOptions.cruncherEnabled = false } } diff --git a/gradle.properties b/gradle.properties index 7a7264b1..ebb69b22 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,22 +1,7 @@ -# Project-wide Gradle settings. -# -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# -# For more details on how to configure your build environment visit -# 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=-Xmx2G -XX:MaxMetaspaceSize=512m -# 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 -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official -# Allow using snapshot releases of Jellyfin SDK. Possible values are: +# Gradle +org.gradle.jvmargs=-Xmx2048m + +# Allow switching between flavors of the Jellyfin SDK. Possible values are: # - "default" # - "local" (local Maven repository) # - "snapshot" (SDK master) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4ba1374c..b5d0638f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -62,7 +62,6 @@ androidx-test-espresso = "3.7.0" [plugins] android-app = { id = "com.android.application", version.ref = "android-plugin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "kotlin-ksp" }