Skip to content

Commit

Permalink
Upgraded Gradle to 8.7; Upgraded Android plugin to 8.2.2; Upgraded Ko…
Browse files Browse the repository at this point in the history
…tlin Coroutines version to 1.8.0; Enabled cross-platform compatibility for Spotless plugin; Silencing some compiler warnings
  • Loading branch information
severn-everett authored and oshai committed Apr 14, 2024
1 parent d0514cd commit 332b6f5
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
* text eol=lf
*.bat eol=crlf
*.png binary
*.jar binary
13 changes: 10 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
import org.gradle.jvm.tasks.Jar
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("multiplatform") version "1.9.23"
id("com.android.library") version "7.4.2"
// This version is dependent on the maximum tested version
// of this plugin within the Kotlin multiplatform library
id("com.android.library") version "8.2.2"

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

Expand All @@ -28,6 +32,9 @@ repositories {
mavenCentral()
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = JvmTarget.JVM_1_8.target
}

kotlin {
explicitApi()
Expand Down Expand Up @@ -69,7 +76,7 @@ kotlin {
}
}
}
android {
androidTarget {
publishLibraryVariants("release", "debug")
}
val linuxTargets = listOf(
Expand Down Expand Up @@ -206,8 +213,8 @@ android {
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig {
minSdk = 21
targetSdk = 31
}
@Suppress("UnstableApiUsage")
testOptions {
unitTests.isReturnDefaultValues = true
}
Expand Down
4 changes: 2 additions & 2 deletions 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-7.6.1-all.zip
distributionSha256Sum=518a863631feb7452b8f1b3dc2aaee5f388355cc3421bbd0275fbeadd77e84b2
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
distributionSha256Sum=194717442575a6f96e1c1befa2c30e9a4fc90f701d7aee33eb879b79e7ff05c0
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package io.github.oshai.kotlinlogging

import kotlin.test.Test

@Suppress("DEPRECATION")
class SimpleTest {
private val logger = KotlinLogging.logger {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import kotlin.test.*

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

@Suppress("DEPRECATION")
class SimpleJsTest {
private lateinit var appender: SimpleAppender

Expand Down
2 changes: 1 addition & 1 deletion versions.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
extra["slf4j_version"] = "2.0.9"
extra["coroutines_version"] = "1.6.4"
extra["coroutines_version"] = "1.8.0"
extra["log4j_version"] = "2.22.0"
extra["mockito_version"] = "4.11.0"
extra["junit_version"] = "5.9.2"

0 comments on commit 332b6f5

Please sign in to comment.