Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get --add-source working for dirs in Gradle builds #2156

Merged
merged 3 commits into from
Apr 29, 2020

Conversation

kollivier
Copy link
Contributor

I had trouble making the file patterns work using include (no errors, but files didn't get included). However, this approach works for specifying source directories, which was our use case. Figured I'd post what we have now and see if anyone knows how to fix the patterns case, or knows if that case is used often?

@inclement
Copy link
Member

I've previously tried this and had the same problems with getting patterns working, although I never tried the case without them so it's great to see that works.

Would you mind adding a warning during the templating, notifying the user that their pattern will be ignored (if they passed one)? But other than that, I'm very happy to merge.

@kollivier
Copy link
Contributor Author

Good call, thanks! Just added a warning, would this work?

@inclement
Copy link
Member

@kollivier Looks good, fixed a couple of typos, will merge when the tests pass.

@inclement inclement merged commit 36825d7 into kivy:develop Apr 29, 2020
@inclement
Copy link
Member

Thanks again!

brvier pushed a commit to brvier/python-for-android that referenced this pull request May 6, 2020
* Switch to using Gradle srcDir props for extra source dirs.

* Add warning about only supporting source dir includes with gradle.

* Fixed typos in gradle source directory warning

Co-authored-by: Alexander Taylor <alexanderjohntaylor@gmail.com>
lerela added a commit to chronolife-rd/python-for-android that referenced this pull request Jun 23, 2020
🔖 v2020.06.02

* Adds missing requests sub dependencies (kivy#2221)
* Bumps to Gradle 6.4.1 (kivy#2222)
* Bumps to Cython==0.29.19 (kivy#2220)
* Updates install and troubleshooting docs (kivy#2219)
* Bumps to Ubuntu 20.04 (kivy#2218)
* Attempt to improve the issue template (kivy#2217)
* Add `opencv_extras` recipe (kivy#2209)
* Split logic for build modes & debug symbols (kivy#2213)
* Troubleshoot SSL error (kivy#2205)
* Remove superfluous recipes fixes (kivy#2202)
* Add tests for hostpython3 recipe (kivy#2196)
* Fix for 'cannot find setuptools module' (kivy#2195)
* Rename `Hostpython3Recipe` class to camel case (kivy#2194)
* Fix `test_should_build` (kivy#2193)
* Add initial tests for python3 recipe (kivy#2192)
* PythonActivityUtil helper for unpacking data (kivy#2189)
* Fixes flake8 errors post update (kivy#2191)
* Share PythonUtil.java between bootstraps (kivy#2188)
* Java code linting using PMD 6.23.0 (kivy#2187)
* Deletes deprecated renpy Python{Activity,Service}.java (kivy#2186)
* Removes java concurrency/ folder (kivy#2185)
* Reuse common AssetExtract.java (kivy#2182)
* Use common Hardware.java (kivy#2183)
* Moves kamranzafar/ java directory to common/ (kivy#2184)
* Updates release documentation (kivy#2177)
* Fixes service only unittest loading (kivy#2181)
* Narrows some context manager scopes (kivy#2179)
* Downgrades to SDL2 2.0.9 (kivy#2180)
* Bump to SDL2 2.0.10 & extract .java from SDL2 tarball (kivy#2113)
* Adds pygame recipe (kivy#2164)
* Adds macOS install instructions (2165)
* Removed python2 support mention from README (kivy#2162)
* Adding more assets (kivy#2132)
* Get --add-source working for dirs in Gradle builds (kivy#2156)
* Fixes python build with macOS venv (kivy#2159)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants