Update KMP + gradle wrapper
This commit is contained in:
1 parent
f48b5f8906
commit
df3ec58382
9 files changed
+37
-47
No files matched your search
Generated
-6
@@ -1,6 +0,0 @@
|
||||
#Vaadin Copilot Integration Runtime Properties
|
||||
#Fri Apr 11 00:18:51 CEST 2025
|
||||
endpoint=http\://127.0.0.1\:63342/api/copilot-a099f404-091d-4ae5-afde-f116f71fbd1f
|
||||
ide=intellij
|
||||
supportedActions=write,writeBase64,delete,undo,redo,refresh,showInIde,getModulePaths,compileFiles,restartApplication
|
||||
version=1.4.8
|
||||
-5
@@ -1,5 +0,0 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
</profile>
|
||||
</component>
|
||||
Generated
+1
-16
@@ -4,20 +4,5 @@
|
||||
<component name="FrameworkDetectionExcludesConfiguration">
|
||||
<file type="web" url="file://$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="21" project-jdk-type="JavaSDK" />
|
||||
<component name="ScriptDefinitionSettings">
|
||||
<option name="settings">
|
||||
<list>
|
||||
<ScriptDefinitionSetting>
|
||||
<option name="definitionId" value="org.jetbrains.kotlin.mainKts.MainKtsScript" />
|
||||
</ScriptDefinitionSetting>
|
||||
<ScriptDefinitionSetting>
|
||||
<option name="definitionId" value="kotlin.Any" />
|
||||
</ScriptDefinitionSetting>
|
||||
<ScriptDefinitionSetting>
|
||||
<option name="definitionId" value="kotlin.Any" />
|
||||
</ScriptDefinitionSetting>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="21" project-jdk-type="JavaSDK" />
|
||||
</project>
|
||||
@@ -14,6 +14,7 @@ publishing {
|
||||
username = "admin"
|
||||
password = "admin123"
|
||||
}
|
||||
// isAllowInsecureProtocol = true
|
||||
url = uri("https://nexus.keinekekse.net/repository/maven-releases/")
|
||||
}
|
||||
}
|
||||
|
||||
+30
-11
@@ -3,46 +3,60 @@
|
||||
#
|
||||
# net.keinekekse:version-catalog
|
||||
#
|
||||
# -> ./gradlew pTML
|
||||
# -> ./gradlew pTML | ./gradlew pub
|
||||
#
|
||||
|
||||
[versions]
|
||||
thisCatalogVersion = "59"
|
||||
thisCatalogVersion = "116"
|
||||
|
||||
versionPluginVersion = "2.4.0"
|
||||
utilLibraryVersion = "0.0.29"
|
||||
versionPluginVersion = "3.1.0"
|
||||
utilLibraryVersion = "0.3.0-beta.8"
|
||||
|
||||
# JVM-Toolchain f. Kotlin z.Zt. (IDE 2025.3) max. 24 -> erst mal 21
|
||||
javaVersion = "21"
|
||||
kotlinVersion = "2.1.20"
|
||||
dokkaVersion = "2.0.0"
|
||||
kotlinVersion = "2.3.0"
|
||||
composeHotReloadVersion = "1.0.0"
|
||||
composeMultiplatformVersion = "1.10.0"
|
||||
dokkaVersion = "2.1.0"
|
||||
ktorVersion = "3.3.3"
|
||||
logbackVersion = "1.5.25"
|
||||
|
||||
# gradleVersionsPluginVersion = "0.52.0"
|
||||
exposedVersion = "0.61.0"
|
||||
kotlinxSerializationVersion = "1.8.0"
|
||||
kotlinxSerializationVersion = "1.9.0"
|
||||
kotlinxCoroutinesVersion = "1.10.2"
|
||||
postgresqlJdbcVersion = "42.7.5"
|
||||
sqliteJdbcVersion = "3.49.1.0"
|
||||
sqliteJdbcVersion = "3.51.1.0"
|
||||
semverVersion = "3.0.0"
|
||||
|
||||
[libraries]
|
||||
kotlinxSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationVersion" }
|
||||
kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesVersion" }
|
||||
kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
|
||||
|
||||
exposedCore = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposedVersion" }
|
||||
exposedCrypt = { module = "org.jetbrains.exposed:exposed-crypt", version.ref = "exposedVersion" }
|
||||
exposedDao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposedVersion" }
|
||||
exposedJdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposedVersion" }
|
||||
exposedJson = { module = "org.jetbrains.exposed:exposed-json", version.ref = "exposedVersion" }
|
||||
exposedMoney = { module = "org.jetbrains.exposed:exposed-money", version.ref = "exposedVersion" }
|
||||
exposedSpringBootStarter = { module = "org.jetbrains.exposed:exposed-spring-boot-starter", version.ref = "exposedVersion" }
|
||||
exposedJodatime = { module = "org.jetbrains.exposed:exposed-jodatime", version.ref = "exposedVersion" }
|
||||
# or
|
||||
exposedJavatime = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposedVersion" }
|
||||
# or
|
||||
exposedKotlinDatetime = { module = "org.jetbrains.exposed:exposed-kotlin-datetime", version.ref = "exposedVersion" }
|
||||
exposedJson = { module = "org.jetbrains.exposed:exposed-json", version.ref = "exposedVersion" }
|
||||
exposedMoney = { module = "org.jetbrains.exposed:exposed-money", version.ref = "exposedVersion" }
|
||||
exposedSpringBootStarter = { module = "org.jetbrains.exposed:exposed-spring-boot-starter", version.ref = "exposedVersion" }
|
||||
|
||||
logback = { module = "ch.qos.logback:logback-classic", version.ref = "logbackVersion" }
|
||||
ktor-serverCore = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktorVersion" }
|
||||
ktor-serverNetty = { module = "io.ktor:ktor-server-netty-jvm", version.ref = "ktorVersion" }
|
||||
ktor-serverTestHost = { module = "io.ktor:ktor-server-test-host-jvm", version.ref = "ktorVersion" }
|
||||
|
||||
sqliteJdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "sqliteJdbcVersion" }
|
||||
postgresqlJdbc = { module = "org.postgresql:postgresql", version.ref = "postgresqlJdbcVersion" }
|
||||
|
||||
semver = { module = "io.github.z4kn4fein:semver", version.ref = "semverVersion" }
|
||||
|
||||
utilLibrary = { module = "net.keinekekse:util", version.ref = "utilLibraryVersion" }
|
||||
|
||||
[bundles]
|
||||
@@ -51,3 +65,8 @@ utilLibrary = { module = "net.keinekekse:util", version.ref = "utilLibraryVersio
|
||||
# gradleVersionsPlugin = { id = "com.github.ben-manes.versions", version.ref = "gradleVersionsPluginVersion" }
|
||||
dokkaPlugin = { id = "org.jetbrains.dokka", version.ref = "dokkaVersion" }
|
||||
versionPlugin = { id = "net.keinekekse.version", version.ref = "versionPluginVersion" }
|
||||
|
||||
composeHotReloadPlugin = { id = "org.jetbrains.compose.hot-reload", version.ref = "composeHotReloadVersion" }
|
||||
composeMultiplatformPlugin = { id = "org.jetbrains.compose", version.ref = "composeMultiplatformVersion" }
|
||||
composeCompilerPlugin = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinVersion" }
|
||||
ktorPlugin = { id = "io.ktor.plugin", version.ref = "ktorVersion" }
|
||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
# Copyright © 2015 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -114,7 +114,6 @@ case "$( uname )" in #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# 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" )
|
||||
|
||||
@@ -205,15 +203,14 @@ fi
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
|
||||
Vendored
+1
-2
@@ -70,11 +70,10 @@ goto fail
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
"%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
|
||||
|
||||
Reference in new issue
Block a user