Skip to content

Commit

Permalink
Upgraded dependencies (Kotlin 2.0.20, Serialization 1.7.2, Coroutines…
Browse files Browse the repository at this point in the history
… 1.9.0-RC.2, KSP 1.0.25, Jooby 3.3.0, Spring Boot 3.3.3, Javalin 6.3.0, Vert.x 4.5.10, Micronaut 4.6.1, Koin 4.0.0-RC2, logback 1.5.7, kotlin-wrappers 803, Shadow 8.3.0, gettext.js 2.0.3, Chart.js 4.4.4, Tempus Dominus 6.9.10, Electron 32.0.2, Material Web 2.1.0, Trix 2.1.5)
  • Loading branch information
rjaros committed Sep 6, 2024
1 parent a7b3bba commit a730581
Show file tree
Hide file tree
Showing 13 changed files with 209 additions and 266 deletions.
398 changes: 171 additions & 227 deletions .kotlin-js-store/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20-RC")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20")
implementation("io.github.gradle-nexus:publish-plugin:1.3.0")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
implementation(gradleApi())
Expand Down
42 changes: 21 additions & 21 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
group=io.kvision
versionNumber=8.0.0-RC

systemProp.kotlinVersion=2.0.20-RC
systemProp.kotlinVersion=2.0.20
javaVersion=17
coroutinesVersion=1.9.0-RC
serializationVersion=1.7.1
coroutinesVersion=1.9.0-RC.2
serializationVersion=1.7.2
systemProp.dokkaVersion=1.9.20
systemProp.npmPublishVersion=3.4.2
systemProp.gradlePluginPublishVersion=1.2.1
systemProp.kspVersion=2.0.20-RC-1.0.24
joobyVersion=3.2.7
springBootVersion=3.3.2
springDataRelationalVersion=3.3.2
systemProp.kspVersion=2.0.20-1.0.25
joobyVersion=3.3.0
springBootVersion=3.3.3
springDataRelationalVersion=3.3.3
ktorVersion=2.3.12
javalinVersion=6.2.0
vertxVersion=4.5.9
micronautVersion=4.5.1
javalinVersion=6.3.0
vertxVersion=4.5.10
micronautVersion=4.6.1
guiceVersion=7.0.0
koinVersion=4.0.0-RC1
koinVersion=4.0.0-RC2
jqueryKotlinVersion=1.0.0
navigoKotlinVersion=1.0.0
navigoKotlinNgVersion=0.0.3
diffVersion=0.7.0
jacksonModuleKotlinVersion=2.17.2
logbackVersion=1.5.6
kotlinNodeVersion=20.14.10-pre.787
kotlinReactVersion=18.3.1-pre.787
logbackVersion=1.5.7
kotlinNodeVersion=20.14.10-pre.803
kotlinReactVersion=18.3.1-pre.803
reduxKotlinVersion=0.6.1
reduxKotlinThunkVersion=0.6.0
ballastVersion=4.2.1
testNgVersion=7.10.2
hamcrestVersion=3.0
kotestVersion=5.9.1
shadowVersion=8.1.1
shadowVersion=8.3.0

kvisionAssetsVersion=8.0.12
cssLoaderVersion=7.1.2
Expand All @@ -42,17 +42,17 @@ fechaVersion=4.2.3
snabbdomVersion=3.6.2
snabbdomVirtualizeVersion=1.0.0-beta.5
splitjsVersion=1.6.5
gettextjsVersion=2.0.2
gettextjsVersion=2.0.3
gettextExtractVersion=2.0.1
karmaJunitReporterVersion=2.0.1

bootstrapVersion=5.3.3
popperjsCoreVersion=2.11.8
bootstrapIconsVersion=1.11.3
bootstrapFileinputVersion=5.5.4
chartjsVersion=4.4.3
tempusDominusVersion=6.9.9
electronVersion=31.3.1
chartjsVersion=4.4.4
tempusDominusVersion=6.9.10
electronVersion=32.0.2
electronRemoteVersion=2.1.2
fontawesomeFreeVersion=6.6.0
handlebarsVersion=4.7.8
Expand All @@ -62,12 +62,12 @@ jqueryVersion=3.7.1
leafletVersion=1.9.4
geojsonVersion=0.5.0
geojsonTypesVersion=7946.0.10
materialVersion=2.0.0
materialVersion=2.1.0
onsenuiVersion=2.12.8
paceProgressbarVersion=1.0.10
printjsVersion=1.6.0
reactVersion=^18.3.1
trixVersion=2.1.4
trixVersion=2.1.5
tabulatorTablesVersion=6.2.5
toastifyjsVersion=1.12.0
tomSelectVersion=2.3.1
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ object DatetimeModule : ModuleInitializer {
locales[localeRo.name] = localeRo.localization
val localeRu = require("@eonasdan/tempus-dominus/dist/locales/ru.js")
locales[localeRu.name] = localeRu.localization
val localeSk = require("@eonasdan/tempus-dominus/dist/locales/sk.js")
locales[localeSk.name] = localeSk.localization
val localeSl = require("@eonasdan/tempus-dominus/dist/locales/sl.js")
locales[localeSl.name] = localeSl.localization
val localeTr = require("@eonasdan/tempus-dominus/dist/locales/tr.js")
Expand Down
2 changes: 1 addition & 1 deletion kvision-tools/kvision-gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies {
implementation(kotlin("gradle-plugin"))
implementation("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kspVersion")
compileOnly("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
compileOnly("com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:$shadowVersion")
compileOnly("com.gradleup.shadow:shadow-gradle-plugin:$shadowVersion")

testImplementation(gradleTestKit())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ kotlin {
devServer = KotlinWebpackConfig.DevServer(
open = false,
port = 3000,
proxy = mutableMapOf(
"/kv/*" to "http://localhost:8080",
"/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
),
static = mutableListOf("${layout.buildDirectory.asFile.get()}/processedResources/js/main")
)
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
javaVersion=17
#Plugins
systemProp.kotlinVersion=1.9.10
systemProp.kotlinVersion=2.0.20
#Dependencies
systemProp.kvisionVersion=7.0.0
systemProp.kvisionVersion=8.0.0-RC
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ kotlin {
devServer = KotlinWebpackConfig.DevServer(
open = false,
port = 3000,
proxy = mutableMapOf(
"/kv/*" to "http://localhost:8080",
"/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
),
static = mutableListOf("${layout.buildDirectory.asFile.get()}/processedResources/js/main")
)
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
javaVersion=17
#Plugins
systemProp.kotlinVersion=1.9.10
systemProp.kotlinVersion=2.0.20
#Dependencies
systemProp.kvisionVersion=7.0.0
ktorVersion=2.3.4
logbackVersion=1.4.11
systemProp.kvisionVersion=8.0.0-RC
ktorVersion=2.3.12
logbackVersion=1.5.7

kotlin.mpp.stability.nowarn=true
org.gradle.jvmargs=-Xmx2g

0 comments on commit a730581

Please sign in to comment.