refactor(build): remove unused files and adjust JVM toolchain to Java 24
Deleted `.fleet/receipt.json`, `.vscode/settings.json`, and unused `CLASSPATH` references from Gradle scripts. Updated JVM toolchain configuration from Java 25 to Java 24 in `build.gradle.kts` for consistency.
This commit is contained in:
parent
181e4e9733
commit
3d3c9e2241
|
|
@ -1,23 +0,0 @@
|
|||
{
|
||||
"spec": {
|
||||
"template_id": "kmt",
|
||||
"targets": {
|
||||
"desktop": {
|
||||
"ui": [
|
||||
"compose"
|
||||
]
|
||||
},
|
||||
"web": {
|
||||
"ui": [
|
||||
"compose"
|
||||
]
|
||||
},
|
||||
"server": {
|
||||
"engine": [
|
||||
"ktor"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"timestamp": "2025-04-17T09:30:01.541942955Z"
|
||||
}
|
||||
126
.vscode/settings.json
vendored
126
.vscode/settings.json
vendored
|
|
@ -1,126 +0,0 @@
|
|||
{
|
||||
"yaml.schemas": {
|
||||
"./config/docker/schemas/versions-schema.json": "config/docker/versions.toml"
|
||||
},
|
||||
"files.associations": {
|
||||
"config/docker/versions.toml": "toml",
|
||||
"*.toml": "toml",
|
||||
"docker-compose*.yaml": "dockercompose",
|
||||
"Dockerfile*": "dockerfile"
|
||||
},
|
||||
"toml.schema.enabled": true,
|
||||
"toml.schema.associations": {
|
||||
"config/docker/versions.toml": "./config/docker/schemas/versions-schema.json"
|
||||
},
|
||||
"editor.quickSuggestions": {
|
||||
"other": "on",
|
||||
"comments": "off",
|
||||
"strings": "on"
|
||||
},
|
||||
"editor.suggest.insertMode": "replace",
|
||||
"editor.acceptSuggestionOnCommitCharacter": true,
|
||||
"editor.acceptSuggestionOnEnter": "on",
|
||||
"docker.defaultRegistry": "",
|
||||
"docker.commands.build": "${workspaceFolder}/scripts/docker-build.sh",
|
||||
"docker.commands.compose": "docker-compose",
|
||||
"yaml.format.enable": true,
|
||||
"yaml.validate": true,
|
||||
"yaml.completion": true,
|
||||
"yaml.hover": true,
|
||||
"dockerfile.format.instructionCase": "upper",
|
||||
"dockerfile.format.instructionCasing": "upper",
|
||||
"files.exclude": {
|
||||
"**/node_modules": true,
|
||||
"**/.gradle": true,
|
||||
"**/build": true,
|
||||
"**/.git": true,
|
||||
"**/*.class": true,
|
||||
"**/*.jar": false,
|
||||
"**/kotlin-js-store": true
|
||||
},
|
||||
"search.exclude": {
|
||||
"**/node_modules": true,
|
||||
"**/.gradle": true,
|
||||
"**/build": true,
|
||||
"**/kotlin-js-store": true,
|
||||
"**/*.jar": true
|
||||
},
|
||||
"[toml]": {
|
||||
"editor.defaultFormatter": "tamasfe.even-better-toml",
|
||||
"editor.tabSize": 2,
|
||||
"editor.insertSpaces": true,
|
||||
"editor.formatOnSave": true,
|
||||
"editor.codeActionsOnSave": {
|
||||
"source.fixAll": "explicit"
|
||||
}
|
||||
},
|
||||
"[dockercompose]": {
|
||||
"editor.defaultFormatter": "ms-azuretools.vscode-docker",
|
||||
"editor.tabSize": 2,
|
||||
"editor.insertSpaces": true,
|
||||
"editor.formatOnSave": true
|
||||
},
|
||||
"[dockerfile]": {
|
||||
"editor.defaultFormatter": "ms-azuretools.vscode-docker",
|
||||
"editor.tabSize": 4,
|
||||
"editor.insertSpaces": true,
|
||||
"editor.formatOnSave": true
|
||||
},
|
||||
"[yaml]": {
|
||||
"editor.defaultFormatter": "redhat.vscode-yaml",
|
||||
"editor.tabSize": 2,
|
||||
"editor.insertSpaces": true,
|
||||
"editor.formatOnSave": true
|
||||
},
|
||||
"tasks.version": "2.0.0",
|
||||
"terminal.integrated.cwd": "${workspaceFolder}",
|
||||
"terminal.integrated.env.linux": {
|
||||
"DOCKER_BUILDKIT": "1"
|
||||
},
|
||||
"terminal.integrated.env.osx": {
|
||||
"DOCKER_BUILDKIT": "1"
|
||||
},
|
||||
"terminal.integrated.env.windows": {
|
||||
"DOCKER_BUILDKIT": "1"
|
||||
},
|
||||
"json.validate.enable": true,
|
||||
"json.schemas": [
|
||||
{
|
||||
"fileMatch": [
|
||||
"config/docker/versions.toml"
|
||||
],
|
||||
"url": "./config/docker/schemas/versions-schema.json"
|
||||
}
|
||||
],
|
||||
"git.ignoreLimitWarning": true,
|
||||
"git.detectSubmodules": false,
|
||||
"shellcheck.enable": true,
|
||||
"shellcheck.executablePath": "shellcheck",
|
||||
"shellcheck.run": "onType",
|
||||
"editor.snippetSuggestions": "top",
|
||||
"files.autoSave": "afterDelay",
|
||||
"files.autoSaveDelay": 1000,
|
||||
"breadcrumbs.enabled": true,
|
||||
"breadcrumbs.showFiles": true,
|
||||
"breadcrumbs.showModules": true,
|
||||
"problems.decorations.enabled": true,
|
||||
"security.workspace.trust.untrustedFiles": "open",
|
||||
"kotlin.compiler.jvmTarget": "25",
|
||||
"kotlin.languageServer.enabled": true,
|
||||
"kotlin.completion.snippets.enabled": true,
|
||||
"java.configuration.runtimes": [
|
||||
{
|
||||
"name": "JavaSE-25",
|
||||
"path": "/usr/lib/jvm/openjdk-25",
|
||||
"default": true
|
||||
}
|
||||
],
|
||||
"command-runner.commands": {
|
||||
"ktlint-format": "./gradlew ktlintFormat",
|
||||
"detekt": "./gradlew detekt",
|
||||
"test-all": "./gradlew test",
|
||||
"docker-up-dev": "docker-compose -f docker-compose.yaml -f docker-compose.services.yaml up -d",
|
||||
"docker-down": "docker-compose -f docker-compose.yaml -f docker-compose.services.yaml down",
|
||||
"docker-logs": "docker-compose -f docker-compose.yaml -f docker-compose.services.yaml logs -f"
|
||||
}
|
||||
}
|
||||
|
|
@ -10,7 +10,7 @@ plugins {
|
|||
id("com.github.ben-manes.versions") version "0.51.0"
|
||||
|
||||
// Custom convention plugins
|
||||
id("at.mocode.bundle-budget") apply false // Apply to root, but task runs on subprojects
|
||||
id("at.mocode.bundle-budget") apply false // Apply to root, but a task runs on subprojects
|
||||
|
||||
// Kotlin plugins declared here with 'apply false' to centralize version management
|
||||
// This prevents "plugin loaded multiple times" errors in Gradle 9.2.1+
|
||||
|
|
@ -34,7 +34,7 @@ plugins {
|
|||
}
|
||||
|
||||
// ##################################################################
|
||||
// ### ALLPROJECTS CONFIGURATION ###
|
||||
// ### ALL-PROJECTS CONFIGURATION ###
|
||||
// ##################################################################
|
||||
|
||||
allprojects {
|
||||
|
|
@ -48,7 +48,7 @@ allprojects {
|
|||
}
|
||||
|
||||
subprojects {
|
||||
// Note: Kotlin compiler configuration is handled by individual modules
|
||||
// Note: Individual modules handle Kotlin compiler configuration
|
||||
// a Root project doesn't apply Kotlin plugins, so we can't configure KotlinCompile tasks here
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
@ -70,17 +70,17 @@ subprojects {
|
|||
plugins.withId("java") {
|
||||
val javaExt = extensions.getByType<JavaPluginExtension>()
|
||||
// Ensure a full JDK toolchain with compiler is available (Gradle will auto-download if missing)
|
||||
javaExt.toolchain.languageVersion.set(JavaLanguageVersion.of(25))
|
||||
javaExt.toolchain.languageVersion.set(JavaLanguageVersion.of(24))
|
||||
|
||||
// Set Kotlin Toolchain for projects using Kotlin
|
||||
plugins.withId("org.jetbrains.kotlin.jvm") {
|
||||
extensions.configure<org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension> {
|
||||
jvmToolchain(25)
|
||||
jvmToolchain(24)
|
||||
}
|
||||
}
|
||||
plugins.withId("org.jetbrains.kotlin.multiplatform") {
|
||||
extensions.configure<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension> {
|
||||
jvmToolchain(25)
|
||||
jvmToolchain(24)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -245,7 +245,7 @@ tasks.register("archGuardNoFeatureToFeatureDeps") {
|
|||
val proj =
|
||||
try {
|
||||
dep.javaClass.getMethod("getDependencyProject").invoke(dep) as Project
|
||||
} catch (e: Throwable) {
|
||||
} catch (_: Throwable) {
|
||||
null
|
||||
}
|
||||
val target = proj?.path ?: ""
|
||||
|
|
|
|||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradlew
vendored
3
gradlew
vendored
|
|
@ -114,7 +114,6 @@ case "$( uname )" in #(
|
|||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH="\\\"\\\""
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
|
|
@ -172,7 +171,6 @@ fi
|
|||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
|
|
@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
|
|
|
|||
3
gradlew.bat
vendored
3
gradlew.bat
vendored
|
|
@ -70,11 +70,10 @@ goto fail
|
|||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user