Skip to content

Commit

Permalink
Merge pull request #377 from Wolfsblvt/develop
Browse files Browse the repository at this point in the history
Merge for release v0.1.2
  • Loading branch information
Wolfsblvt authored Sep 15, 2016
2 parents 8f5aa87 + 092dc64 commit fae2f90
Show file tree
Hide file tree
Showing 85 changed files with 6,655 additions and 1,974 deletions.
10 changes: 4 additions & 6 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src">
<classpathentry excluding="main/resources/" kind="src" output="target/classes" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
29 changes: 29 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Languages
languages:
Java: true

# Ignore files that are not relevant for the check
exclude_paths:
- out/
- target/
- "**/thirdparty/"
- checkstyle.xml

# Enables useful engines
engines:
# Checks for left TODO marks
fixme:
enabled: true
# Another Java code style checking. Testable
pmd:
enabled: true
channel: "beta"
# Java Code Style checking
checkstyle:
enabled: true
channel: "beta"
config: "checkstyle.xml"

ratings:
paths:
- "**.java"
4 changes: 3 additions & 1 deletion .gitaliases
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
####################
# Go to the branch with given name
go = "checkout"
# Gets the given remote branch locally and set to track it
get = "checkout -t"
# Go back to develop branch
return = "checkout develop"
# Removes the last commit
Expand All @@ -34,7 +36,7 @@
# Recreates current branch based on develop
recreate = !"f() { git create-with-delete $(git branch-name); }; f"
# Remove all branches that got already merged
tidy = !"git return && git refresh && git fetch --all -p && git branch -vv | grep ': gone]' | awk '{ print $1 }' | xargs -n 1 git branch -d"
tidy = !"git return && git refresh && git fetch --all -p && git branch -vv | grep ': gone]' | awk '{ print $1 }' | xargs -n 1 git branch -D"

###########
# Helpers #
Expand Down
14 changes: 8 additions & 6 deletions .idea/artifacts/BlossomsPogoManager_jar.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fae2f90

Please sign in to comment.