From 47ba13a31fa3ed577bdb18f0aa98fe4106d086b4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 28 Jun 2019 15:43:58 +0200 Subject: [PATCH] updating gradle, kotlin --- .gitignore | 1 - build.gradle | 4 ++-- gradle.properties | 19 +++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 gradle.properties diff --git a/.gitignore b/.gitignore index 660f31f..4cd1c5e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ *.aab .gradle /local.properties -/gradle.properties /.idea/ .DS_Store /build diff --git a/build.gradle b/build.gradle index 4131087..bfe902f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.21' + ext.kotlin_version = '1.3.40' repositories { google() @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..e813a92 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,19 @@ +# 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=-Xmx1536m +android.enableJetifier=true +android.useAndroidX=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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 63f5de4..02bf68e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 06 11:38:30 CET 2019 +#Fri Jun 28 15:39:20 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip