Skip to content

Commit fc6cacb

Browse files
authored
Merge pull request #213 from Piwigo/Gradle-fix
Gradle build fix Gradle use 2Gib of ram for easier build Fix issue with layout build Only allow api 26+
2 parents f887355 + ccba542 commit fc6cacb

3 files changed

Lines changed: 20 additions & 7 deletions

File tree

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ android {
3636
defaultConfig {
3737
multiDexEnabled true
3838
applicationId "com.piwigo.piwigo_ng"
39-
minSdkVersion 21
39+
minSdkVersion 26
4040
targetSdkVersion 36
4141
versionCode = flutter.versionCode
4242
versionName = flutter.versionName

android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ allprojects {
55
}
66
}
77

8-
rootProject.layout.buildDirectory.dir('../build')
8+
rootProject.layout.buildDirectory.set(layout.projectDirectory.dir("../build"))
99
subprojects {
10-
project.layout.buildDirectory.map {it.dir("${project.name}")}
10+
project.layout.buildDirectory.set(rootProject.layout.buildDirectory.dir("$project.name"))
1111
project.evaluationDependsOn(':app')
1212
}
1313

1414
tasks.register("clean", Delete) {
1515
delete rootProject.layout.buildDirectory
16-
}
16+
}

android/gradle.properties

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1-
org.gradle.jvmargs=-Xmx1536M
2-
android.useAndroidX=true
1+
## For more details on how to configure your build environment visit
2+
# http://www.gradle.org/docs/current/userguide/build_environment.html
3+
#
4+
# Specifies the JVM arguments used for the daemon process.
5+
# The setting is particularly useful for tweaking memory settings.
6+
# Default value: -Xmx1024m -XX:MaxPermSize=256m
7+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
8+
#
9+
# When configured, Gradle will run in incubating parallel mode.
10+
# This option should only be used with decoupled projects. For more details, visit
11+
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
12+
# org.gradle.parallel=true
13+
#Tue Apr 22 14:46:56 CEST 2025
314
android.enableJetifier=true
415
android.jetifier.ignorelist=bcprov-jdk15on
5-
android.nonTransitiveRClass=false
616
android.nonFinalResIds=false
17+
android.nonTransitiveRClass=false
18+
android.useAndroidX=true
19+
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"

0 commit comments

Comments
 (0)