Skip to content

Restructure gradle files #1612

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.

Sign up for GitHub

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

Merged
philomates merged 12 commits into from
Jan 5, 2017
Merged

Restructure gradle files #1612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a9f8cf7
start trying to separate into 2 build.gradle files
amstone326 Dec 21, 2016
1244956
some prgoress
amstone326 Dec 22, 2016
4ef6880
Merge branch 'master' into reconfigure-gradle
amstone326 Jan 4, 2017
84d4630
new structure is working
amstone326 Jan 4, 2017
805d32a
change consumer apps builder script to work with new gradle structure
amstone326 Jan 4, 2017
3aee922
undo change to gradlew
amstone326 Jan 4, 2017
0f7538a
move unit-tests dir into app/
amstone326 Jan 4, 2017
1a2bec2
trying overriding getAppManifest in CommCareTestRunner to fix test fa…
amstone326 Jan 4, 2017
08d34a9
Revert "trying overriding getAppManifest in CommCareTestRunner to fix…
amstone326 Jan 4, 2017
c8ed4bf
change gitignore so that missing test files show up
amstone326 Jan 4, 2017
55ebe43
replace newline
amstone326 Jan 4, 2017
a3902df
fix path to core classes in CommCareTestApplication
amstone326 Jan 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ commcare-odk-test/gen/*
*.swp
*.iml
*.db
Copy link
Contributor Author

@amstone326 amstone326 Jan 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

*.properties
.hg*
.svn*
/app/.cache
Expand All @@ -28,12 +27,11 @@ app/.settings/*
app/app.iml
out/
test-app/test-app.iml
**/.settings/
app/libs/commcare-libraries.jar
app/libs/javarosa-libraries.jar
**/local.properties
.gradle/
build/
**/*~
gradle/
/google-services.json
app/google-services.json
Loading