[GitHub] cordova-android pull request #323: Changes for Cordova-Android 6.0.0 - Andro...
Github user asfgit closed the pull request at: https://github.com/apache/cordova-android/pull/323 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request #323: Changes for Cordova-Android 6.0.0 - Andro...
GitHub user infil00p reopened a pull request: https://github.com/apache/cordova-android/pull/323 Changes for Cordova-Android 6.0.0 - Android Modules as Plugins Redoing this branch as gradle_respect, where we don't nuke the gradle files of AARs, Library Projects and other things that have gradle files. This should resolve a lot of irritating errors, but slows down plugin installation with file checks. :/ We do need a better solution to this, but it would require a refactor of how we do builds. You can merge this pull request into a Git repository by running: $ git pull https://github.com/infil00p/cordova-android gradle_respect Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-android/pull/323.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #323 commit 076d8c79f5396d7ba45caf691c07ef81dfcadc28 Author: Joe Bowser Date: 2016-06-07T23:06:40Z Fix to deal with custom frameworks with their own Gradle configuration commit 35400c3545f2f9192dfbe83d2682ba51cee0db1f Author: Joe Bowser Date: 2016-06-10T19:34:16Z The GradleBuidler can tell the difference between a Cordova Plugin Framework and a regular framework based on the name commit c3fd641540f21d65f95d870ec8ddd80ac5bf6dcd Author: Joe Bowser Date: 2016-06-29T17:48:37Z Plugin build script for dependencies without a gradle file commit d71e0eddaaf7a62b2afadf0ad7d894058b3bf0bc Author: Joe Bowser Date: 2016-07-18T22:12:47Z Reading files to check for CordovaLib dependency, if so, we exclude CordovaLib to be safe commit de4adfb146c16ffe4fa9dd1db7c7cf98ba1ea4be Author: Joe Bowser Date: 2016-08-05T18:39:09Z Thwarted again by LINT. commit b84202a27e5cb124548f373f45208add57b4049a Author: Joe Bowser Date: 2016-08-05T21:17:10Z JSHint is causing us to waste time getting this in, and I fdeel that this is a bit less readable, but as long as it makes our tools happy, here it is. commit 889339a2e251020df29aa048b741f584f6c3d670 Author: Joe Bowser Date: 2016-08-10T22:29:24Z Fixing syncronous file check and future-proofing the JS for Travis --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request #323: Changes for Cordova-Android 6.0.0 - Andro...
Github user infil00p closed the pull request at: https://github.com/apache/cordova-android/pull/323 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request #323: Changes for Cordova-Android 6.0.0 - Andro...
Github user infil00p commented on a diff in the pull request:
https://github.com/apache/cordova-android/pull/323#discussion_r75396631
--- Diff: bin/templates/cordova/lib/builders/GradleBuilder.js ---
@@ -93,10 +102,24 @@ GradleBuilder.prototype.prepBuildFiles = function() {
// Update dependencies within build.gradle.
var buildGradle = fs.readFileSync(path.join(this.root,
'build.gradle'), 'utf8');
var depsList = '';
+var root = this.root;
+var insertExclude = function(p) {
+ var gradlePath = path.join(root, p, 'build.gradle');
+ var projectGradleFile = fs.readFileSync(gradlePath, 'utf-8');
+ if(projectGradleFile.indexOf('CordovaLib') != -1) {
--- End diff --
It should be safe to add the exclude, since CordovaLib itself will be
included in the project. We require this exclusion because if you make plugins
modules, you have to include the CordovaLib file somehow for Android Studio to
work properly. In the near future, we should just use the AAR and not have to
deal with this slower solution. However, it's good to have this just in case.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request #323: Changes for Cordova-Android 6.0.0 - Andro...
Github user infil00p commented on a diff in the pull request:
https://github.com/apache/cordova-android/pull/323#discussion_r75396391
--- Diff: bin/templates/cordova/lib/plugin-build.gradle ---
@@ -21,24 +21,15 @@
buildscript {
repositories {
mavenCentral()
+jcenter()
}
// Switch the Android Gradle plugin version requirement depending on
the
// installed version of Gradle. This dependency is documented at
//
http://tools.android.com/tech-docs/new-build-system/version-compatibility
// and https://issues.apache.org/jira/browse/CB-8143
-if (gradle.gradleVersion >= "2.2") {
-dependencies {
-classpath 'com.android.tools.build:gradle:1.0.0+'
-}
-} else if (gradle.gradleVersion >= "2.1") {
-dependencies {
-classpath 'com.android.tools.build:gradle:0.14.0+'
-}
-} else {
-dependencies {
-classpath 'com.android.tools.build:gradle:0.12.0+'
-}
+dependencies {
+classpath 'com.android.tools.build:gradle:1.0.0+'
--- End diff --
You're correct about the switching logic being removed and it not being
required. The information in CB-8143 is obsolete, and we already did this in
the main gradle file. We should be using the latest gradle tools and keeping
up to date with the stable Android Studio updates, which updates extremely
often, and usually updates automatically.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request #323: Changes for Cordova-Android 6.0.0 - Andro...
Github user tony-- commented on a diff in the pull request:
https://github.com/apache/cordova-android/pull/323#discussion_r75392931
--- Diff: bin/templates/cordova/lib/builders/GradleBuilder.js ---
@@ -93,10 +102,24 @@ GradleBuilder.prototype.prepBuildFiles = function() {
// Update dependencies within build.gradle.
var buildGradle = fs.readFileSync(path.join(this.root,
'build.gradle'), 'utf8');
var depsList = '';
+var root = this.root;
+var insertExclude = function(p) {
+ var gradlePath = path.join(root, p, 'build.gradle');
+ var projectGradleFile = fs.readFileSync(gradlePath, 'utf-8');
+ if(projectGradleFile.indexOf('CordovaLib') != -1) {
--- End diff --
What if there is a reference to MyCordovaLib or CordovaLib appears in a
comment?
Will it be safe to add the exclude if there is not really a reference to
CordovaLib?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request #323: Changes for Cordova-Android 6.0.0 - Andro...
Github user tony-- commented on a diff in the pull request:
https://github.com/apache/cordova-android/pull/323#discussion_r75389738
--- Diff: bin/templates/cordova/lib/plugin-build.gradle ---
@@ -21,24 +21,15 @@
buildscript {
repositories {
mavenCentral()
+jcenter()
}
// Switch the Android Gradle plugin version requirement depending on
the
// installed version of Gradle. This dependency is documented at
//
http://tools.android.com/tech-docs/new-build-system/version-compatibility
// and https://issues.apache.org/jira/browse/CB-8143
-if (gradle.gradleVersion >= "2.2") {
-dependencies {
-classpath 'com.android.tools.build:gradle:1.0.0+'
-}
-} else if (gradle.gradleVersion >= "2.1") {
-dependencies {
-classpath 'com.android.tools.build:gradle:0.14.0+'
-}
-} else {
-dependencies {
-classpath 'com.android.tools.build:gradle:0.12.0+'
-}
+dependencies {
+classpath 'com.android.tools.build:gradle:1.0.0+'
--- End diff --
I'm not very familiar with gradle compatibility issues, but it appears that
this change removes backwards compatibility. I'm guessing anything <1.0.0 is
deprecated/EOL and no switching logic is required anymore.
It seems like the preceding comment should be updated or removed since
there is no more switching logic and the information in CB-8143 is obsolete? I
don't know enough to update the comment appropriately, sorry.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request #323: Changes for Cordova-Android 6.0.0 - Andro...
GitHub user infil00p opened a pull request: https://github.com/apache/cordova-android/pull/323 Changes for Cordova-Android 6.0.0 - Android Modules as Plugins Redoing this branch as gradle_respect, where we don't nuke the gradle files of AARs, Library Projects and other things that have gradle files. This should resolve a lot of irritating errors, but slows down plugin installation with file checks. :/ We do need a better solution to this, but it would require a refactor of how we do builds. You can merge this pull request into a Git repository by running: $ git pull https://github.com/infil00p/cordova-android gradle_respect Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-android/pull/323.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #323 commit 076d8c79f5396d7ba45caf691c07ef81dfcadc28 Author: Joe Bowser Date: 2016-06-07T23:06:40Z Fix to deal with custom frameworks with their own Gradle configuration commit 35400c3545f2f9192dfbe83d2682ba51cee0db1f Author: Joe Bowser Date: 2016-06-10T19:34:16Z The GradleBuidler can tell the difference between a Cordova Plugin Framework and a regular framework based on the name commit c3fd641540f21d65f95d870ec8ddd80ac5bf6dcd Author: Joe Bowser Date: 2016-06-29T17:48:37Z Plugin build script for dependencies without a gradle file commit d71e0eddaaf7a62b2afadf0ad7d894058b3bf0bc Author: Joe Bowser Date: 2016-07-18T22:12:47Z Reading files to check for CordovaLib dependency, if so, we exclude CordovaLib to be safe commit de4adfb146c16ffe4fa9dd1db7c7cf98ba1ea4be Author: Joe Bowser Date: 2016-08-05T18:39:09Z Thwarted again by LINT. commit b84202a27e5cb124548f373f45208add57b4049a Author: Joe Bowser Date: 2016-08-05T21:17:10Z JSHint is causing us to waste time getting this in, and I fdeel that this is a bit less readable, but as long as it makes our tools happy, here it is. commit 889339a2e251020df29aa048b741f584f6c3d670 Author: Joe Bowser Date: 2016-08-10T22:29:24Z Fixing syncronous file check and future-proofing the JS for Travis --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
