From c4cf800488406818b1bdb071d7aba3f919679878 Mon Sep 17 00:00:00 2001 From: n8fr8 Date: Thu, 11 Oct 2018 16:51:11 -0400 Subject: [PATCH] update build files --- build.gradle | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- project.properties | 1 + tor-android-binary/build.gradle | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index b6cb00b4..551e9f07 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.0' } } diff --git a/gradle.properties b/gradle.properties index e95c3d31..bde1ed37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,12 +6,12 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -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 #Mon Jun 20 21:44:59 EDT 2016 +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 android.useDeprecatedNdk=true aar.deployPath=/media/n8fr8/nate128/dev/repos/gpmaven diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eb0c3d8a..0c08f561 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed May 09 12:39:36 EDT 2018 +#Thu Oct 11 16:49:15 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/project.properties b/project.properties index deea0096..6eafab8c 100644 --- a/project.properties +++ b/project.properties @@ -10,3 +10,4 @@ # Project target. target=android-16 +aar.deployPath=/media/n8fr8/nate128/dev/repos/gpmaven/ diff --git a/tor-android-binary/build.gradle b/tor-android-binary/build.gradle index 16ea0eaa..0d89becf 100644 --- a/tor-android-binary/build.gradle +++ b/tor-android-binary/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 27 - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.2' /** sourceSets {