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

Move source sets #1939

Merged
merged 8 commits into from
Apr 10, 2018
Merged

Move source sets #1939

merged 8 commits into from
Apr 10, 2018

Conversation

smillst
Copy link
Member

@smillst smillst commented Apr 5, 2018

  • Move **/src to **/src/main/java/ for all subprojects

  • New sub-project named util which will have two source sets:

    1. main: org.checkerframework.framework.test
    2. taglet: org.checkerframework.taglet.ManualTaglet (which was renamed from
      org.checkerframework.javacutil.dist.ManualTaglet)
  • Framework:
    framework/tests/src/tests => framework/src/test/tests
    framework/tests/src/lubglb => framework/src/test/lubglb
    framework/tests/src/polyall => framework/src/test/polyall
    framework/tests/src/testlib => framework/src/test/testlib

  • Checker:
    checker/tests/src/tests => checker/src/test/tests
    checker/tests/src/testlib => checker/src/test/testlib

  • Third party annotations in new source set:
    checker/tests/src/testannotations => checker/src/testannotations

  • Moved org.checkerframework.framework.util.PluginUtil to org.checkerframework.javacutil.PluginUtil so that it can be used by the test framework in util.

I also updated the Eclipse files to work with this new layout. Also, "blame" on GitHub won't show this commit. For example, https://github.com/smillst/checker-framework/blame/moveSourceSets/checker/src/main/java/org/checkerframework/checker/nullness/AbstractNullnessChecker.java.

Merge with typetools/checker-framework-inference#76.

smillst added 6 commits April 4, 2018 10:53
* Move **/src to **/src/main/java/ for all subprojects

* New sub-project named util which will have two source sets:
1. main: org.checkerframework.framework.test
2. taglet: org.checkerframework.javacutil.dist.ManualTaglet (Should we rename this package to org.checkerframework.util?)

* Framework:
framework/tests/src/tests => framework/src/test/tests
framework/tests/src/lubglb =>  framework/src/test/lubglb
framework/tests/src/polyall =>  framework/src/test/polyall
framework/tests/src/testlib =>  framework/src/test/testlib

* Checker:
checker/tests/src/tests => checker/src/test/tests
checker/tests/src/testlib =>  checker/src/test/testlib

Third party annotations in new source set:
checker/tests/src/testannotations => checker/src/testannotations
@smillst smillst assigned smillst and unassigned wmdietl Apr 10, 2018
@smillst smillst merged commit fd3e31e into typetools:master Apr 10, 2018
@smillst smillst deleted the moveSourceSets branch April 10, 2018 20:15
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