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

Code style improvements #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Code style improvements #41

wants to merge 1 commit into from

Conversation

f2rf2r
Copy link
Member

@f2rf2r f2rf2r commented Jul 12, 2019

This contains a number of changes regarding code style:

  • The Intrepid code style is now checked into version control
  • All files are reformatted using the updated style
  • Add ktlint to do basic style check, it will be run as part of prCheck
  • Add editorConfig to automatically add/enforce line feed at end of file

Currently, having the idea folder partially checked in while using kotlin dsl for the top level build.gradle causes the project to not import correctly in Android Studio 3.4, it should be fixed in 3.5. gradle/kotlin-dsl-samples#1166

This contains a number of changes regarding code style:
- The Intrepid code style is now checked into version control
- All files are reformatted using the updated style
- Add ktlint to do basic style check, it will be run as part of prCheck
- Add editorConfig to automatically add/enforce line feed at end of file
Copy link
Contributor

@mpeng3 mpeng3 left a comment

Choose a reason for hiding this comment

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

This looks fine to me, but I would ask - if we can't use it with the latest fully released version of Android Studio due to the bug that you mentioned, perhaps we should hold off merging this in until Android Studio 3.5 is released? What do other people think about this?

@f2rf2r
Copy link
Member Author

f2rf2r commented Jul 15, 2019

yeah I'm holding off on merging this until 3.5 is released and verified to work correctly

@@ -84,7 +85,11 @@ android {
}
}

//https://github.com/mockk/mockk/issues/281
ktlint {
version.set("0.33.0")
Copy link

Choose a reason for hiding this comment

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

version 34.2 is out

@@ -15,6 +15,7 @@ buildscript {
classpath("com.squareup.spoon:spoon-runner:2.0.0-SNAPSHOT") // TODO update/remove this once spoon 2.0.0 is stable
classpath("io.fabric.tools:gradle:1.26.1")
classpath("gradle.plugin.io.intrepid:static-analysis:1.2.2")
classpath("org.jlleitschuh.gradle:ktlint-gradle:8.0.0")
Copy link

Choose a reason for hiding this comment

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

9.0.0 is available

Copy link

@shadow7 shadow7 left a comment

Choose a reason for hiding this comment

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

Looks like the bug blocking this was resolved. Just denoted a couple dependencies that have been upgraded in that time

@f2rf2r
Copy link
Member Author

f2rf2r commented Oct 11, 2019

I tested this with 3.5 and Android Studio is still having problem importing the project have .idea folder partially checked in while using kts

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.

3 participants