Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Kotlin 1.8.22 and other libraries #784

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 26 additions & 25 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
kotlin("multiplatform") version "1.7.20" apply false
kotlin("plugin.serialization") version "1.7.20" apply false
id("com.google.devtools.ksp") version "1.7.20-1.0.6" apply false
id("org.jetbrains.dokka") version "1.7.20"
kotlin("multiplatform") version "1.8.22" apply false
kotlin("plugin.serialization") version "1.8.22" apply false
id("com.google.devtools.ksp") version "1.8.22-1.0.11" apply false
id("org.jetbrains.dokka") version "1.8.20"
id("maven-publish")
signing
}
Expand All @@ -11,37 +11,38 @@ plugins {
// https://docs.gradle.org/current/userguide/platforms.html
extra.apply {
// core
set("kotlinVersion", "1.7.20")
set("kspVersion", "1.7.20-1.0.6")
set("coroutinesVersion", "1.6.4")
set("serializationVersion", "1.4.0")
set("kotlinVersion", "1.8.22")
set("kspVersion", "1.8.22-1.0.11")
set("coroutinesVersion", "1.7.3")
set("serializationVersion", "1.5.1")
set("dateTimeVersion", "0.4.0")

// test-server
set("ktorVersion", "2.2.2")
set("logbackVersion", "1.4.5")
set("ktorVersion", "2.3.3")
set("logbackVersion", "1.4.11")

// lenses-annotation-processor
set("kotlinpoetVersion", "1.12.0")
set("compileTestingVersion", "1.4.9")
set("autoServiceVersion", "1.0.1")
set("junitJupiterParamsVersion", "5.8.2")
set("assertJVersion", "3.23.1")
set("kotlinpoetVersion", "1.14.2")
set("compileTestingVersion", "1.5.0")
set("autoServiceVersion", "1.1.1")
set("junitJupiterParamsVersion", "5.10.0")
set("assertJVersion", "3.24.2")

// npm
set("popperjs", "2.11.5")
set("scroll-into-view-if-needed", "2.2.29")
set("popperjs", "2.11.8")
set("scroll-into-view-if-needed", "2.2.31")

// tailwind
set("tailwindcss", "3.2.1")
set("tailwindcss/forms", "0.5.3")
set("tailwindcss", "3.3.3")
set("tailwindcss/forms", "0.5.4")

// webpack
set("postcss", "8.4.17")
set("postcss-loader", "7.0.1")
set("autoprefixer", "10.4.12")
set("css-loader", "6.7.1")
set("style-loader", "3.3.1")
set("cssnano", "5.1.13")
set("postcss", "8.4.27")
set("postcss-loader", "7.3.0")
set("autoprefixer", "10.4.13")
set("css-loader", "6.7.2")
set("style-loader", "3.3.2")
set("cssnano", "5.1.14")
}

allprojects {
Expand Down
12 changes: 7 additions & 5 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ plugins {

kotlin {
jvm()
js(BOTH).browser {
testTask {
//running test-server in background
dependsOn(":test-server:start")
// see "karma.config.d" folder for customizing karma
js(IR) {
browser {
testTask {
//running test-server in background
dependsOn(":test-server:start")
// see "karma.config.d" folder for customizing karma
}
}
// just to have a place to copy it from...
/*
Expand Down
4 changes: 3 additions & 1 deletion examples/tictactoe/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ kotlin {
js(IR) {
browser {
webpackTask {
cssSupport.enabled = true
cssSupport {
enabled.set(true)
}
}
}
}.binaries.executable()
Expand Down
2 changes: 1 addition & 1 deletion examples/validation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ kotlin {
val commonMain by getting {
dependencies {
implementation(project(":core"))
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.2.1")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:${rootProject.extra["dateTimeVersion"]}")
}
}
val jvmMain by getting {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ package dev.fritz2.examples.validation
import dev.fritz2.core.Lens
import dev.fritz2.validation.ValidationMessage
import dev.fritz2.validation.validation
import kotlinx.datetime.Clock
import kotlinx.datetime.LocalDate
import kotlinx.datetime.TimeZone
import kotlinx.datetime.todayAt
import kotlinx.datetime.*

enum class Status(val inputClass: String, val messageClass: String) {
Valid("is-valid", "valid-feedback"),
Expand Down Expand Up @@ -34,7 +31,7 @@ val personValidator = validation<Person, Message> { inspector ->

// validate the birthday
val birthday = inspector.map(Person.birthday())
val today = Clock.System.todayAt(TimeZone.currentSystemDefault())
val today = Clock.System.todayIn(TimeZone.currentSystemDefault())
when {
birthday.data == LocalDate(1900, 1, 1) -> {
add(Message(Person.id + birthday.path, Status.Invalid, "Please provide a birthday"))
Expand Down
8 changes: 5 additions & 3 deletions headless/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ plugins {

kotlin {
jvm()
js(BOTH).browser {
testTask {
useKarma {
js(IR) {
browser {
testTask {
useKarma {
// useSafari()
// useFirefox()
// useChrome()
useChromeHeadless()
// usePhantomJS()
}
}
}
// just to have a place to copy it from...
Expand Down