From 0a6fd7316a8782e08d842cf5d917435f641fc0cb Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Tue, 25 Apr 2023 14:01:43 -0400 Subject: [PATCH] (misc) misc version updates Signed-off-by: androidacy-user --- .gitignore | 3 +++ build.gradle.kts | 3 ++- gradle.properties | 28 +++++++++++----------------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 770666d..9cf81e5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ /.idea/ .DS_Store /build +/app/build +/app/default +/app/fdroid /captures .externalNativeBuild .cxx diff --git a/build.gradle.kts b/build.gradle.kts index 06d3dd9..6abedda 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ buildscript { set("sentryVersion", "6.17.0") } dependencies { - classpath("com.android.tools.build:gradle:8.1.0-beta01") + classpath("com.android.tools.build:gradle:8.0.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20") classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.6.2") @@ -29,6 +29,7 @@ buildscript { tasks.register("clean", Delete::class) { delete(rootProject.buildDir) } + afterEvaluate { tasks.withType().configureEach { sourceCompatibility = JavaVersion.VERSION_17.toString() diff --git a/gradle.properties b/gradle.properties index 2a605eb..18955d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,28 +1,22 @@ -# 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 +## 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=-Xmx2048m -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:ReservedCodeCacheSize=768m +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -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 # 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 +#Tue Apr 25 12:57:16 EDT 2023 +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=false - -# Fox builds props mods -org.gradle.parallel=true android.enableR8.fullMode=true -org.gradle.configuration-cache=true -android.defaults.buildfeatures.buildconfig=true -#kotlin.jvm.target.validation.mode=IGNORE +android.useAndroidX=true org.gradle.caching=true +org.gradle.configuration-cache=true org.gradle.configuration-cache.problems=warn +org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M" -Dfile.encoding\=UTF-8 -XX\:+UseParallelGC -XX\:ReservedCodeCacheSize\=768m +org.gradle.parallel=true