Skip to content

Commit d8dddcb

Browse files
dependabot[bot]svenjacobs
dependabot[bot]
and
svenjacobs
authored
chore(deps): Bump the kotlin group with 2 updates (Kotlin 2.0) (#132)
* chore(deps): Bump the kotlin group with 2 updates Bumps the kotlin group with 2 updates: [org.jetbrains.kotlin.android](https://github.com/JetBrains/kotlin) and [org.jetbrains.kotlin.multiplatform](https://github.com/JetBrains/kotlin). Updates `org.jetbrains.kotlin.android` from 1.9.24 to 2.0.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v1.9.24...v2.0.0) Updates `org.jetbrains.kotlin.multiplatform` from 1.9.24 to 2.0.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v1.9.24...v2.0.0) Updates `org.jetbrains.kotlin.multiplatform` from 1.9.24 to 2.0.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v1.9.24...v2.0.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.android dependency-type: direct:production update-type: version-update:semver-major dependency-group: kotlin - dependency-name: org.jetbrains.kotlin.multiplatform dependency-type: direct:production update-type: version-update:semver-major dependency-group: kotlin - dependency-name: org.jetbrains.kotlin.multiplatform dependency-type: direct:production update-type: version-update:semver-major dependency-group: kotlin ... Signed-off-by: dependabot[bot] <support@github.com> * chore: adjust project config for Kotlin 2.0 * fix: multiplatform build issue * fix: deprecation warning * fix: issue with extra property diff --git a/convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts b/convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts index 04e28b4..6d6bea8 100644 --- a/convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts +++ b/convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts @@ -8,9 +8,6 @@ plugins { id("org.jetbrains.kotlin.plugin.compose") } -val baseName: String by extra -val outerBaseName = baseName - java { toolchain { languageVersion = JavaLanguageVersion.of(21) @@ -34,8 +31,12 @@ kotlin { iosArm64(), iosSimulatorArm64(), ).forEach { - it.binaries.framework { - baseName = outerBaseName + afterEvaluate { + val baseName: String by extra + + it.binaries.framework { + this.baseName = baseName + } } } * fix merge * Update to Kotlin 2.0.10 * Kotlin 2.0.20 * fix: update API dump * chore: update JetBrains Compose to 1.7.0-rc01 * chore: update dependencies * chore: update more dependencies * chore: revert config --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sven Jacobs <github@svenjacobs.com>
1 parent 65b3da8 commit d8dddcb

File tree

23 files changed

+112
-95
lines changed

23 files changed

+112
-95
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ captures
1010
local.properties
1111
xcuserdata
1212
kotlin-js-store
13+
.kotlin

‎android-tests/build.gradle.kts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
alias(libs.plugins.android.application)
33
alias(libs.plugins.jetbrains.kotlin.android)
4+
alias(libs.plugins.compose.compiler)
45
}
56

67
val androidMinSdk: Int by rootProject.extra
@@ -49,10 +50,6 @@ android {
4950
buildFeatures {
5051
compose = true
5152
}
52-
53-
composeOptions {
54-
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
55-
}
5653
}
5754

5855
dependencies {

‎build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
22

3-
buildscript {
4-
dependencies {
5-
}
6-
}
7-
83
plugins {
94
alias(libs.plugins.jetbrains.kotlin.multiplatform) apply false
105
alias(libs.plugins.jetbrains.compose) apply false
116
alias(libs.plugins.android.application) apply false
127
alias(libs.plugins.android.library) apply false
138
alias(libs.plugins.jetbrains.kotlin.android) apply false
9+
alias(libs.plugins.compose.compiler) apply false
1410
alias(libs.plugins.nexus.publish)
1511
alias(libs.plugins.ben.manes.versions)
1612
alias(libs.plugins.kotlinter)
17-
alias(libs.plugins.binary.compat.validator)
13+
alias(libs.plugins.binary.compat.validator)
14+
15+
// https://github.com/JetBrains/compose-multiplatform/issues/4773#issuecomment-2100795877
16+
id("convention.multiplatform") apply false
17+
id("convention.publication") apply false
1818
}
1919

2020
group = "com.svenjacobs.reveal"

‎convention-plugins/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@ dependencies {
2222
name = "compose-gradle-plugin",
2323
version = libs.findVersion("jetbrains-compose").get().requiredVersion,
2424
)
25+
implementation(
26+
group = "org.jetbrains.kotlin.plugin.compose",
27+
name = "org.jetbrains.kotlin.plugin.compose.gradle.plugin",
28+
version = libs.findVersion("kotlin").get().requiredVersion,
29+
)
2530
}

‎convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
@file:OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
2+
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
4+
15
plugins {
26
kotlin("multiplatform")
37
id("org.jetbrains.compose")
8+
id("org.jetbrains.kotlin.plugin.compose")
49
}
510

6-
val baseName: String by extra
7-
811
java {
912
toolchain {
1013
languageVersion = JavaLanguageVersion.of(21)
@@ -17,10 +20,8 @@ kotlin {
1720
jvm("desktop")
1821

1922
androidTarget {
20-
compilations.all {
21-
kotlinOptions {
22-
jvmTarget = "11"
23-
}
23+
compilerOptions {
24+
jvmTarget.set(JvmTarget.JVM_11)
2425
}
2526
publishLibraryVariants("release")
2627
}
@@ -30,16 +31,20 @@ kotlin {
3031
iosArm64(),
3132
iosSimulatorArm64(),
3233
).forEach {
33-
it.binaries.framework {
34-
this.baseName = baseName
34+
afterEvaluate {
35+
val baseName: String by extra
36+
37+
it.binaries.framework {
38+
this.baseName = baseName
39+
}
3540
}
3641
}
3742

3843
js(IR) {
3944
browser()
4045
}
4146

42-
@OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
47+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
4348
wasmJs {
4449
browser()
4550
}

‎demo-app/androidApp/build.gradle.kts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ android {
1717
buildFeatures {
1818
compose = true
1919
}
20-
composeOptions {
21-
kotlinCompilerExtensionVersion = "1.5.14"
22-
}
2320
packaging {
2421
resources {
2522
excludes += "/META-INF/{AL2.0,LGPL2.1}"

‎demo-app/gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ android.nonTransitiveRClass=true
99
kotlin.mpp.stability.nowarn=true
1010
kotlin.mpp.enableCInteropCommonization=true
1111
kotlin.mpp.androidSourceSetLayoutVersion=2
12+
kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
1213
#Compose
1314
org.jetbrains.compose.experimental.uikit.enabled=true

‎demo-app/gradle/libs.versions.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
2-
android-gradle-plugin = "8.5.1"
3-
androidx-compose-bom = "2024.05.00"
4-
jetbrains-compose = "1.6.10"
5-
kotlin = "2.0.0"
6-
reveal = "3.0.7"
2+
android-gradle-plugin = "8.7.1"
3+
androidx-compose-bom = "2024.10.00"
4+
jetbrains-compose = "1.7.0"
5+
kotlin = "2.0.21"
6+
reveal = "3.0.8"
77

88
[libraries]
99
androidx-core-ktx = "androidx.core:core-ktx:1.13.1"
10-
androidx-activity-compose = "androidx.activity:activity-compose:1.9.0"
10+
androidx-activity-compose = "androidx.activity:activity-compose:1.9.3"
1111
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
1212
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
1313
androidx-compose-material3 = { module = "androidx.compose.material3:material3" }

‎demo-app/gradle/wrapper/gradle-wrapper.jar‎

-9 Bytes
Binary file not shown.

‎demo-app/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
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-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)