Skip to content

Commit 40b6e3e

Browse files
committed
Merge pull request #6 from studyplus/update-environment
Update versions of gradle, plugin, and build-tool
2 parents 8e101bc + 2247ad9 commit 40b6e3e

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

SDKExample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'android'
22

33
android {
44
compileSdkVersion 18
5-
buildToolsVersion "19.0.1"
5+
buildToolsVersion "19.0.3"
66

77
defaultConfig {
88
minSdkVersion 8

StudyplusAndroidSDK/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'android-test'
44

55
android {
66
compileSdkVersion 19
7-
buildToolsVersion "19.0.1"
7+
buildToolsVersion "19.0.3"
88

99
defaultConfig {
1010
minSdkVersion 8

StudyplusAndroidSDK/gradle/build.values.gradle

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,18 @@ def apiEndpoint = {
1616
}
1717

1818
android{
19-
def quote = { '"' + it + '"' }
20-
release {
21-
buildConfigField "String", "API_ENDPOINT", quote(apiEndpoint())
22-
}
23-
/**
24-
* CAUTION: this debug `buildConfigField` does NOT work!
25-
* rf. https://code.google.com/p/android/issues/detail?id=52962
26-
*/
27-
debug {
28-
buildConfigField "String", "API_ENDPOINT", quote(project.properties.debugApiEndpoint)
19+
buildTypes {
20+
def quote = { '"' + it + '"' }
21+
22+
release {
23+
buildConfigField "String", "API_ENDPOINT", quote(apiEndpoint())
24+
}
25+
/**
26+
* CAUTION: this debug `buildConfigField` does NOT work!
27+
* rf. https://code.google.com/p/android/issues/detail?id=52962
28+
*/
29+
debug {
30+
buildConfigField "String", "API_ENDPOINT", quote(project.properties.debugApiEndpoint)
31+
}
2932
}
3033
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:0.8.3'
10+
classpath 'com.android.tools.build:gradle:0.9.1'
1111
classpath 'com.squareup.gradle:gradle-android-test-plugin:0.9.1-SNAPSHOT'
1212
}
1313
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip

0 commit comments

Comments
 (0)