Merge pull request #28 from ChatterCommerce/update-gradle

Almeros · web-flow · commit 4b5380ddb09a · 2017-11-18T11:42:46.000+01:00
updated gradle settings
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,6 @@ POM_DEVELOPER_NAME=Almeros Thies
 ANDROID_MIN_SDK=8
 ANDROID_TARGET_SDK=21
 ANDROID_COMPILE_SDK=21
-ANDROID_BUILD_TOOLS_VERSION=21.0.0
+ANDROID_BUILD_TOOLS_VERSION=25.0.0
+
+org.gradle.jvmargs=-Xmx1536M
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 13 07:09:27 CST 2014
+#Wed Nov 15 14:08:27 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -13,4 +13,9 @@ android {
         versionCode Integer.parseInt(VERSION_CODE)
         versionName VERSION_NAME
     }
+
+    lintOptions {
+        abortOnError false
+    }
+
 }
diff --git a/library/build/tmp/packageReleaseJar/MANIFEST.MF b/library/build/tmp/packageReleaseJar/MANIFEST.MF
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':library', ':sample'
+include ':library'

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,9 @@ android {`
`13`	`13`	`versionCode Integer.parseInt(VERSION_CODE)`
`14`	`14`	`versionName VERSION_NAME`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+ lintOptions {`
	`18`	`+ abortOnError false`
	`19`	`+ }`
	`20`	`+`
`16`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include ':library', ':sample'`
	`1`	`+include ':library'`