Restructure gradle files #1612
Merged
Restructure gradle files #1612
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
@damagatchi retest this please. |
Contributor
Author
|
@damagatchi retest this please |
…ilures on jenkins
… test failures on jenkins" This reverts commit 1a2bec2.
amstone326
commented
Jan 4, 2017
| @@ -16,7 +16,6 @@ commcare-odk-test/gen/* | |||
| *.swp | |||
| *.iml | |||
| *.db | |||
Contributor
Author
There was a problem hiding this comment.
I had to remove *.properties and **/.settings/ from .gitignore in order for these 2 files within the unit-tests directory to be properly recognized as having moved: https://github.com/dimagi/commcare-android/blob/master/unit-tests/.settings/org.eclipse.jdt.core.prefs and https://github.com/dimagi/commcare-android/blob/master/unit-tests/resources/robolectric.properties. I'm not sure how they were previously being recognized with these lines in there.
Contributor
Author
|
(fyi that I've now done step 1 above. 2 will wait until we cut the 2.33 release) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Restructuring our gradle setup to conform to the expected format as per: https://developer.android.com/studio/build/index.html. This basically involved moving the majority of the content in our existing top-level build.gradle file into a new build.gradle file at the app/ level.
IMPORTANT -- This structure changes 2 things about the generation of .apks. First, it changes the path at which generated .apks are stored, from
commcare-android/build/outputs/apk/tocommcare-android/app/build/outputs/apk/. Secondly, it changes what the generated .apks themselves are actually called, fromcommcare-android-commcare-release.apktoapp-commcare-release.apk. Once this PR is merged, the following changes will need to be made to account for this:releaseportion of the deploy scripts is run for 2.33, make the same changes for the commcare-andriod-2.33 job (since the deploy script generates the new job by copying the job for the previous version, this step needs to wait until then).