Skip to content

Commit

Permalink
Update to Android Studio 2.2 (#5)
Browse files Browse the repository at this point in the history
* Update plugins for Android Studio 2.2

Remove unnecessary buildscript part from some files since the root build.gradle already add those dependencies
Remove hugo from the library
Use latest Gradle - build performance improvement

* Update Android related versions

* Remove empty line
  • Loading branch information
tsuharesu authored and pilgr committed Sep 21, 2016
1 parent 1471f24 commit 745f597
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 30 deletions.
13 changes: 4 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,20 @@ apply plugin: 'com.jakewharton.hugo'
buildscript {
repositories {
jcenter()
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap-1.1"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
}
}

android {
compileSdkVersion 23
buildToolsVersion "24.0.1"
compileSdkVersion 24
buildToolsVersion "24.0.2"

defaultConfig {
applicationId "co.metalab.asyncawait"
minSdkVersion 15
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
Expand All @@ -42,7 +37,7 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.2.0'
compile 'com.android.support:appcompat-v7:24.2.1'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile project(':asyncawait')
compile 'com.squareup.retrofit2:retrofit:2.1.0'
Expand Down
21 changes: 3 additions & 18 deletions asyncawait/build.gradle
Original file line number Diff line number Diff line change
@@ -1,28 +1,13 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

buildscript {
repositories {
jcenter()
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap-1.1"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
}
}

android {
compileSdkVersion 23
buildToolsVersion "24.0.1"
compileSdkVersion 24
buildToolsVersion "24.0.2"

defaultConfig {
minSdkVersion 15
//noinspection OldTargetApi
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "1"
}
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip

0 comments on commit 745f597

Please sign in to comment.