Ktlint upgrade lint fix #1242
Merged
Ktlint upgrade lint fix #1242
Conversation
This file contains 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
rt4914
reviewed
Jun 4, 2020
rt4914
approved these changes
Jun 4, 2020
8 tasks
Sarthak2601
pushed a commit
that referenced
this pull request
Jun 5, 2020
* Fixed new ktlint errors * Fixed data module lint errors with new ktlint * Add memory param to JAVA_TOOL_OPTIONS * Add gradle options as well * Remove java_tool_options * Reduce test threads and increase ram of docker * Fix docker image issue * Removed large resource class since its not available for our plan * Remove test fork config from gradle files and added it to the test command * Attempt to build the app before running tests * Build the app without any daemon/worker restrictions * Test a new setup job on circleci * Change indentation of config * Fix setup * Fix ktlint installation * Revert android dependencies * Fix unterminated string issue * Add workspace attachment * Fix workspace path * Fix setup path * Separate linters from the android dependencies * Fix cache restore issue * Split non flaky tests into module wise test jobs * Set heap size in app tests * Fixed wrong repo * Testing changing java version' * Add the command instead of an orb * Update java home path * Fix java home path * Add java 11 installation to every job for verification * Remove JDK 11 and enable build caching * Reduce size for each daemon * Remove splash tests from the non flaky app tests
Sarthak2601
added a commit
that referenced
this pull request
Jun 12, 2020
* config file * dummy data * fake string * Ktlint upgrade lint fix (#1242) * Fixed new ktlint errors * Fixed data module lint errors with new ktlint * Add memory param to JAVA_TOOL_OPTIONS * Add gradle options as well * Remove java_tool_options * Reduce test threads and increase ram of docker * Fix docker image issue * Removed large resource class since its not available for our plan * Remove test fork config from gradle files and added it to the test command * Attempt to build the app before running tests * Build the app without any daemon/worker restrictions * Test a new setup job on circleci * Change indentation of config * Fix setup * Fix ktlint installation * Revert android dependencies * Fix unterminated string issue * Add workspace attachment * Fix workspace path * Fix setup path * Separate linters from the android dependencies * Fix cache restore issue * Split non flaky tests into module wise test jobs * Set heap size in app tests * Fixed wrong repo * Testing changing java version' * Add the command instead of an orb * Update java home path * Fix java home path * Add java 11 installation to every job for verification * Remove JDK 11 and enable build caching * Reduce size for each daemon * Remove splash tests from the non flaky app tests * Fixes #1084: Tablet: Highfi Onboarding Flow (landscape) (#1115) * -Onboarding: draft implementation for tablet-landscape high-fi * -Removed the unused drawable file -Used `app:layout_constraintDimensionRatio="H, 10:9"` and `android:scaleType="fitXY"` instead of `guideline` and `android:scaleType="centerCrop"` -Centered the `textViews` between the `imageView` and the end of the `parentLayout` and gave them a fixed width of `360dp` instead of placing the `textViews` relative to the end of the `parentLayout` only * -placed the textViews and the buttons relative to the end of the screen (with a margin of 96dp) and a guideline of 57% from the beginning of the screen instead of using fixed width of 360dp * -Deleted "onboarding_dot_active.xml" with "sw600dp-land" qualifier -Removed the unnecessary "FrameLayout" in "onboarding_fragment.xml" -Removed the "guidelines" in "onboarding_slide.xml" and "onboarding_slide_final.xml" and replaced them with margins and fixed widths -Updated the "oppiaOnboardingDivider" in "colors.xml" and used it in the "onboarding_fragment.xml" * -Updated the UI * -Added EOF in "booleans.xml" * -Updated the ratio of the thumbnail images to be "40:39" * -Changed the height of the "Get Started" button to be "wrap_content" (minHeight is set to 48dp) * Fixes #1216 : Deleted Extra Proto Models (#1232) * Remove Extra Proto Models * try gradle changes * try circle ci changes * remove testing changes[skip CI] * Fixes #1064 : Added DropDropSortInput Module (#1092) * Add DropDropSortInput Module along with HasElementXwithPositionY Classifier * Fixes #1221 : Added HasElementXBeforeElementY Classifier Rule [Blocked: #1092] (#1231) * Add DragDropSortInputHasElementXBeforeElementYClassifierProvider * dummy * dev project config file * nit Co-authored-by: Vinita Murthi <murthi.vinita@gmail.com> Co-authored-by: Mohamed Medhat <abomed7at55@gmail.com> Co-authored-by: Pulkit Aggarwal <aggarwalpulkit596@gmail.com>
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.
Explanation
The new Ktlint (version 0.37) is expecting imports to be formatted alphabetically but it will group java and javax imports together.
So you would have normal imports (alphabetically), then imports starting with java (alphabetically), and then imports starting with javax (alphabetically). Right now our linters are failing because we did it alphabetically without any grouping. Creating this PR to demonstrate what the new change would be and get your thoughts on whether we should go forward with
this?
Checklist