[tor-commits] [orbot/master] Fixes #237: Upgrade to Gradle 5.x

[n8fr8@xxxxxxxxxxxxxx]

commit 8c232f73ea2be1cba4602c603e5a3c4942eacf9b
Author: sisbell <shane.isbell@xxxxxxxxx>
Date:   Sun Jun 30 21:00:22 2019 -0700

    Fixes #237: Upgrade to Gradle 5.x
---
 build.gradle                             | 2 +-
 gradle.properties                        | 3 +--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 orbotservice/build.gradle                | 5 +++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8563b2eb..dd82e239 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index f6a934d9..d5f3dfc4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,11 +6,10 @@
 # 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
+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
-android.useDeprecatedNdk=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 57678c30..9dfc5f7e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index c416f6e9..d39361f1 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -24,6 +24,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 dependencies {



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits