Merge pull request #122 from arthurmelo88/master

updated android gradle compatibility with 3.1.2
Devlight · Apr 27, 2018 · e534a75 · e534a75
2 parents 5bdb44b 2cc582e
commit e534a75
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13  1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
     compileSdkVersion 27
     buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "devlight.io.navigationtabbar"
-        minSdkVersion 11
-        targetSdkVersion 25
         minSdkVersion 14
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -24,11  24,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':navigationtabbar')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':navigationtabbar')
 //    compile 'com.github.devlight.navigationtabbar:navigationtabbar:1.2.3'
 
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:design:27.1.1'
     implementation 'com.android.support:support-v4:27.1.1'
 }
diff --git a/build.gradle b/build.gradle
@@ -3,16  3,18 @@
 buildscript {
     repositories {
         jcenter()
         google()
     }
     dependencies {
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1"
-        classpath 'com.android.tools.build:gradle:2.3.2'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
         classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
         google()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6  1,6 @@
-#Thu Jun 01 22:46:13 EEST 2017
 #Fri Apr 27 03:13:54 BRT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
 distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/navigationtabbar/build.gradle b/navigationtabbar/build.gradle
@@ -22,12  22,12 @@ apply plugin: 'maven'
 version = "1.2.5"
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
     compileSdkVersion 27
     buildToolsVersion '27.0.3'
 
     defaultConfig {
-        minSdkVersion 11
-        targetSdkVersion 25
         minSdkVersion 14
         targetSdkVersion 27
         versionCode 1
         versionName "1.2.5"
     }
@@ -40,9  40,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     //noinspection GradleDependency
-    compile 'com.android.support:design:25.3.1'
     implementation 'com.android.support:design:27.1.1'
 }
 
 def siteUrl = 'https://github.com/DevLight-Mobile-Agency/NavigationTabBar'