You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2016/03/04 18:53:06 UTC
[1/3] android commit: CB-8976: Accidentally left in the crosswalk
build from when I was experimenting with this file
Repository: cordova-android
Updated Branches:
refs/heads/master fe906dabd -> bad0034e5
CB-8976: Accidentally left in the crosswalk build from when I was experimenting with this file
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/99d5ff73
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/99d5ff73
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/99d5ff73
Branch: refs/heads/master
Commit: 99d5ff7347dd7c886efc8c61537bb8ec5832b5b7
Parents: dc57941
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Mar 3 15:25:19 2016 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri Mar 4 09:53:00 2016 -0800
----------------------------------------------------------------------
bin/templates/project/build.gradle | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/99d5ff73/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index ee9aa19..526a079 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -86,7 +86,6 @@ ext {
}
// PLUGIN GRADLE EXTENSIONS START
-apply from: "cordova-plugin-crosswalk-webview/app-xwalk.gradle"
// PLUGIN GRADLE EXTENSIONS END
def hasBuildExtras = file('build-extras.gradle').exists()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] android commit: CB-8976: I wish there was an easier way to test
gradle stuff then check it in without having to remember to delete imports
Posted by bo...@apache.org.
CB-8976: I wish there was an easier way to test gradle stuff then check it in without having to remember to delete imports
This closes #270
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/bad0034e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/bad0034e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/bad0034e
Branch: refs/heads/master
Commit: bad0034e5dd63da0506d62f6e523f5604ee443bc
Parents: 99d5ff7
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Mar 3 15:27:21 2016 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri Mar 4 09:53:01 2016 -0800
----------------------------------------------------------------------
bin/templates/project/build.gradle | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/bad0034e/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 526a079..fa46e36 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -245,8 +245,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
// SUB-PROJECT DEPENDENCIES START
- debugCompile project(path: "CordovaLib", configuration: "debug")
- releaseCompile project(path: "CordovaLib", configuration: "release")
// SUB-PROJECT DEPENDENCIES END
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] android commit: CB-8976: Removing the auto-version for
non-Crosswalk applications
Posted by bo...@apache.org.
CB-8976: Removing the auto-version for non-Crosswalk applications
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/dc579417
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/dc579417
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/dc579417
Branch: refs/heads/master
Commit: dc579417fe32a5ea1cf466d308fc487902b6036b
Parents: fe906da
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Mar 3 14:18:30 2016 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri Mar 4 09:53:00 2016 -0800
----------------------------------------------------------------------
bin/templates/project/build.gradle | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/dc579417/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 65d5a90..ee9aa19 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -86,6 +86,7 @@ ext {
}
// PLUGIN GRADLE EXTENSIONS START
+apply from: "cordova-plugin-crosswalk-webview/app-xwalk.gradle"
// PLUGIN GRADLE EXTENSIONS END
def hasBuildExtras = file('build-extras.gradle').exists()
@@ -162,7 +163,7 @@ android {
}
defaultConfig {
- versionCode cdvVersionCode ?: Integer.parseInt("" + privateHelpers.extractIntFromManifest("versionCode") + "0")
+ versionCode cdvVersionCode ?: Integer.parseInt("" + privateHelpers.extractIntFromManifest("versionCode"))
applicationId privateHelpers.extractStringFromManifest("package")
if (cdvMinSdkVersion != null) {
@@ -180,13 +181,13 @@ android {
if (Boolean.valueOf(cdvBuildMultipleApks)) {
productFlavors {
armv7 {
- versionCode defaultConfig.versionCode + 2
+ versionCode defaultConfig.versionCode*10 + 2
ndk {
abiFilters "armeabi-v7a", ""
}
}
x86 {
- versionCode defaultConfig.versionCode + 4
+ versionCode defaultConfig.versionCode*10 + 4
ndk {
abiFilters "x86", ""
}
@@ -197,7 +198,12 @@ android {
}
}
}
- } else if (!cdvVersionCode) {
+ }
+ /*
+
+ ELSE NOTHING! DON'T MESS WITH THE VERSION CODE IF YOU DON'T HAVE TO!
+
+ else if (!cdvVersionCode) {
def minSdkVersion = cdvMinSdkVersion ?: privateHelpers.extractIntFromManifest("minSdkVersion")
// Vary versionCode by the two most common API levels:
// 14 is ICS, which is the lowest API level for many apps.
@@ -208,6 +214,7 @@ android {
defaultConfig.versionCode += 8
}
}
+ */
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
@@ -239,6 +246,8 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
// SUB-PROJECT DEPENDENCIES START
+ debugCompile project(path: "CordovaLib", configuration: "debug")
+ releaseCompile project(path: "CordovaLib", configuration: "release")
// SUB-PROJECT DEPENDENCIES END
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org