From 29d12b79ca7dbb3ca0bf46fbae887cacfc3b117a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sat, 18 Nov 2017 22:17:18 +0100 Subject: [PATCH] API as java module (#34) --- .circleci/config.yml | 43 +++- .idea/gradle.xml | 1 + LICENSE | 201 ++++++++++++++++++ README.md | 1 + api/build.gradle | 84 ++++++++ .../java/io/github/wulkanowy/api/Api.java | 0 .../java/io/github/wulkanowy/api/Cookies.java | 0 .../io/github/wulkanowy/api/Semester.java | 0 .../wulkanowy/api/StudentAndParent.java | 0 .../java/io/github/wulkanowy/api/Vulcan.java | 0 .../api/attendance/AttendanceStatistics.java | 0 .../api/attendance/AttendanceTable.java | 0 .../github/wulkanowy/api/attendance/Day.java | 0 .../wulkanowy/api/attendance/Lesson.java | 0 .../wulkanowy/api/attendance/Month.java | 0 .../wulkanowy/api/attendance/Subject.java | 0 .../github/wulkanowy/api/attendance/Type.java | 0 .../wulkanowy/api/attendance/Types.java | 0 .../github/wulkanowy/api/attendance/Week.java | 0 .../io/github/wulkanowy/api/exams/Day.java | 0 .../io/github/wulkanowy/api/exams/Exam.java | 0 .../github/wulkanowy/api/exams/ExamsWeek.java | 0 .../io/github/wulkanowy/api/exams/Week.java | 0 .../io/github/wulkanowy/api/grades/Grade.java | 0 .../wulkanowy/api/grades/GradesList.java | 0 .../github/wulkanowy/api/grades/Subject.java | 0 .../wulkanowy/api/grades/SubjectsList.java | 0 .../api/login/AccountPermissionException.java | 0 .../api/login/BadCredentialsException.java | 0 .../io/github/wulkanowy/api/login/Login.java | 0 .../api/login/LoginErrorException.java | 0 .../api/login/NotLoggedInErrorException.java | 0 .../wulkanowy/api/notes/AchievementsList.java | 0 .../io/github/wulkanowy/api/notes/Note.java | 0 .../github/wulkanowy/api/notes/NotesList.java | 0 .../wulkanowy/api/school/SchoolData.java | 0 .../wulkanowy/api/school/SchoolInfo.java | 0 .../github/wulkanowy/api/school/Subject.java | 0 .../wulkanowy/api/school/TeachersData.java | 0 .../wulkanowy/api/school/TeachersInfo.java | 0 .../github/wulkanowy/api/timetable/Day.java | 0 .../wulkanowy/api/timetable/Lesson.java | 0 .../wulkanowy/api/timetable/Timetable.java | 0 .../github/wulkanowy/api/timetable/Week.java | 0 .../wulkanowy/api/user/AddressData.java | 0 .../wulkanowy/api/user/BasicInformation.java | 0 .../wulkanowy/api/user/ContactDetails.java | 0 .../wulkanowy/api/user/FamilyInformation.java | 0 .../wulkanowy/api/user/FamilyMember.java | 0 .../wulkanowy/api/user/PersonalData.java | 0 .../github/wulkanowy/api/FixtureHelper.java | 0 .../wulkanowy/api/StudentAndParentTest.java | 0 .../api/StudentAndParentTestCase.java | 0 .../io/github/wulkanowy/api/VulcanTest.java | 0 .../attendance/AttendanceStatisticsTest.java | 0 .../api/attendance/AttendanceTableTest.java | 0 .../wulkanowy/api/exams/ExamsWeekTest.java | 0 .../wulkanowy/api/grades/GradesListTest.java | 0 .../api/grades/SubjectsListTest.java | 0 .../github/wulkanowy/api/login/LoginTest.java | 0 .../api/notes/AchievementsListTest.java | 0 .../wulkanowy/api/notes/NotesListTest.java | 0 .../wulkanowy/api/school/SchoolInfoTest.java | 0 .../api/school/TeachersInfoTest.java | 0 .../api/timetable/TimetableTest.java | 0 .../api/user/BasicInformationTest.java | 0 .../api/user/FamilyInformationTest.java | 0 .../api/OcenyWszystkie-semester.html | 0 .../io/github/wulkanowy/api/Start.html | 0 .../api/attendance/Frekwencja-excellent.html | 0 .../api/attendance/Frekwencja-full.html | 0 .../api/exams/Sprawdziany-one-per-day.html | 0 .../api/grades/OcenyWszystkie-filled.html | 0 .../OcenyWszystkie-subjects-average.html | 0 .../api/grades/OcenyWszystkie-subjects.html | 0 .../api/login/Logowanie-brak-dostepu.html | 0 .../api/login/Logowanie-certyfikat.html | 0 .../wulkanowy/api/login/Logowanie-error.html | 0 .../api/login/Logowanie-success.html | 0 .../io/github/wulkanowy/api/login/cert.xml | 0 .../api/notes/UwagiOsiagniecia-empty.html | 0 .../api/notes/UwagiOsiagniecia-filled.html | 0 .../github/wulkanowy/api/school/Szkola.html | 0 .../api/timetable/PlanLekcji-full.html | 0 .../api/timetable/PlanLekcji-holidays.html | 0 .../api/timetable/PlanLekcji-std.html | 0 .../api/user/UczenDanePodstawowe.html | 0 app/build.gradle | 50 ++--- build.gradle | 4 +- settings.gradle | 2 +- 90 files changed, 352 insertions(+), 34 deletions(-) create mode 100644 LICENSE create mode 100644 api/build.gradle rename {app => api}/src/main/java/io/github/wulkanowy/api/Api.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/Cookies.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/Semester.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/StudentAndParent.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/Vulcan.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/attendance/AttendanceStatistics.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/attendance/AttendanceTable.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/attendance/Day.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/attendance/Lesson.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/attendance/Month.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/attendance/Subject.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/attendance/Type.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/attendance/Types.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/attendance/Week.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/exams/Day.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/exams/Exam.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/exams/Week.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/grades/Grade.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/grades/GradesList.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/grades/Subject.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/grades/SubjectsList.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/login/AccountPermissionException.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/login/BadCredentialsException.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/login/Login.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/login/LoginErrorException.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/login/NotLoggedInErrorException.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/notes/AchievementsList.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/notes/Note.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/notes/NotesList.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/school/SchoolData.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/school/SchoolInfo.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/school/Subject.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/school/TeachersData.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/school/TeachersInfo.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/timetable/Day.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/timetable/Lesson.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/timetable/Week.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/user/AddressData.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/user/BasicInformation.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/user/ContactDetails.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/user/FamilyInformation.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/user/FamilyMember.java (100%) rename {app => api}/src/main/java/io/github/wulkanowy/api/user/PersonalData.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/FixtureHelper.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/StudentAndParentTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/StudentAndParentTestCase.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/VulcanTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/attendance/AttendanceStatisticsTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/attendance/AttendanceTableTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/grades/SubjectsListTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/login/LoginTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/notes/AchievementsListTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/notes/NotesListTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/school/SchoolInfoTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/school/TeachersInfoTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/user/BasicInformationTest.java (100%) rename {app => api}/src/test/java/io/github/wulkanowy/api/user/FamilyInformationTest.java (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/OcenyWszystkie-semester.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/Start.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-excellent.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-full.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/exams/Sprawdziany-one-per-day.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-subjects-average.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-subjects.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/login/Logowanie-brak-dostepu.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/login/Logowanie-certyfikat.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/login/Logowanie-error.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/login/Logowanie-success.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/login/cert.xml (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/notes/UwagiOsiagniecia-empty.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/notes/UwagiOsiagniecia-filled.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/school/Szkola.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-holidays.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-std.html (100%) rename {app => api}/src/test/resources/io/github/wulkanowy/api/user/UczenDanePodstawowe.html (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index dca6107f..557f0680 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,23 +61,23 @@ jobs: - store_test_results: path: ./app/build/reports/ - test: + app-test: <<: *container_config steps: - *attach_workspace - restore_cache: <<: *general_cache_key - run: - name: Run Tests - command: ./gradlew --no-daemon --stacktrace test + name: Run app tests + command: ./gradlew --no-daemon --stacktrace :app:test - run: name: Upload unit code coverage to codecov command: | - ./gradlew --no-daemon --stacktrace jacocoTestReport - bash <(curl -s https://codecov.io/bash) -F unit + ./gradlew --no-daemon --stacktrace :app:jacocoTestReport + bash <(curl -s https://codecov.io/bash) -F app - run: name: Upload code coverage to codacy - command: ./gradlew --no-daemon --stacktrace codacyUpload + command: ./gradlew --no-daemon --stacktrace :app:codacyUpload - store_artifacts: path: ./app/build/reports/tests/ destination: tests_reports/ @@ -87,6 +87,32 @@ jobs: - store_test_results: path: ./app/build/test-results + api-test: + <<: *container_config + steps: + - *attach_workspace + - restore_cache: + <<: *general_cache_key + - run: + name: Run api tests + command: ./gradlew --no-daemon --stacktrace :api:test + - run: + name: Upload unit code coverage to codecov + command: | + ./gradlew --no-daemon --stacktrace :api:jacocoTestReport + bash <(curl -s https://codecov.io/bash) -F api + - run: + name: Upload code coverage to codacy + command: ./gradlew --no-daemon --stacktrace :api:codacyUpload + - store_artifacts: + path: ./api/build/reports/tests/ + destination: tests_reports/ + - store_artifacts: + path: ./api/build/reports/jacoco/test/ + destination: coverage_reports/ + - store_test_results: + path: ./api/build/test-results + instrumented: <<: *container_config steps: @@ -133,7 +159,10 @@ workflows: - lint: requires: - build - - test: + - app-test: + requires: + - build + - api-test: requires: - build - instrumented: diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c77..48777522 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -8,6 +8,7 @@ diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..f48b2114 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2017 wulkanowy + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index ea71e4b0..adff0821 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ [![Dependency Status](https://www.versioneye.com/user/projects/5969ff0b0fb24f004f8c711b/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/5969ff0b0fb24f004f8c711b) [![CircleCI](https://img.shields.io/circleci/project/github/wulkanowy/wulkanowy.svg?style=flat-square)](https://circleci.com/gh/wulkanowy/wulkanowy) [![Build Status](https://www.bitrise.io/app/daeff1893f3c8128.svg?token=Hjm1ACamk86JDeVVJHOeqQ&branch=master)](https://www.bitrise.io/app/daeff1893f3c8128) +[![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/) [Pobierz wersję rozwojową](https://bitrise-redirector.herokuapp.com/v0.1/apps/daeff1893f3c8128/builds/master/artifacts/app-debug.apk) diff --git a/api/build.gradle b/api/build.gradle new file mode 100644 index 00000000..f2bc66f4 --- /dev/null +++ b/api/build.gradle @@ -0,0 +1,84 @@ +apply plugin: 'java-library' +apply plugin: 'jacoco' +apply plugin: "io.github.ddimtirov.codacy" +apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.github.dcendents.android-maven' + +sourceCompatibility = "1.7" +targetCompatibility = "1.7" + +ext { + PUBLISH_GROUP_ID = 'io.github.wulkanowy' + PUBLISH_ARTIFACT_ID = 'api' + PUBLISH_VERSION = '0.1.0' +} + +test { + testLogging { + events "passed", "skipped", "failed", "standardOut", "standardError" + outputs.upToDateWhen {false} + showStandardStreams = true + } +} + +dependencies { + implementation 'org.jsoup:jsoup:1.10.3' + implementation 'org.apache.commons:commons-lang3:3.6' + + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-core:2.11.0' +} + +def siteUrl = 'https://github.com/wulkanowy/wulkanowy' +def gitUrl = 'https://github.com/wulkanowy/wulkanowy.git' + + +bintray { + user = System.getenv('BINTRAY_USER') + key = System.getenv('BINTRAY_KEY') + configurations = ['archives'] + pkg { + repo = 'wulkanowy' + name = 'api' + userOrg = 'wulkanowy' + licenses = ['Apache-2.0'] + vcsUrl = gitUrl + labels = ['aar', 'android', 'wulkanowy', 'api'] + publicDownloadNumbers = true + + version { + name = '0.1.0' + released = new Date() + } + } +} + +install { + repositories.mavenInstaller { + pom { + project { + packaging 'aar' + name 'Bintray publish Gradle aar' + url siteUrl + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + developers { + developer { + id 'mklkj' + name 'Mikołaj Pich' + email 'm.pich@outlook.com' + } + } + scm { + connection gitUrl + developerConnection gitUrl + url siteUrl + } + } + } + } +} diff --git a/app/src/main/java/io/github/wulkanowy/api/Api.java b/api/src/main/java/io/github/wulkanowy/api/Api.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/Api.java rename to api/src/main/java/io/github/wulkanowy/api/Api.java diff --git a/app/src/main/java/io/github/wulkanowy/api/Cookies.java b/api/src/main/java/io/github/wulkanowy/api/Cookies.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/Cookies.java rename to api/src/main/java/io/github/wulkanowy/api/Cookies.java diff --git a/app/src/main/java/io/github/wulkanowy/api/Semester.java b/api/src/main/java/io/github/wulkanowy/api/Semester.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/Semester.java rename to api/src/main/java/io/github/wulkanowy/api/Semester.java diff --git a/app/src/main/java/io/github/wulkanowy/api/StudentAndParent.java b/api/src/main/java/io/github/wulkanowy/api/StudentAndParent.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/StudentAndParent.java rename to api/src/main/java/io/github/wulkanowy/api/StudentAndParent.java diff --git a/app/src/main/java/io/github/wulkanowy/api/Vulcan.java b/api/src/main/java/io/github/wulkanowy/api/Vulcan.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/Vulcan.java rename to api/src/main/java/io/github/wulkanowy/api/Vulcan.java diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/AttendanceStatistics.java b/api/src/main/java/io/github/wulkanowy/api/attendance/AttendanceStatistics.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/attendance/AttendanceStatistics.java rename to api/src/main/java/io/github/wulkanowy/api/attendance/AttendanceStatistics.java diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/AttendanceTable.java b/api/src/main/java/io/github/wulkanowy/api/attendance/AttendanceTable.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/attendance/AttendanceTable.java rename to api/src/main/java/io/github/wulkanowy/api/attendance/AttendanceTable.java diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Day.java b/api/src/main/java/io/github/wulkanowy/api/attendance/Day.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/attendance/Day.java rename to api/src/main/java/io/github/wulkanowy/api/attendance/Day.java diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Lesson.java b/api/src/main/java/io/github/wulkanowy/api/attendance/Lesson.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/attendance/Lesson.java rename to api/src/main/java/io/github/wulkanowy/api/attendance/Lesson.java diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Month.java b/api/src/main/java/io/github/wulkanowy/api/attendance/Month.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/attendance/Month.java rename to api/src/main/java/io/github/wulkanowy/api/attendance/Month.java diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Subject.java b/api/src/main/java/io/github/wulkanowy/api/attendance/Subject.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/attendance/Subject.java rename to api/src/main/java/io/github/wulkanowy/api/attendance/Subject.java diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Type.java b/api/src/main/java/io/github/wulkanowy/api/attendance/Type.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/attendance/Type.java rename to api/src/main/java/io/github/wulkanowy/api/attendance/Type.java diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Types.java b/api/src/main/java/io/github/wulkanowy/api/attendance/Types.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/attendance/Types.java rename to api/src/main/java/io/github/wulkanowy/api/attendance/Types.java diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Week.java b/api/src/main/java/io/github/wulkanowy/api/attendance/Week.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/attendance/Week.java rename to api/src/main/java/io/github/wulkanowy/api/attendance/Week.java diff --git a/app/src/main/java/io/github/wulkanowy/api/exams/Day.java b/api/src/main/java/io/github/wulkanowy/api/exams/Day.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/exams/Day.java rename to api/src/main/java/io/github/wulkanowy/api/exams/Day.java diff --git a/app/src/main/java/io/github/wulkanowy/api/exams/Exam.java b/api/src/main/java/io/github/wulkanowy/api/exams/Exam.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/exams/Exam.java rename to api/src/main/java/io/github/wulkanowy/api/exams/Exam.java diff --git a/app/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java b/api/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java rename to api/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java diff --git a/app/src/main/java/io/github/wulkanowy/api/exams/Week.java b/api/src/main/java/io/github/wulkanowy/api/exams/Week.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/exams/Week.java rename to api/src/main/java/io/github/wulkanowy/api/exams/Week.java diff --git a/app/src/main/java/io/github/wulkanowy/api/grades/Grade.java b/api/src/main/java/io/github/wulkanowy/api/grades/Grade.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/grades/Grade.java rename to api/src/main/java/io/github/wulkanowy/api/grades/Grade.java diff --git a/app/src/main/java/io/github/wulkanowy/api/grades/GradesList.java b/api/src/main/java/io/github/wulkanowy/api/grades/GradesList.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/grades/GradesList.java rename to api/src/main/java/io/github/wulkanowy/api/grades/GradesList.java diff --git a/app/src/main/java/io/github/wulkanowy/api/grades/Subject.java b/api/src/main/java/io/github/wulkanowy/api/grades/Subject.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/grades/Subject.java rename to api/src/main/java/io/github/wulkanowy/api/grades/Subject.java diff --git a/app/src/main/java/io/github/wulkanowy/api/grades/SubjectsList.java b/api/src/main/java/io/github/wulkanowy/api/grades/SubjectsList.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/grades/SubjectsList.java rename to api/src/main/java/io/github/wulkanowy/api/grades/SubjectsList.java diff --git a/app/src/main/java/io/github/wulkanowy/api/login/AccountPermissionException.java b/api/src/main/java/io/github/wulkanowy/api/login/AccountPermissionException.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/login/AccountPermissionException.java rename to api/src/main/java/io/github/wulkanowy/api/login/AccountPermissionException.java diff --git a/app/src/main/java/io/github/wulkanowy/api/login/BadCredentialsException.java b/api/src/main/java/io/github/wulkanowy/api/login/BadCredentialsException.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/login/BadCredentialsException.java rename to api/src/main/java/io/github/wulkanowy/api/login/BadCredentialsException.java diff --git a/app/src/main/java/io/github/wulkanowy/api/login/Login.java b/api/src/main/java/io/github/wulkanowy/api/login/Login.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/login/Login.java rename to api/src/main/java/io/github/wulkanowy/api/login/Login.java diff --git a/app/src/main/java/io/github/wulkanowy/api/login/LoginErrorException.java b/api/src/main/java/io/github/wulkanowy/api/login/LoginErrorException.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/login/LoginErrorException.java rename to api/src/main/java/io/github/wulkanowy/api/login/LoginErrorException.java diff --git a/app/src/main/java/io/github/wulkanowy/api/login/NotLoggedInErrorException.java b/api/src/main/java/io/github/wulkanowy/api/login/NotLoggedInErrorException.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/login/NotLoggedInErrorException.java rename to api/src/main/java/io/github/wulkanowy/api/login/NotLoggedInErrorException.java diff --git a/app/src/main/java/io/github/wulkanowy/api/notes/AchievementsList.java b/api/src/main/java/io/github/wulkanowy/api/notes/AchievementsList.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/notes/AchievementsList.java rename to api/src/main/java/io/github/wulkanowy/api/notes/AchievementsList.java diff --git a/app/src/main/java/io/github/wulkanowy/api/notes/Note.java b/api/src/main/java/io/github/wulkanowy/api/notes/Note.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/notes/Note.java rename to api/src/main/java/io/github/wulkanowy/api/notes/Note.java diff --git a/app/src/main/java/io/github/wulkanowy/api/notes/NotesList.java b/api/src/main/java/io/github/wulkanowy/api/notes/NotesList.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/notes/NotesList.java rename to api/src/main/java/io/github/wulkanowy/api/notes/NotesList.java diff --git a/app/src/main/java/io/github/wulkanowy/api/school/SchoolData.java b/api/src/main/java/io/github/wulkanowy/api/school/SchoolData.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/school/SchoolData.java rename to api/src/main/java/io/github/wulkanowy/api/school/SchoolData.java diff --git a/app/src/main/java/io/github/wulkanowy/api/school/SchoolInfo.java b/api/src/main/java/io/github/wulkanowy/api/school/SchoolInfo.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/school/SchoolInfo.java rename to api/src/main/java/io/github/wulkanowy/api/school/SchoolInfo.java diff --git a/app/src/main/java/io/github/wulkanowy/api/school/Subject.java b/api/src/main/java/io/github/wulkanowy/api/school/Subject.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/school/Subject.java rename to api/src/main/java/io/github/wulkanowy/api/school/Subject.java diff --git a/app/src/main/java/io/github/wulkanowy/api/school/TeachersData.java b/api/src/main/java/io/github/wulkanowy/api/school/TeachersData.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/school/TeachersData.java rename to api/src/main/java/io/github/wulkanowy/api/school/TeachersData.java diff --git a/app/src/main/java/io/github/wulkanowy/api/school/TeachersInfo.java b/api/src/main/java/io/github/wulkanowy/api/school/TeachersInfo.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/school/TeachersInfo.java rename to api/src/main/java/io/github/wulkanowy/api/school/TeachersInfo.java diff --git a/app/src/main/java/io/github/wulkanowy/api/timetable/Day.java b/api/src/main/java/io/github/wulkanowy/api/timetable/Day.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/timetable/Day.java rename to api/src/main/java/io/github/wulkanowy/api/timetable/Day.java diff --git a/app/src/main/java/io/github/wulkanowy/api/timetable/Lesson.java b/api/src/main/java/io/github/wulkanowy/api/timetable/Lesson.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/timetable/Lesson.java rename to api/src/main/java/io/github/wulkanowy/api/timetable/Lesson.java diff --git a/app/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java b/api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java rename to api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java diff --git a/app/src/main/java/io/github/wulkanowy/api/timetable/Week.java b/api/src/main/java/io/github/wulkanowy/api/timetable/Week.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/timetable/Week.java rename to api/src/main/java/io/github/wulkanowy/api/timetable/Week.java diff --git a/app/src/main/java/io/github/wulkanowy/api/user/AddressData.java b/api/src/main/java/io/github/wulkanowy/api/user/AddressData.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/user/AddressData.java rename to api/src/main/java/io/github/wulkanowy/api/user/AddressData.java diff --git a/app/src/main/java/io/github/wulkanowy/api/user/BasicInformation.java b/api/src/main/java/io/github/wulkanowy/api/user/BasicInformation.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/user/BasicInformation.java rename to api/src/main/java/io/github/wulkanowy/api/user/BasicInformation.java diff --git a/app/src/main/java/io/github/wulkanowy/api/user/ContactDetails.java b/api/src/main/java/io/github/wulkanowy/api/user/ContactDetails.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/user/ContactDetails.java rename to api/src/main/java/io/github/wulkanowy/api/user/ContactDetails.java diff --git a/app/src/main/java/io/github/wulkanowy/api/user/FamilyInformation.java b/api/src/main/java/io/github/wulkanowy/api/user/FamilyInformation.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/user/FamilyInformation.java rename to api/src/main/java/io/github/wulkanowy/api/user/FamilyInformation.java diff --git a/app/src/main/java/io/github/wulkanowy/api/user/FamilyMember.java b/api/src/main/java/io/github/wulkanowy/api/user/FamilyMember.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/user/FamilyMember.java rename to api/src/main/java/io/github/wulkanowy/api/user/FamilyMember.java diff --git a/app/src/main/java/io/github/wulkanowy/api/user/PersonalData.java b/api/src/main/java/io/github/wulkanowy/api/user/PersonalData.java similarity index 100% rename from app/src/main/java/io/github/wulkanowy/api/user/PersonalData.java rename to api/src/main/java/io/github/wulkanowy/api/user/PersonalData.java diff --git a/app/src/test/java/io/github/wulkanowy/api/FixtureHelper.java b/api/src/test/java/io/github/wulkanowy/api/FixtureHelper.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/FixtureHelper.java rename to api/src/test/java/io/github/wulkanowy/api/FixtureHelper.java diff --git a/app/src/test/java/io/github/wulkanowy/api/StudentAndParentTest.java b/api/src/test/java/io/github/wulkanowy/api/StudentAndParentTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/StudentAndParentTest.java rename to api/src/test/java/io/github/wulkanowy/api/StudentAndParentTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/StudentAndParentTestCase.java b/api/src/test/java/io/github/wulkanowy/api/StudentAndParentTestCase.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/StudentAndParentTestCase.java rename to api/src/test/java/io/github/wulkanowy/api/StudentAndParentTestCase.java diff --git a/app/src/test/java/io/github/wulkanowy/api/VulcanTest.java b/api/src/test/java/io/github/wulkanowy/api/VulcanTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/VulcanTest.java rename to api/src/test/java/io/github/wulkanowy/api/VulcanTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/attendance/AttendanceStatisticsTest.java b/api/src/test/java/io/github/wulkanowy/api/attendance/AttendanceStatisticsTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/attendance/AttendanceStatisticsTest.java rename to api/src/test/java/io/github/wulkanowy/api/attendance/AttendanceStatisticsTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/attendance/AttendanceTableTest.java b/api/src/test/java/io/github/wulkanowy/api/attendance/AttendanceTableTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/attendance/AttendanceTableTest.java rename to api/src/test/java/io/github/wulkanowy/api/attendance/AttendanceTableTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java b/api/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java rename to api/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java b/api/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java rename to api/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/grades/SubjectsListTest.java b/api/src/test/java/io/github/wulkanowy/api/grades/SubjectsListTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/grades/SubjectsListTest.java rename to api/src/test/java/io/github/wulkanowy/api/grades/SubjectsListTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/login/LoginTest.java b/api/src/test/java/io/github/wulkanowy/api/login/LoginTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/login/LoginTest.java rename to api/src/test/java/io/github/wulkanowy/api/login/LoginTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/notes/AchievementsListTest.java b/api/src/test/java/io/github/wulkanowy/api/notes/AchievementsListTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/notes/AchievementsListTest.java rename to api/src/test/java/io/github/wulkanowy/api/notes/AchievementsListTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/notes/NotesListTest.java b/api/src/test/java/io/github/wulkanowy/api/notes/NotesListTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/notes/NotesListTest.java rename to api/src/test/java/io/github/wulkanowy/api/notes/NotesListTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/school/SchoolInfoTest.java b/api/src/test/java/io/github/wulkanowy/api/school/SchoolInfoTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/school/SchoolInfoTest.java rename to api/src/test/java/io/github/wulkanowy/api/school/SchoolInfoTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/school/TeachersInfoTest.java b/api/src/test/java/io/github/wulkanowy/api/school/TeachersInfoTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/school/TeachersInfoTest.java rename to api/src/test/java/io/github/wulkanowy/api/school/TeachersInfoTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java b/api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java rename to api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/user/BasicInformationTest.java b/api/src/test/java/io/github/wulkanowy/api/user/BasicInformationTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/user/BasicInformationTest.java rename to api/src/test/java/io/github/wulkanowy/api/user/BasicInformationTest.java diff --git a/app/src/test/java/io/github/wulkanowy/api/user/FamilyInformationTest.java b/api/src/test/java/io/github/wulkanowy/api/user/FamilyInformationTest.java similarity index 100% rename from app/src/test/java/io/github/wulkanowy/api/user/FamilyInformationTest.java rename to api/src/test/java/io/github/wulkanowy/api/user/FamilyInformationTest.java diff --git a/app/src/test/resources/io/github/wulkanowy/api/OcenyWszystkie-semester.html b/api/src/test/resources/io/github/wulkanowy/api/OcenyWszystkie-semester.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/OcenyWszystkie-semester.html rename to api/src/test/resources/io/github/wulkanowy/api/OcenyWszystkie-semester.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/Start.html b/api/src/test/resources/io/github/wulkanowy/api/Start.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/Start.html rename to api/src/test/resources/io/github/wulkanowy/api/Start.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-excellent.html b/api/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-excellent.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-excellent.html rename to api/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-excellent.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-full.html b/api/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-full.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-full.html rename to api/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-full.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/exams/Sprawdziany-one-per-day.html b/api/src/test/resources/io/github/wulkanowy/api/exams/Sprawdziany-one-per-day.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/exams/Sprawdziany-one-per-day.html rename to api/src/test/resources/io/github/wulkanowy/api/exams/Sprawdziany-one-per-day.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html b/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html rename to api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-subjects-average.html b/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-subjects-average.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-subjects-average.html rename to api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-subjects-average.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-subjects.html b/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-subjects.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-subjects.html rename to api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-subjects.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/login/Logowanie-brak-dostepu.html b/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-brak-dostepu.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/login/Logowanie-brak-dostepu.html rename to api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-brak-dostepu.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/login/Logowanie-certyfikat.html b/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-certyfikat.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/login/Logowanie-certyfikat.html rename to api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-certyfikat.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/login/Logowanie-error.html b/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-error.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/login/Logowanie-error.html rename to api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-error.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/login/Logowanie-success.html b/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-success.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/login/Logowanie-success.html rename to api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-success.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/login/cert.xml b/api/src/test/resources/io/github/wulkanowy/api/login/cert.xml similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/login/cert.xml rename to api/src/test/resources/io/github/wulkanowy/api/login/cert.xml diff --git a/app/src/test/resources/io/github/wulkanowy/api/notes/UwagiOsiagniecia-empty.html b/api/src/test/resources/io/github/wulkanowy/api/notes/UwagiOsiagniecia-empty.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/notes/UwagiOsiagniecia-empty.html rename to api/src/test/resources/io/github/wulkanowy/api/notes/UwagiOsiagniecia-empty.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/notes/UwagiOsiagniecia-filled.html b/api/src/test/resources/io/github/wulkanowy/api/notes/UwagiOsiagniecia-filled.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/notes/UwagiOsiagniecia-filled.html rename to api/src/test/resources/io/github/wulkanowy/api/notes/UwagiOsiagniecia-filled.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/school/Szkola.html b/api/src/test/resources/io/github/wulkanowy/api/school/Szkola.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/school/Szkola.html rename to api/src/test/resources/io/github/wulkanowy/api/school/Szkola.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html b/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html rename to api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-holidays.html b/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-holidays.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-holidays.html rename to api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-holidays.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-std.html b/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-std.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-std.html rename to api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-std.html diff --git a/app/src/test/resources/io/github/wulkanowy/api/user/UczenDanePodstawowe.html b/api/src/test/resources/io/github/wulkanowy/api/user/UczenDanePodstawowe.html similarity index 100% rename from app/src/test/resources/io/github/wulkanowy/api/user/UczenDanePodstawowe.html rename to api/src/test/resources/io/github/wulkanowy/api/user/UczenDanePodstawowe.html diff --git a/app/build.gradle b/app/build.gradle index a1ebcdcc..245a4859 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,33 +44,33 @@ greendao { } dependencies { - compile 'com.android.support:appcompat-v7:27.0.1' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.android.support:design:27.0.1' - compile 'com.android.support:support-vector-drawable:27.0.1' - compile 'com.android.support:support-v4:27.0.1' - compile 'com.android.support:recyclerview-v7:27.0.1' - compile 'com.android.support:cardview-v7:27.0.1' - compile 'com.android.support:customtabs:27.0.1' - compile 'com.firebase:firebase-jobdispatcher:0.8.4' - compile 'com.thoughtbot:expandablerecyclerview:1.3' - compile 'org.apache.commons:commons-lang3:3.6' - compile 'org.apache.commons:commons-collections4:4.1' - compile 'org.jsoup:jsoup:1.10.3' - compile 'org.greenrobot:greendao:3.2.2' + implementation project(":api") + implementation 'com.android.support:appcompat-v7:27.0.1' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support:design:27.0.1' + implementation 'com.android.support:support-vector-drawable:27.0.1' + implementation 'com.android.support:support-v4:27.0.1' + implementation 'com.android.support:recyclerview-v7:27.0.1' + implementation 'com.android.support:cardview-v7:27.0.1' + implementation 'com.android.support:customtabs:27.0.1' + implementation 'com.firebase:firebase-jobdispatcher:0.8.4' + implementation 'com.thoughtbot:expandablerecyclerview:1.3' + implementation 'org.apache.commons:commons-lang3:3.6' + implementation 'org.apache.commons:commons-collections4:4.1' + implementation 'org.greenrobot:greendao:3.2.2' - debugCompile 'com.amitshekhar.android:debug-db:1.0.1' - debugCompile 'net.zetetic:android-database-sqlcipher:3.5.7@aar' - - testCompile 'junit:junit:4.12' - testCompile 'org.mockito:mockito-core:2.11.0' + debugImplementation 'com.amitshekhar.android:debug-db:1.0.1' + debugImplementation 'net.zetetic:android-database-sqlcipher:3.5.7@aar' - androidTestCompile('com.android.support.test.espresso:espresso-core:3.0.1', { + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-core:2.11.0' + + androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', { exclude group: 'com.android.support', module: 'support-annotations' }) - androidTestCompile 'com.android.support:support-annotations:27.0.1' - androidTestCompile 'com.android.support.test:runner:1.0.1' - androidTestCompile 'com.android.support.test:rules:1.0.1' - androidTestCompile 'org.hamcrest:hamcrest-library:1.3' - androidTestCompile 'org.mockito:mockito-android:2.11.0' + androidTestImplementation 'com.android.support:support-annotations:27.0.1' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test:rules:1.0.1' + androidTestImplementation 'org.hamcrest:hamcrest-library:1.3' + androidTestImplementation 'org.mockito:mockito-android:2.11.0' } diff --git a/build.gradle b/build.gradle index 2f4cb604..d2ca2958 100644 --- a/build.gradle +++ b/build.gradle @@ -13,8 +13,10 @@ buildscript { // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files - classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1' + classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2' classpath "gradle.plugin.io.github.ddimtirov:codacy-gradle-plugin:0.1.0" + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' } } diff --git a/settings.gradle b/settings.gradle index e7b4def4..d55cd778 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app' +include ':app', ':api'