提交 7df4f7ac 编写于 作者: R Robert Papp 提交者: Sam Judd

Make .gradle files a little more uniform with 'strings'

上级 3947c741
...@@ -3,7 +3,7 @@ buildscript { ...@@ -3,7 +3,7 @@ buildscript {
jcenter() jcenter()
// TODO: remove this when robolectric 2.4 is released. // TODO: remove this when robolectric 2.4 is released.
maven { maven {
url "https://oss.sonatype.org/content/repositories/snapshots" url 'https://oss.sonatype.org/content/repositories/snapshots'
} }
} }
...@@ -18,7 +18,7 @@ subprojects { project -> ...@@ -18,7 +18,7 @@ subprojects { project ->
jcenter() jcenter()
// TODO: remove this when robolectric 2.4 is released. // TODO: remove this when robolectric 2.4 is released.
maven { maven {
url "https://oss.sonatype.org/content/repositories/snapshots" url 'https://oss.sonatype.org/content/repositories/snapshots'
} }
} }
...@@ -47,4 +47,3 @@ subprojects { project -> ...@@ -47,4 +47,3 @@ subprojects { project ->
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '1.12' gradleVersion = '1.12'
} }
apply plugin: 'java' apply plugin: 'java'
evaluationDependsOn(":third_party:gif_decoder") evaluationDependsOn(':third_party:gif_decoder')
evaluationDependsOn(":third_party:disklrucache") evaluationDependsOn(':third_party:disklrucache')
evaluationDependsOn(":library") evaluationDependsOn(':library')
def getAndroidSdkDirectory() { def getAndroidSdkDirectory() {
project(":library").android.sdkDirectory project(':library').android.sdkDirectory
} }
def getAndroidCompileSdkVersion() { def getAndroidCompileSdkVersion() {
project(":library").android.compileSdkVersion project(':library').android.compileSdkVersion
} }
def getInternalAndroidProjects() { def getInternalAndroidProjects() {
...@@ -24,7 +24,7 @@ def getAllInternalProjects() { ...@@ -24,7 +24,7 @@ def getAllInternalProjects() {
} }
def getReleaseVariantAndroidProjects() { def getReleaseVariantAndroidProjects() {
getAndroidLibraryVariants("release") getAndroidLibraryVariants('release')
} }
def getAndroidLibraryVariants(variantName) { def getAndroidLibraryVariants(variantName) {
...@@ -45,7 +45,7 @@ def getAndroidJar() { ...@@ -45,7 +45,7 @@ def getAndroidJar() {
} }
// Generate javadocs and sources containing batched documentation and sources for all internal projects. // Generate javadocs and sources containing batched documentation and sources for all internal projects.
["release", "debug"].each { variantName -> ['release', 'debug'].each { variantName ->
task("${variantName}SourceJar", type: Jar) { task("${variantName}SourceJar", type: Jar) {
classifier = 'sources' classifier = 'sources'
......
...@@ -10,4 +10,4 @@ subprojects { ...@@ -10,4 +10,4 @@ subprojects {
jarTask.dependsOn variant.javaCompile jarTask.dependsOn variant.javaCompile
artifacts.add('archives', jarTask); artifacts.add('archives', jarTask);
} }
} }
\ No newline at end of file
...@@ -12,16 +12,15 @@ dependencies { ...@@ -12,16 +12,15 @@ dependencies {
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion "19.1.0" buildToolsVersion '19.1.0'
defaultConfig { defaultConfig {
applicationId "com.bumptech.glide.integration.okhttp" applicationId 'com.bumptech.glide.integration.okhttp'
minSdkVersion 10 minSdkVersion 10
targetSdkVersion 19 targetSdkVersion 19
versionCode 1 versionCode 1
versionName "1.0.0" versionName '1.0.0'
} }
} }
apply from: "$rootProject.projectDir/scripts/upload.gradle" apply from: "$rootProject.projectDir/scripts/upload.gradle"
...@@ -12,14 +12,14 @@ dependencies { ...@@ -12,14 +12,14 @@ dependencies {
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion = '19.1.0' buildToolsVersion '19.1.0'
defaultConfig { defaultConfig {
applicationId "com.bumptech.glide.integration.volley" applicationId 'com.bumptech.glide.integration.volley'
minSdkVersion 10 minSdkVersion 10
targetSdkVersion 19 targetSdkVersion 19
versionCode 1 versionCode 1
versionName "1.0.0" versionName '1.0.0'
} }
} }
......
...@@ -14,10 +14,10 @@ dependencies { ...@@ -14,10 +14,10 @@ dependencies {
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion = '19.1.0' buildToolsVersion '19.1.0'
defaultConfig { defaultConfig {
applicationId "com.bumptech.glide" applicationId 'com.bumptech.glide'
minSdkVersion 10 minSdkVersion 10
targetSdkVersion 19 targetSdkVersion 19
versionCode = VERSION_CODE versionCode = VERSION_CODE
......
...@@ -9,13 +9,13 @@ dependencies { ...@@ -9,13 +9,13 @@ dependencies {
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion = '19.1.0' buildToolsVersion '19.1.0'
defaultConfig { defaultConfig {
applicationId "com.bumptech.glide.samples.flickr" applicationId 'com.bumptech.glide.samples.flickr'
minSdkVersion 10 minSdkVersion 10
targetSdkVersion 19 targetSdkVersion 19
versionCode 1 versionCode 1
versionName "1.0.0" versionName '1.0.0'
} }
} }
...@@ -7,14 +7,14 @@ dependencies { ...@@ -7,14 +7,14 @@ dependencies {
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion "19.1.0" buildToolsVersion '19.1.0'
defaultConfig { defaultConfig {
applicationId "com.bumptech.glide.samples.giphy" applicationId 'com.bumptech.glide.samples.giphy'
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 19 targetSdkVersion 19
versionCode 1 versionCode 1
versionName "1.0.0" versionName '1.0.0'
} }
} }
...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' ...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion = '19.1.0' buildToolsVersion '19.1.0'
defaultConfig { defaultConfig {
applicationId 'com.bumptech.glide.gifdecoder' applicationId 'com.bumptech.glide.gifdecoder'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册