Skip to content

Commit

Permalink
updated build tools, and downgrade minsdk to 14
Browse files Browse the repository at this point in the history
  • Loading branch information
yesidlazaro committed Feb 1, 2017
1 parent 3ff2dd0 commit 5d0eefe
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 75 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.2"

defaultConfig {
applicationId "com.layer_net.stepindicatorexample"
minSdkVersion 15
targetSdkVersion 23
minSdkVersion 14
targetSdkVersion 25
versionCode 1
versionName "1.0"
}
Expand All @@ -22,7 +22,7 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
// testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:design:23.1.1'
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:design:25.1.0'
compile project(':step-indicator')
}
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public Fragment getItem(int position) {
@Override
public int getCount() {
// Show 3 total pages.
return 6;
return 2 ;
}

@Override
Expand Down
34 changes: 1 addition & 33 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,12 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.android.tools.build:gradle:2.2.3'
}
}

apply plugin: 'com.jfrog.bintray'

allprojects {
repositories {
jcenter()
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}

Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

bintray {
user = properties.getProperty("bintray.user")
key = properties.getProperty("bintray.apikey")
pkg {
repo = 'maven'
name = 'step-indicator'
userOrg = user
licenses = ['Apache-2.0']
vcsUrl = 'https://github.com/layerlre/StepIndicator.git'
version {
name = '1.0.0'
desc = 'Step Indicator 1.0.0'
vcsTag = '1.0.0'
attributes = ['gradle-plugin': 'com.use.less:com.use.less.gradle:gradle-useless-plugin']
}
}
}

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 Oct 21 11:34:03 PDT 2015
#Wed Feb 01 18:10:45 COT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
38 changes: 5 additions & 33 deletions step-indicator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,15 @@ group = 'com.layer-net'
version = '1.0.0'

apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'

ext {
bintrayRepo = 'maven'
bintrayName = 'step-indicator'

publishedGroupId = 'com.layer-net'
libraryName = 'step-indicator'
artifact = 'step-indicator'

libraryDescription = 'StepsIndicator widget compatible with the ViewPager on Android'

siteUrl = 'https://github.com/layerlre/StepIndicator'
gitUrl = 'https://github.com/layerlre/StepIndicator.git'

libraryVersion = '1.0.0'

developerId = 'layerlre'
developerName = 'Suthachad Wichai'
developerEmail = 'layerlre@gmail.com'

licenseName = 'The Apache Software License, Version 2.0'
licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
allLicenses = ["Apache-2.0"]
}

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

defaultConfig {
minSdkVersion 15
targetSdkVersion 23
minSdkVersion 14
targetSdkVersion 25
versionCode 1
versionName "1.0"
}
Expand All @@ -48,8 +23,5 @@ android {
}

dependencies {
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:appcompat-v7:25.1.0'
}

apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'

0 comments on commit 5d0eefe

Please sign in to comment.