Skip to content

Commit

Permalink
Build-tools 19.1.0 gradle-plugin 0.11
Browse files Browse the repository at this point in the history
  • Loading branch information
survivingwithandroid committed Jun 17, 2014
1 parent f0f0402 commit 3abf59d
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 13 deletions.
4 changes: 2 additions & 2 deletions OkHttpClient/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apply plugin: 'android-library'

android {
compileSdkVersion 19
buildToolsVersion '19.0.3'
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 9
Expand Down
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.9.+'
classpath 'com.android.tools.build:gradle:0.11.+'

}
}
Expand All @@ -23,4 +23,10 @@ allprojects {
}
}

ext {
compileSdkVersion = 19
buildToolsVersion = "19.1.0"
}


apply plugin: 'android-reporting'
2 changes: 1 addition & 1 deletion demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'android'

android {
compileSdkVersion 19
buildToolsVersion '19.0.3'
buildToolsVersion '19.1.0'
defaultConfig {
minSdkVersion 11
targetSdkVersion 19
Expand Down
2 changes: 1 addition & 1 deletion demo15/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'android'

android {
compileSdkVersion 19
buildToolsVersion '19.0.3'
buildToolsVersion '19.1.0'

defaultConfig {
minSdkVersion 11
Expand Down
4 changes: 2 additions & 2 deletions lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
apply plugin: 'android-library'

android {
compileSdkVersion 19
buildToolsVersion '19.0.3'
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 9
Expand Down
12 changes: 9 additions & 3 deletions maven_push.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,13 @@ afterEvaluate { project ->
}

task androidJavadocs(type: Javadoc) {
source = android.sourceSets.main.allJava
classpath += project.files(android.plugin.getRuntimeJarList().join(File.pathSeparator))
//source = android.sourceSets.main.allJava
options {
linksOffline "http://d.android.com/reference", "${android.sdkDirectory}/docs/reference"
}
source = android.sourceSets.main.java.sourceFiles
//classpath += project.files(android.plugin.getRuntimeJarList().join(File.pathSeparator))
classpath += project.files(project.android.getBootClasspath().join(File.pathSeparator))
}

task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
Expand All @@ -84,7 +89,8 @@ afterEvaluate { project ->
task androidSourcesJar(type: Jar) {
classifier = 'sources'
//basename = artifact_id
from android.sourceSets.main.allSource
//from android.sourceSets.main.allSource
from android.sourceSets.main.java.sourceFiles
}

artifacts {
Expand Down
6 changes: 3 additions & 3 deletions volleyclient/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'android-library'

android {
compileSdkVersion 19
buildToolsVersion '19.0.3'
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
minSdkVersion 9
targetSdkVersion 19
versionCode 1
versionName '1.0'
versionName '1.5'
}
buildTypes {
release {
Expand Down

0 comments on commit 3abf59d

Please sign in to comment.