github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-11 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (gradle java 6 & PluginManager race fix)

Browse Source
This commit is contained in:
Andrew Grieve
2014-11-26 11:47:24 -05:00
parent 9d3c13065b 7fbb2b195f
commit e597f98c62
4 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/templates/cordova/lib/plugin-build.gradle
+2 -2
View File
@@ -40,8 +40,8 @@ android {
publishNonDefault true
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
}
sourceSets {
bin/templates/project/build.gradle
+2 -2
View File
@@ -87,8 +87,8 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
}
if (System.env.RELEASE_SIGNING_PROPERTIES_FILE) {