Refactor and update dependencies (#56)

Author: SUPERCILEX

.travis.yml

@@ -1,11 +1,9 @@
 language: android
-
-jdk:
-  - oraclejdk8
+jdk: oraclejdk8
 
 before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
     - $HOME/.gradle/caches/
@@ -14,10 +12,9 @@ cache:
 android:
   components:
     - tools
-    - build-tools-24.0.2
-    - android-24
     - platform-tools
+    - build-tools-25.0.0
+    - android-25
     - extra-android-m2repository
 
-script:
-  ./gradlew build
+script: ./gradlew build

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion compileSdk
+    buildToolsVersion buildTools
 
     defaultConfig {
         applicationId "pub.devrel.easypermissions.sample"
         minSdkVersion 9
-        targetSdkVersion 24
+        targetSdkVersion targetSdk
         versionCode 1
         versionName "1.0"
     }
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile "com.android.support:appcompat-v7:${support_library_version}"
 
     compile project(':easypermissions')
 }

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'
@@ -21,3 +21,22 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+ext {
+    projectName = 'EasyPermissions'
+    projectDesc = 'A wrapper library for basic Android M system permissions logic'
+
+    githubUrl = 'https://github.com/googlesamples/easypermissions'
+
+    mavenGroup = 'pub.devrel'
+    mavenArtifactId = 'easypermissions'
+    mavenVersion = '0.2.1'
+
+    bintrayOrg = 'easygoogle'
+
+    support_library_version = '25.0.0'
+
+    buildTools = '25.0.0'
+    compileSdk = 25
+    targetSdk = 25
+}

easypermissions/bintray.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.jfrog.bintray'
-apply from: 'constants.gradle'
 
 group = mavenGroup
 version = mavenVersion

easypermissions/build.gradle

@@ -1,15 +1,14 @@
 apply plugin: 'com.android.library'
-apply from: 'constants.gradle'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion compileSdk
+    buildToolsVersion buildTools
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 24
+        targetSdkVersion targetSdk
         versionCode 1
-        versionName "$mavenVersion"
+        versionName mavenVersion
     }
 
     buildTypes {
@@ -25,7 +24,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile "com.android.support:appcompat-v7:${support_library_version}"
 }
 
 apply from: 'maven.gradle'

easypermissions/constants.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.github.dcendents.android-maven'
-apply from: 'constants.gradle'
 
 install {
     repositories.mavenInstaller {

easypermissions/maven.gradle

@@ -11,6 +11,7 @@
 # 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=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle.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-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip