提交 2a77dcba 编写于 作者: R Robert Papp

Fix trivial IDEA gradle warnings

上级 46126e00
......@@ -66,16 +66,16 @@ def getAndroidJar() {
exclude '**/BuildConfig.java'
exclude '**/R.java'
}
} as Javadoc
def cleanJavadocTask = task("clean${variantName.capitalize()}Javadoc", type: Delete) {
delete javadocTask.destinationDir
}
} as Task
clean.dependsOn(cleanJavadocTask)
def javadocJarTask = task("${variantName}JavadocJar", type: Jar) {
from javadocTask.destinationDir
}
} as Task
javadocJarTask.dependsOn(javadocTask)
}
......@@ -91,7 +91,7 @@ jar {
}
getAllInternalProjects().each { project ->
jar.dependsOn(project.build)
jar.dependsOn(project.tasks.build)
}
artifacts {
......
......@@ -26,6 +26,7 @@ COVERALLS_GRADLE_VERSION=2.0.1
JUNIT_VERSION=4.11
MOCKITO_VERSION=1.9.5
ROBOLECTRIC_VERSION=2.4
# TODO: increase this to 2.0.+ when we compile with Java 7.
MOCKWEBSERVER_VERSION=1.6.0
TRUTH_VERSION=0.24
......
evaluationDependsOnChildren()
import com.android.build.gradle.api.BaseVariant
subprojects {
android.libraryVariants.all { variant ->
android.libraryVariants.all { BaseVariant variant ->
def jarTask = project.tasks.create(name: "jar${variant.name.capitalize()}", type: Jar) {
from variant.javaCompile.destinationDir
exclude "**/R.class"
......
......@@ -12,14 +12,14 @@ dependencies {
android {
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION
buildToolsVersion BUILD_TOOLS_VERSION as String
defaultConfig {
minSdkVersion MIN_SDK_VERSION as int
targetSdkVersion TARGET_SDK_VERSION as int
versionCode = VERSION_CODE
versionName = VERSION_NAME
versionCode VERSION_CODE as int
versionName VERSION_NAME as String
}
}
......
......@@ -14,20 +14,19 @@ dependencies {
androidTestCompile "junit:junit:${JUNIT_VERSION}"
androidTestCompile "org.mockito:mockito-all:${MOCKITO_VERSION}"
androidTestCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
// TODO: increase this to 2.0.+ when we compile against Java 7.
androidTestCompile "com.squareup.okhttp:mockwebserver:${MOCKWEBSERVER_VERSION}"
}
android {
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION
buildToolsVersion BUILD_TOOLS_VERSION as String
defaultConfig {
minSdkVersion MIN_SDK_VERSION as int
targetSdkVersion TARGET_SDK_VERSION as int
versionCode = VERSION_CODE
versionName = VERSION_NAME
versionCode VERSION_CODE as int
versionName VERSION_NAME as String
}
}
......
......@@ -35,14 +35,14 @@ dependencies {
android {
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION
buildToolsVersion BUILD_TOOLS_VERSION as String
defaultConfig {
minSdkVersion MIN_SDK_VERSION as int
targetSdkVersion TARGET_SDK_VERSION as int
versionCode = VERSION_CODE as int
versionName = VERSION_NAME
versionCode VERSION_CODE as int
versionName VERSION_NAME as String
}
buildTypes {
......
......@@ -9,7 +9,7 @@ dependencies {
android {
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION
buildToolsVersion BUILD_TOOLS_VERSION as String
defaultConfig {
applicationId 'com.bumptech.glide.samples.flickr'
......
......@@ -7,7 +7,7 @@ dependencies {
android {
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION
buildToolsVersion BUILD_TOOLS_VERSION as String
defaultConfig {
applicationId 'com.bumptech.glide.samples.giphy'
......
......@@ -6,7 +6,7 @@ repositories {
android {
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION
buildToolsVersion BUILD_TOOLS_VERSION as String
defaultConfig {
applicationId 'com.bumptech.svgsample.app'
......
......@@ -65,10 +65,10 @@ afterEvaluate { project ->
}
pom.project {
name POM_NAME
packaging POM_PACKAGING
description POM_DESCRIPTION
url POM_URL
name = POM_NAME
packaging = POM_PACKAGING
description = POM_DESCRIPTION
url = POM_URL
scm {
url POM_SCM_URL
......@@ -78,22 +78,22 @@ afterEvaluate { project ->
licenses {
license {
name "Simplified BSD License"
url "http://www.opensource.org/licenses/bsd-license"
name = "Simplified BSD License"
url = "http://www.opensource.org/licenses/bsd-license"
distribution = "repo"
}
license {
name "The Apache Software License, Version 2.0"
url "http://www.apache.org/licenses/LICENSE-2.0.txt"
name = "The Apache Software License, Version 2.0"
url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
distribution = "repo"
}
}
developers {
developer {
id POM_DEVELOPER_ID
name POM_DEVELOPER_NAME
email POM_DEVELOPER_EMAIL
id = POM_DEVELOPER_ID
name = POM_DEVELOPER_NAME
email = POM_DEVELOPER_EMAIL
}
}
}
......
......@@ -12,7 +12,7 @@ dependencies {
android {
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION
buildToolsVersion BUILD_TOOLS_VERSION as String
defaultConfig {
minSdkVersion MIN_SDK_VERSION as int
......
......@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION
buildToolsVersion BUILD_TOOLS_VERSION as String
defaultConfig {
minSdkVersion MIN_SDK_VERSION as int
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册