Skip to content

Commit

Permalink
Merge pull request #99 from sergey-pokrovskyi/master
Browse files Browse the repository at this point in the history
support lib, target sdk and gradle update to latest version
  • Loading branch information
GIGAMOLE authored Jun 1, 2017
2 parents ff20de7 + 5a35719 commit 5bdb44b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 25
buildToolsVersion "25.0.3"

defaultConfig {
applicationId "devlight.io.navigationtabbar"
minSdkVersion 11
targetSdkVersion 23
targetSdkVersion 25
versionCode 1
versionName "1.0"
}
Expand All @@ -28,7 +28,7 @@ dependencies {
compile project(':navigationtabbar')
// compile 'com.github.devlight.navigationtabbar:navigationtabbar:1.2.3'

compile 'com.android.support:appcompat-v7:23.2.1'
compile 'com.android.support:design:23.2.1'
compile 'com.android.support:support-v4:23.2.1'
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'
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
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.1.3'
classpath 'com.android.tools.build:gradle:2.3.2'
}
}

Expand Down
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 @@
#Wed Sep 14 21:51:46 EEST 2016
#Thu Jun 01 22:46:13 EEST 2017
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.3-all.zip
8 changes: 4 additions & 4 deletions navigationtabbar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ apply plugin: 'maven'
version = "1.2.5"

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 25
buildToolsVersion "25.0.3"

defaultConfig {
minSdkVersion 11
targetSdkVersion 23
targetSdkVersion 25
versionCode 1
versionName "1.2.5"
}
Expand All @@ -42,7 +42,7 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
//noinspection GradleDependency
compile 'com.android.support:design:23.2.1'
compile 'com.android.support:design:25.3.1'
}

def siteUrl = 'https://github.com/DevLight-Mobile-Agency/NavigationTabBar'
Expand Down

0 comments on commit 5bdb44b

Please sign in to comment.