diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 52a184dd..152ac517 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,20 +26,22 @@ android { } } - androidResources { additionalParameters("--allow-reserved-package-id", "--package-id", "0x45") } + androidResources { + additionalParameters += listOf("--allow-reserved-package-id", "--package-id", "0x45") + } compileOptions { sourceCompatibility = JavaVersion.VERSION_18 targetCompatibility = JavaVersion.VERSION_18 } - lintOptions { - disable( - "Internationalization", - "UnsafeIntentLaunch", - "UnspecifiedRegisterReceiverFlag", - "VectorPath", - "Usability:Icons") + lint { + disable += + listOf( + "Internationalization", + "UnsafeIntentLaunch", + "UnspecifiedRegisterReceiverFlag", + "Usability:Icons") } kotlinOptions { jvmTarget = JavaVersion.VERSION_18.toString() } diff --git a/build.gradle.kts b/build.gradle.kts index 265c215a..09f0a39a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ import com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask plugins { - id("com.android.application") version "8.1.0-alpha11" apply false - id("com.android.library") version "8.1.0-alpha11" apply false + id("com.android.application") version "8.2.0-alpha01" apply false + id("com.android.library") version "8.2.0-alpha01" apply false id("org.jetbrains.kotlin.android") version "1.8.21" apply false id("com.ncorti.ktfmt.gradle") version "0.12.0" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba77..c1962a79 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b..37aef8d3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d42..aeb74cbb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in