Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/bun.lock -diff
text=auto eol=lf
62 changes: 62 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
[alias]
unstage = reset HEAD --
st = status
s = status -uno
sl = log --graph --oneline --decorate --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative -n 100 --all
sl20 = log --graph --oneline --decorate --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative -n 20 --all
br = branch
co = checkout
ci = commit
di = diff
sum = show
summary = show
pick = cherry-pick
unedit = checkout --
amend = commit --amend
cdiff = diff HEAD
qdiff = diff --no-ext-diff
qcdiff = diff --no-ext-diff HEAD
stat = diff --name-only
cstat = diff --name-only HEAD
branches = branch --list --all
tags = tag --list
spull = "!__git_spull() { git pull \"$@\" && git submodule sync --recursive && git submodule update --init --recursive; }; __git_spull"
[core]
editor = nano
quotepath = false
autocrlf = false
eol = lf
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[push]
default = simple
[user]
diff = auto
status = auto
branch = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
plain = white
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red blink
[color "status"]
added = yellow
changed = green
untracked = cyan
[status]
submoduleSummary = true
[diff]
submodule = log
[pull]
rebase = true
[init]
defaultBranch = main
22 changes: 11 additions & 11 deletions bun.lock

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

12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,20 @@
"graphlb": "java -jar scripts/java2umltext/build/libs/java2umltext-0.1.0.jar MERMAID LearnBot > learnbot-classgraph.mmd",
"graph": "bun run graphlib && bun run graph16 && bun run graph20 && bun run graphlb",
"- // git hooks": "Auto-format code on commit",
"prepare": "simple-git-hooks"
"prepare": "simple-git-hooks",
"- // git configuration": "Install a custom .gitconfig file, because Kevin likes his git command line tools",
"gitconfig": "git config --local include.path ../.gitconfig"
},
"dependencies": {
"@freik/containers": "^0.4.10",
"@freik/typechk": "^0.10.0",
"@freik/workspace": "^0.8.1",
"@ianvs/prettier-plugin-sort-imports": "^4.7.1",
"lint-staged": "^17.5.1",
"prettier": "^3.9.8",
"prettier-plugin-java": "^2.10.4",
"lint-staged": "^17.6.0",
"prettier": "^3.9.9",
"prettier-plugin-java": "^2.11.0",
"pretty-quick": "^4.2.2",
"simple-git": "^3.36.0",
"simple-git": "^4.0.2",
"simple-git-hooks": "^2.14.0",
"typescript": "^7.0.2"
},
Expand Down
19 changes: 8 additions & 11 deletions scripts/java2umltext/build.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
plugins {
id 'java'
}

group 'com.java2umltext'
archivesBaseName = 'java2umltext'
version '0.1.0'

sourceCompatibility = 1.16
targetCompatibility = 1.16

base {
archivesName = 'java2umltext'
}
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}

repositories {
mavenCentral()
}

dependencies {
implementation "com.github.javaparser:javaparser-core:3.24.2"
implementation 'info.picocli:picocli:4.6.3'
}

jar {
manifest {
attributes(
Expand All @@ -32,11 +31,9 @@ jar {
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
}
}

tasks.withType(Jar) {
duplicatesStrategy = "include"
}

test {
useJUnitPlatform()
}
3 changes: 3 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ include ':Twenty403'
// These are other 'bots' that we should build until we're at competitions
include ':LearnBot' // FLIP: BUILD ALL BOTS
// include ':BuzzBall' // FLIP: BUILD ALL BOTS

// include ':java2umltext' // FLIP: UML
// project(':java2umltext').projectDir = new File('scripts/java2umltext') // FLIP: UML
Loading