Skip to content

Commit

Permalink
Gradle 8 Update (#3662)
Browse files Browse the repository at this point in the history
  • Loading branch information
e5l committed Aug 8, 2023
1 parent 7592e92 commit 336cce1
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 13 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ apply(from = "gradle/compatibility.gradle")

plugins {
id("org.jetbrains.dokka") version "1.7.20" apply false
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.12.1"
id("kotlinx-atomicfu") version "0.19.0" apply false
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
id("kotlinx-atomicfu") version "0.21.0" apply false
id("com.osacky.doctor") version "0.8.1"
}

Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*/

plugins {
id("org.gradle.kotlin.kotlin-dsl") version "3.2.4"
kotlin("plugin.serialization") version "1.7.21"
kotlin("plugin.serialization") version "1.8.20"
id("org.gradle.kotlin.kotlin-dsl") version "4.0.14"
}

val buildSnapshotTrain = properties["build_snapshot_train"]?.toString()?.toBoolean() == true
Expand Down
3 changes: 1 addition & 2 deletions buildSrc/src/main/kotlin/KtorBuildProperties.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import org.gradle.api.*
import org.gradle.api.tasks.testing.*
import org.gradle.jvm.toolchain.*
import org.gradle.kotlin.dsl.*
import org.jetbrains.kotlin.gradle.plugin.mpp.*

/*
* Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
Expand All @@ -22,7 +21,7 @@ private val versionComponents = java_version

val IDEA_ACTIVE: Boolean = System.getProperty("idea.active") == "true"

val OS_NAME = System.getProperty("os.name").toLowerCase()
val OS_NAME = System.getProperty("os.name").lowercase()

val HOST_NAME = when {
OS_NAME.startsWith("linux") -> "linux"
Expand Down
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# kotlin
kotlin.native.ignoreDisabledTargets=true
kotlin.mpp.stability.nowarn=true
kotlin.mpp.enableCompatibilityMetadataVariant=true
kotlin.mpp.enableCInteropCommonization=true
kotlin.internal.mpp.hierarchicalStructureByDefault=true
kotlin.incremental.js.ir=false
kotlin.incremental.js.klib=false
kotlin.incremental.multiplatform=true
Expand Down
1 change: 0 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ kotlinx-html-version = "0.9.1"
coroutines-version = "1.7.2"
atomicfu-version = "0.20.2"
serialization-version = "1.5.1"
validator-version = "0.8.0"
ktlint-version = "3.15.0"

netty-version = "4.1.92.Final"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions ktor-bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ val name = project.name

dependencies {
constraints {
rootProject.subprojects.forEach {
if (!it.plugins.hasPlugin("maven-publish") || it.name == name) return@forEach
rootProject.subprojects.forEach subprojects@{
if (!it.plugins.hasPlugin("maven-publish") || it.name == name) return@subprojects
it.the<PublishingExtension>().publications.forEach { publication ->
if (publication !is MavenPublication) return@forEach

Expand Down
2 changes: 1 addition & 1 deletion ktor-server/ktor-server-netty/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = ""
val jetty_alpn_api_version: String by extra

val enableAlpnProp = project.hasProperty("enableAlpn")
val osName = System.getProperty("os.name").toLowerCase()
val osName = System.getProperty("os.name").lowercase()
val nativeClassifier: String? = if (enableAlpnProp) {
when {
osName.contains("win") -> "windows-x86_64"
Expand Down

0 comments on commit 336cce1

Please sign in to comment.