Skip to content

Commit 0f896dc

Browse files
Merge pull request #19 from appunite/dependabot/gradle/kotlinPlugin-2.2.0
Bump kotlinPlugin from 1.9.0 to 2.2.0
2 parents b6a29e2 + 8715fe0 commit 0f896dc

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

app/build.gradle.kts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,19 @@ plugins {
22
alias(libs.plugins.android.application)
33
alias(libs.plugins.kotlin.android)
44
alias(libs.plugins.kotlin.serialization)
5+
alias(libs.plugins.compose.compiler)
56
}
67

78
android {
89
namespace = "com.appunite.mockwebserver"
910
compileSdk = libs.versions.compileSdk.get().toInt()
1011

12+
lint {
13+
// Those two checks cause build failure, so we disable them
14+
disable += "MutableCollectionMutableState"
15+
disable += "AutoboxingStateCreation"
16+
}
17+
1118
defaultConfig {
1219
applicationId = "com.appunite.mockwebserverextensions"
1320
minSdk = libs.versions.minSdk.get().toInt()
@@ -34,15 +41,14 @@ android {
3441
sourceCompatibility = JavaVersion.VERSION_11
3542
targetCompatibility = JavaVersion.VERSION_11
3643
}
37-
kotlinOptions {
38-
jvmTarget = libs.versions.javaVersion.get()
44+
kotlin {
45+
compilerOptions {
46+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(libs.versions.javaVersion.get()))
47+
}
3948
}
4049
buildFeatures {
4150
compose = true
4251
}
43-
composeOptions {
44-
kotlinCompilerExtensionVersion = libs.versions.kotlinxSerialization.get()
45-
}
4652
packaging {
4753
resources {
4854
excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -53,7 +59,6 @@ android {
5359
}
5460

5561
dependencies {
56-
5762
androidTestImplementation(project(":mockwebserver-extensions"))
5863
androidTestImplementation(project(":mockwebserver-assertions"))
5964
androidTestImplementation(project(":mockwebserver-request"))

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ plugins {
1111
allprojects {
1212
// Configure Kotlin compiler options
1313
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
14-
kotlinOptions {
15-
jvmTarget = libs.versions.javaVersion.get()
14+
compilerOptions {
15+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(libs.versions.javaVersion.get()))
1616
}
1717
}
1818
}

gradle/libs.versions.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
# Plugins
33
androidGradlePlugin = "8.11.0"
4-
kotlinPlugin = "1.9.0"
4+
kotlinPlugin = "2.2.0"
55

66
# Libraries
77
okhttp = "4.12.0"
@@ -66,3 +66,4 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug
6666
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinPlugin" }
6767
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinPlugin" }
6868
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinPlugin" }
69+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinPlugin" }

0 commit comments

Comments
 (0)