Skip to content

Commit

Permalink
Merge pull request #28 from ChatterCommerce/update-gradle
Browse files Browse the repository at this point in the history
updated gradle settings
  • Loading branch information
Almeros committed Nov 18, 2017
2 parents 1ffb844 + 9313c52 commit 4b5380d
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ android {
versionCode Integer.parseInt(VERSION_CODE)
versionName VERSION_NAME
}

lintOptions {
abortOnError false
}

}
2 changes: 0 additions & 2 deletions library/build/tmp/packageReleaseJar/MANIFEST.MF

This file was deleted.

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':library', ':sample'
include ':library'

0 comments on commit 4b5380d

Please sign in to comment.