Skip to content

Commit 332b6f5

Browse files
severn-everettoshai
authored andcommitted
Upgraded Gradle to 8.7; Upgraded Android plugin to 8.2.2; Upgraded Kotlin Coroutines version to 1.8.0; Enabled cross-platform compatibility for Spotless plugin; Silencing some compiler warnings
1 parent d0514cd commit 332b6f5

File tree

6 files changed

+19
-6
lines changed

6 files changed

+19
-6
lines changed

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
* text eol=lf
2+
*.bat eol=crlf
3+
*.png binary
4+
*.jar binary

build.gradle.kts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
22
import org.gradle.jvm.tasks.Jar
33
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
4+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
45
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
56
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
7+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
68

79
plugins {
810
kotlin("multiplatform") version "1.9.23"
9-
id("com.android.library") version "7.4.2"
11+
// This version is dependent on the maximum tested version
12+
// of this plugin within the Kotlin multiplatform library
13+
id("com.android.library") version "8.2.2"
1014

1115
id("org.jetbrains.dokka") version "1.9.20"
1216

@@ -28,6 +32,9 @@ repositories {
2832
mavenCentral()
2933
}
3034

35+
tasks.withType<KotlinCompile> {
36+
kotlinOptions.jvmTarget = JvmTarget.JVM_1_8.target
37+
}
3138

3239
kotlin {
3340
explicitApi()
@@ -69,7 +76,7 @@ kotlin {
6976
}
7077
}
7178
}
72-
android {
79+
androidTarget {
7380
publishLibraryVariants("release", "debug")
7481
}
7582
val linuxTargets = listOf(
@@ -206,8 +213,8 @@ android {
206213
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
207214
defaultConfig {
208215
minSdk = 21
209-
targetSdk = 31
210216
}
217+
@Suppress("UnstableApiUsage")
211218
testOptions {
212219
unitTests.isReturnDefaultValues = true
213220
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
4-
distributionSha256Sum=518a863631feb7452b8f1b3dc2aaee5f388355cc3421bbd0275fbeadd77e84b2
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
4+
distributionSha256Sum=194717442575a6f96e1c1befa2c30e9a4fc90f701d7aee33eb879b79e7ff05c0
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

src/commonTest/kotlin/io/github/oshai/kotlinlogging/SimpleTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package io.github.oshai.kotlinlogging
22

33
import kotlin.test.Test
44

5+
@Suppress("DEPRECATION")
56
class SimpleTest {
67
private val logger = KotlinLogging.logger {}
78

src/jsTest/kotlin/io/github/oshai/kotlinlogging/SimpleJsTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import kotlin.test.*
44

55
private val logger = KotlinLogging.logger("SimpleJsTest")
66

7+
@Suppress("DEPRECATION")
78
class SimpleJsTest {
89
private lateinit var appender: SimpleAppender
910

versions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
extra["slf4j_version"] = "2.0.9"
2-
extra["coroutines_version"] = "1.6.4"
2+
extra["coroutines_version"] = "1.8.0"
33
extra["log4j_version"] = "2.22.0"
44
extra["mockito_version"] = "4.11.0"
55
extra["junit_version"] = "5.9.2"

0 commit comments

Comments
 (0)