diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a171e35 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +**/bun.lock -diff +text=auto eol=lf diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..c0c21af --- /dev/null +++ b/.gitconfig @@ -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 diff --git a/bun.lock b/bun.lock index 9bfa28c..a3fc184 100644 --- a/bun.lock +++ b/bun.lock @@ -9,11 +9,11 @@ "@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", }, @@ -117,9 +117,9 @@ "@pkgr/core": ["@pkgr/core@0.2.10", "", {}, "sha512-x6fFWCeak8aCGfqZfe6CXYt5xVjxe9Os1cIPmVRcToInKLjhJkRVXvJ/L3/1KxFkjDQdbZV/YsuLKqa8t/xKpA=="], - "@simple-git/args-pathspec": ["@simple-git/args-pathspec@1.0.3", "", {}, "sha512-ngJMaHlsWDTfjyq9F3VIQ8b7NXbBLq5j9i5bJ6XLYtD6qlDXT7fdKY2KscWWUF8t18xx052Y/PUO1K1TRc9yKA=="], + "@simple-git/args-pathspec": ["@simple-git/args-pathspec@1.0.4", "", {}, "sha512-EtMX6XjRWSastG2SdkmSQByPtJ9dx/NIjnHbpQPCYt62j4RmSx5rgLTGpw0YCjF5h191gZOmBfheOT23cRSFdw=="], - "@simple-git/argv-parser": ["@simple-git/argv-parser@1.1.1", "", { "dependencies": { "@simple-git/args-pathspec": "^1.0.3" } }, "sha512-Q9lBcfQ+VQCpQqGJFHe5yooOS5hGdLFFbJ5R+R5aDsnkPCahtn1hSkMcORX65J2Z5lxSkD0lQorMsncuBQxYUw=="], + "@simple-git/argv-parser": ["@simple-git/argv-parser@2.0.1", "", { "dependencies": { "@simple-git/args-pathspec": "^1.0.4" } }, "sha512-M++IaVWrN+vYalilOHfwvT2IL3wYZtVEBQpmX6DLSOJLtxbZ+SUeIDE3IiPogzhPACLajwtxfa5rp+ZX1FczzQ=="], "@types/bun": ["@types/bun@1.4.2", "", { "dependencies": { "bun-types": "1.4.2" } }, "sha512-GimotNn7+ZV0uVArItBbriZsR1oNf0+WTzPkdcFrzShI7k2norL0uzEaJT8T33dWr7O/c9ZDuAFQrctKCi72oQ=="], @@ -177,7 +177,7 @@ "jsesc": ["jsesc@3.1.0", "", { "bin": { "jsesc": "bin/jsesc" } }, "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA=="], - "lint-staged": ["lint-staged@17.5.1", "", { "dependencies": { "picomatch": "^4.0.7", "string-argv": "^0.3.2", "tinyexec": "^1.3.1" }, "optionalDependencies": { "yaml": "^2.9.0" }, "bin": { "lint-staged": "bin/lint-staged.js" } }, "sha512-7EDuco1xnBMeVpvAbeMq1U5KXwJGLmY8q6l+Ye78r36C4mPc+Vg1Z2SK8gHyRTyvPro90A0q5/FAZ+Au23d6QQ=="], + "lint-staged": ["lint-staged@17.6.0", "", { "dependencies": { "picomatch": "^4.0.7", "string-argv": "^0.3.2", "tinyexec": "^1.3.1" }, "optionalDependencies": { "yaml": "^2.9.1" }, "bin": { "lint-staged": "bin/lint-staged.js" } }, "sha512-nOhBfYkZEwkFtNzD5pK9s9LkcWoxJ+whLzEnhqi9nl7zTB5n7tg8+9iYgMGx2Wm3VlLu8cbNj0RACzY+nWi5iQ=="], "mri": ["mri@1.2.0", "", {}, "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA=="], @@ -187,15 +187,15 @@ "picomatch": ["picomatch@4.0.7", "", {}, "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA=="], - "prettier": ["prettier@3.9.8", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-WRFq3Wn3WId7LLROfMLdH7xaFr2jR62wU8nLO6rQUOLOxNZUviyJQs1M0iIhLexSFy+L+w0ch66wtoO2jRjG0A=="], + "prettier": ["prettier@3.9.9", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-Z/CJHIkdujO/OtN7nXUii0Rf3VT5SRuhjBA82Xvu2XhBUgX3nhP67T0LHceBdQLex7OOFGTox+Q5Yg8Jk2Qivg=="], - "prettier-plugin-java": ["prettier-plugin-java@2.10.4", "", { "dependencies": { "web-tree-sitter": "0.27.0" }, "peerDependencies": { "prettier": "^3.0.0" } }, "sha512-Hinkucn49lx848MnWEktfGozLPp9dMYtdKPG+Z3pridBv71PJIVibe4jp0Lzb+rcA3eMZfU5+oWtJoI2oQ2XTg=="], + "prettier-plugin-java": ["prettier-plugin-java@2.11.0", "", { "dependencies": { "web-tree-sitter": "0.27.0" }, "peerDependencies": { "prettier": "^3.0.0" } }, "sha512-pLwm2wHvVvW5eVVLf1cq2orY2ATaIj5ngN8hJ5ZdXYzUHzxrfaZkk2xmu8Mz/duBXAc2xT/cUH5+dK414HQSTw=="], "pretty-quick": ["pretty-quick@4.2.2", "", { "dependencies": { "@pkgr/core": "^0.2.7", "ignore": "^7.0.5", "mri": "^1.2.0", "picocolors": "^1.1.1", "picomatch": "^4.0.2", "tinyexec": "^0.3.2", "tslib": "^2.8.1" }, "peerDependencies": { "prettier": "^3.0.0" }, "bin": { "pretty-quick": "lib/cli.mjs" } }, "sha512-uAh96tBW1SsD34VhhDmWuEmqbpfYc/B3j++5MC/6b3Cb8Ow7NJsvKFhg0eoGu2xXX+o9RkahkTK6sUdd8E7g5w=="], "semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="], - "simple-git": ["simple-git@3.36.0", "", { "dependencies": { "@kwsites/file-exists": "^1.1.1", "@kwsites/promise-deferred": "^1.1.1", "@simple-git/args-pathspec": "^1.0.3", "@simple-git/argv-parser": "^1.1.0", "debug": "^4.4.0" } }, "sha512-cGQjLjK8bxJw4QuYT7gxHw3/IouVESbhahSsHrX97MzCL1gu2u7oy38W6L2ZIGECEfIBG4BabsWDPjBxJENv9Q=="], + "simple-git": ["simple-git@4.0.2", "", { "dependencies": { "@kwsites/file-exists": "^1.1.1", "@kwsites/promise-deferred": "^1.1.1", "@simple-git/args-pathspec": "1.0.4", "@simple-git/argv-parser": "2.0.1", "debug": "^4.4.0" } }, "sha512-l0sIsv9VrPwovKELFDBOj/lhmIcbMvxBk2B+hRhsMM4/VL3gKtuZvYnBNixVo+N/0HnqQx2cBdLvxnAbygHpqA=="], "simple-git-hooks": ["simple-git-hooks@2.14.0", "", { "bin": { "simple-git-hooks": "cli.js" } }, "sha512-kkTORPAuxQz2g1QUuN0J8yGWT28tjGBfPOdJ4xT7Vbeu30veKUZQIoID2qGgCDAakaQn59UeZJJ4cFGB8PVP2A=="], @@ -211,7 +211,7 @@ "web-tree-sitter": ["web-tree-sitter@0.27.0", "", {}, "sha512-XK08gj6RwTMQatAG7uVRP8MunqotL/XC19vHgkSPKmELgbGPBj4ECvB8haHOUnyj6ls2B8t42UTro14zxGgAHg=="], - "yaml": ["yaml@2.9.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA=="], + "yaml": ["yaml@2.9.1", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-3NxN8+78OdzbT7C/WjGsyfPAtJaN3FNDsWxv7Y7mcDsT/oOmgW8BpyQQFFBnvZE3j9Y2Sdz1ULFLezL7Eb2yFw=="], "@freik/containers/@freik/typechk": ["@freik/typechk@0.9.5", "", {}, "sha512-6qnI/3UwYWJGews1How1xOrRr/M+9VisJVia5zq4JyswKsT/dCjb8+B0PaIIX5wtLNdKqubpm7yPeYe+VH84QQ=="], diff --git a/package.json b/package.json index e070c80..b0381cc 100644 --- a/package.json +++ b/package.json @@ -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" }, diff --git a/scripts/java2umltext/build.gradle b/scripts/java2umltext/build.gradle index d016022..1c63a8b 100644 --- a/scripts/java2umltext/build.gradle +++ b/scripts/java2umltext/build.gradle @@ -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( @@ -32,11 +31,9 @@ jar { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } } - tasks.withType(Jar) { duplicatesStrategy = "include" } - test { useJUnitPlatform() } diff --git a/settings.gradle b/settings.gradle index 508604d..3cded2c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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 \ No newline at end of file