From 54a71bab9a09fcfaaa21c47e78b5b2ddd57befeb Mon Sep 17 00:00:00 2001 From: Hare Date: Sat, 29 Nov 2025 04:20:26 +0900 Subject: [PATCH] 1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ビルド設定の変更:minimizeとJarの作成とファイル名の反映 - 依存関係のリモート化:submoduleとして追加し、includeBuildのパスを内部化 --- .direnv/bin/nix-direnv-reload | 19 ------------------- .gitignore | 2 +- .gitmodules | 3 +++ build.gradle.kts | 11 +++++------ flake.nix | 4 ---- gradle.properties | 3 --- permits-lib | 1 + settings.gradle.kts | 2 +- 8 files changed, 11 insertions(+), 34 deletions(-) delete mode 100755 .direnv/bin/nix-direnv-reload create mode 100644 .gitmodules create mode 160000 permits-lib diff --git a/.direnv/bin/nix-direnv-reload b/.direnv/bin/nix-direnv-reload deleted file mode 100755 index c2c19a6..0000000 --- a/.direnv/bin/nix-direnv-reload +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -set -e -if [[ ! -d "/home/hare/Projects/crafters-toolbox/components/plugins/kommand-lib" ]]; then - echo "Cannot find source directory; Did you move it?" - echo "(Looking for "/home/hare/Projects/crafters-toolbox/components/plugins/kommand-lib")" - echo 'Cannot force reload with this script - use "direnv reload" manually and then try again' - exit 1 -fi - -# rebuild the cache forcefully -_nix_direnv_force_reload=1 direnv exec "/home/hare/Projects/crafters-toolbox/components/plugins/kommand-lib" true - -# Update the mtime for .envrc. -# This will cause direnv to reload again - but without re-building. -touch "/home/hare/Projects/crafters-toolbox/components/plugins/kommand-lib/.envrc" - -# Also update the timestamp of whatever profile_rc we have. -# This makes sure that we know we are up to date. -touch -r "/home/hare/Projects/crafters-toolbox/components/plugins/kommand-lib/.envrc" "/home/hare/Projects/crafters-toolbox/components/plugins/kommand-lib/.direnv"/*.rc diff --git a/.gitignore b/.gitignore index ba2fa11..b85e188 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .direnv - +.kotlin .gradle build diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..56ed602 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "permits-lib"] + path = permits-lib + url = git@gitea.hareworks.net:Hare/permits-lib.git diff --git a/build.gradle.kts b/build.gradle.kts index 2a401d4..24aec30 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,17 +17,16 @@ val exposedVersion = "1.0.0-rc-3" dependencies { compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") - compileOnly("org.jetbrains.kotlin:kotlin-stdlib") + implementation("org.jetbrains.kotlin:kotlin-stdlib") compileOnly("net.hareworks:permits-lib:1.1") } tasks { + withType { + archiveBaseName.set("Kommand-Lib") + } shadowJar { minimize() - archiveBaseName.set("Kommand-Lib") - archiveClassifier.set("") - } - jar { - enabled = false + archiveClassifier.set("min") } } diff --git a/flake.nix b/flake.nix index 7f61bf2..0103621 100644 --- a/flake.nix +++ b/flake.nix @@ -36,10 +36,6 @@ export PATH="$JAVA_HOME/bin:$PATH" export GRADLE_USER_HOME="$PWD/.gradle" - - echo "Loaded Minecraft dev env (JDK 21 + Gradle)" - java -version || true - gradle --version || true ''; }; } diff --git a/gradle.properties b/gradle.properties index ef5e4b3..d38384f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,3 @@ -# This file was generated by the Gradle 'init' task. -# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties - org.gradle.configuration-cache=true org.gradle.parallel=true org.gradle.caching=true diff --git a/permits-lib b/permits-lib new file mode 160000 index 0000000..6c2f860 --- /dev/null +++ b/permits-lib @@ -0,0 +1 @@ +Subproject commit 6c2f860df64824d8b52d0083f91a305c7b7d7d08 diff --git a/settings.gradle.kts b/settings.gradle.kts index 2862be1..141f75c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,3 @@ rootProject.name = "kommand-lib" -includeBuild("../permits-lib") +includeBuild("permits-lib")