Skip to content

Commit

Permalink
Merge pull request #289 from Privado-Inc/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
pandurangpatil authored Jan 23, 2023
2 parents 3b2bfc3 + a227d5d commit 2de5d14
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 10 deletions.
18 changes: 13 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@ Steps to step up the project
- git checkout -b <new local feature branch that you are going to work on.> - This will create a new local feature branch
- git push -u push origin <new remote feature branch keep the name same as local branch> - This will set up remote branch synced with your local branch.
Steps to integrate the pre-commit hook on local machine.
Steps to integrate the pre-commit hook on local machine.
1. Install the pre-commit app (https://pre-commit.com/#install)
For MacOS using Homebrew, please use
For MacOS using Homebrew, please use
- brew install pre-commit
2. Run the install command to have the script in .git/hooks for pre-commit
- pre-commit install
Steps to follow while your work is in progress over a local branch.
- Whenever you are done with small logical units, commit the code to your local branch as well as push the changes to
- Whenever you are done with small logical units, commit the code to your local branch as well as push the changes to
the respective remote feature branches.
- Also make sure to take the latest updates from the dev branch from time to time. This is to make sure your feature branch is not
- Also make sure to take the latest updates from the dev branch from time to time. This is to make sure your feature branch is not
diverging a lot from the dev branch.
- Once you are done with the changes push your final changes to your feature remote branch and raise a pull request against
the "dev" branch. Assign two reviewers to review your changes (Note: don't directly merge your request to the dev branch.)
IDE Setup.
IDE Setup.
- rm -rf .bsp/ .idea/
- find . -type d -name target | xargs rm -rf
- sbt compile Test/compile shell
Expand All @@ -54,6 +54,14 @@ If facing issues related to imports not working try
- File -> invalidate caches - Invalidate and restart
```

### IntelliJ IDEA Caveats
In some cases IntelliJ IDEA may import some libraries that the project does not use. Keeping this library may cause exceptions at runtime. One of these libraries is `javaparser-core-3.2.5`. Find it in **External Libraries** folder in your project. Right click on it to open it in library settings:

![image](./screenshots/java_lib_rm1.png)

When this library is opened in settings, right click on it again, click on the delete button. Then apply the changes and continue with your work.

![image](./screenshots/java_lib_rm2.png)

## License
Privado OSS is distributed under the GNU LESSER GENERAL PUBLIC LICENSE (LGPL 3.0). This application may only be used in compliance with the License. In lieu of applicable law or written agreement, software distributed under the License is distributed "AS IS", VOID OF ALL WARRANTIES OR CONDITIONS. For specific details regarding permissions and restrictions, see [COPYING](/COPYING) and [COPYING.LESSER](/COPYING.LESSER).
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ ThisBuild / scalaVersion := "2.13.7"
ThisBuild / version := sys.env.getOrElse("BUILD_VERSION", "dev-SNAPSHOT")
// parsed by project/Versions.scala, updated by updateDependencies.sh

val cpgVersion = "1.3.563"
val joernVersion = "1.1.1146"
val overflowdbVersion = "1.148"
val cpgVersion = "1.3.585"
val joernVersion = "1.1.1359"
val overflowdbVersion = "1.160"

//External dependency versions
val circeVersion = "0.14.1"
Expand Down
Binary file added screenshots/java_lib_rm1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/java_lib_rm2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ class JavaIdentiferTaggingTest extends JavaTaggingTestBase {

override def beforeAll(): Unit = {
super.beforeAll()
val identifierTagger = new IdentifierTagger(cpg)
identifierTagger.setRuleAndApply(sources.head)
new IdentifierTagger(cpg).createAndApply()
}

override val javaFileContents =
Expand Down

0 comments on commit 2de5d14

Please sign in to comment.