Skip to content

Commit

Permalink
upgrade gradle and sdk version
Browse files Browse the repository at this point in the history
  • Loading branch information
medyo committed Mar 12, 2018
1 parent 5aa0c19 commit 138725d
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
9 changes: 4 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 27

defaultConfig {
applicationId "mehdi.sakout.aboutpage.sample"
minSdkVersion 10
targetSdkVersion 25
minSdkVersion 15
targetSdkVersion 27
versionCode 13
versionName "1.2"
}
Expand All @@ -22,7 +21,7 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:appcompat-v7:27.1.0'

compile project(':library')
}
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
}
Expand All @@ -14,6 +15,7 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
maven {
url 'https://dl.bintray.com/medyo/maven/'
}
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 @@
#Sun Jan 15 22:33:16 CET 2017
#Mon Mar 12 15:05:39 WET 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.1-all.zip
13 changes: 6 additions & 7 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 27

defaultConfig {
minSdkVersion 10
targetSdkVersion 25
versionCode 14
versionName "1.2.2"
minSdkVersion 15
targetSdkVersion 27
versionCode 15
versionName "1.2.3"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
Expand All @@ -30,7 +29,7 @@ tasks.withType(Javadoc) {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:appcompat-v7:27.1.0'
}

archivesBaseName = 'android-about-page'
Expand Down

0 comments on commit 138725d

Please sign in to comment.