diff --git a/.gitignore b/.gitignore index 59abb83..bb8fb54 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,6 @@ /*.iml app/app.iml .ruby-version +.classpath +.project .settings -app/.settings diff --git a/Jenkinsfile b/Jenkinsfile index dda3eae..56b2e7e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,7 +67,7 @@ JAVA_HOME: '/usr/java/latest', ANDROID_HOME: '/opt/android/sdk', GRADLE_USER_HOME: '/opt/android/gradle', - GRADLE_OPTS: '-XX:MaxMetaspaceSize=128m -Xmx1024m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -Dme.jenkins', + GRADLE_OPTS: '-XX:MaxMetaspaceSize=256m -Xmx1792m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -Dme.jenkins -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy=in-process', GOOGLE_API_CID: 'dappre-google-api', ], noIndex: '(.+_.+|production)', // Avoid automatic indexing for release and private branches diff --git a/docker-compose.yml b/docker-compose.yml index aa08d07..95e5caa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,11 @@ resources: limits: cpus: '1.5' - memory: 1280M + memory: 2560M + environment: + - JAVA_HOME=/usr/java/latest + - ANDROID_HOME=/opt/android/sdk + - GRADLE_OPTS=-XX:MaxMetaspaceSize=256m -Xmx1792m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -Dme.jenkins -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy=in-process networks: bridge: diff --git a/gradle.properties b/gradle.properties index 9ca4480..af40687 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,9 +26,15 @@ #-Duser.variant \ #-Dme.jenkins +#android.enableJetifier=true +#android.useAndroidX=true +#kotlin.incremental=true +#kapt.incremental.apt=true +#android.databinding.incremental=true +#android.enableR8=true # 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 -org.gradle.daemon=false +org.gradle.daemon=true org.gradle.caching=true