Skip to content

Commit 786e8a4

Browse files
dependabot[bot]svenjacobs
dependabot[bot]
and
svenjacobs
authored
chore(deps): Bump the kotlin group with 3 updates (Kotlin 2.2.0) (#234)
* chore(deps): Bump the kotlin group with 3 updates Bumps the kotlin group with 3 updates: [org.jetbrains.kotlin.android](https://github.com/JetBrains/kotlin), [org.jetbrains.kotlin.multiplatform](https://github.com/JetBrains/kotlin) and [org.jetbrains.kotlin.plugin.compose](https://github.com/JetBrains/kotlin). Updates `org.jetbrains.kotlin.android` from 2.1.21 to 2.2.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.21...v2.2.0) Updates `org.jetbrains.kotlin.multiplatform` from 2.1.21 to 2.2.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.21...v2.2.0) Updates `org.jetbrains.kotlin.plugin.compose` from 2.1.21 to 2.2.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.21...v2.2.0) Updates `org.jetbrains.kotlin.multiplatform` from 2.1.21 to 2.2.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.21...v2.2.0) Updates `org.jetbrains.kotlin.plugin.compose` from 2.1.21 to 2.2.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.21...v2.2.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.android dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin - dependency-name: org.jetbrains.kotlin.multiplatform dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin - dependency-name: org.jetbrains.kotlin.plugin.compose dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin - dependency-name: org.jetbrains.kotlin.multiplatform dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin - dependency-name: org.jetbrains.kotlin.plugin.compose dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin ... Signed-off-by: dependabot[bot] <support@github.com> * chore: api dump * chore: remove deprecations --------- 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 c936b07 commit 786e8a4

File tree

5 files changed

+30
-12
lines changed

5 files changed

+30
-12
lines changed

‎android-tests/build.gradle.kts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
alias(libs.plugins.android.application)
35
alias(libs.plugins.jetbrains.kotlin.android)
@@ -43,15 +45,17 @@ android {
4345
targetCompatibility = JavaVersion.VERSION_11
4446
}
4547

46-
kotlinOptions {
47-
jvmTarget = "11"
48-
}
49-
5048
buildFeatures {
5149
compose = true
5250
}
5351
}
5452

53+
kotlin {
54+
compilerOptions {
55+
jvmTarget = JvmTarget.JVM_11
56+
}
57+
}
58+
5559
dependencies {
5660
implementation(project(":reveal-core"))
5761
implementation(project(":reveal-shapes"))

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ android-gradle-plugin = "8.11.0"
33
androidx-activity = "1.10.1"
44
androidx-compose-bom = "2025.06.01" # https://developer.android.com/jetpack/compose/bom/bom-mapping
55
jetbrains-compose = "1.8.1"
6-
kotlin = "2.1.21"
6+
kotlin = "2.2.0"
77

88
[libraries]
99
androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" }

‎reveal-compat-android/build.gradle.kts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
alias(libs.plugins.android.library)
35
alias(libs.plugins.jetbrains.kotlin.android)
@@ -46,11 +48,6 @@ android {
4648
targetCompatibility = JavaVersion.VERSION_11
4749
}
4850

49-
kotlinOptions {
50-
jvmTarget = "11"
51-
freeCompilerArgs += "-Xexplicit-api=strict"
52-
}
53-
5451
buildFeatures {
5552
compose = true
5653
}
@@ -66,6 +63,13 @@ android {
6663
}
6764
}
6865

66+
kotlin {
67+
explicitApi()
68+
compilerOptions {
69+
jvmTarget = JvmTarget.JVM_11
70+
}
71+
}
72+
6973
publishing {
7074
publications {
7175
register<MavenPublication>("release") {

‎reveal-core/api/android/reveal-core.api‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ public abstract interface class com/svenjacobs/reveal/RevealOverlayArrangement$V
110110
public abstract interface class com/svenjacobs/reveal/RevealOverlayScope {
111111
public abstract fun align (Landroidx/compose/ui/Modifier;Lcom/svenjacobs/reveal/RevealOverlayArrangement$Horizontal;Landroidx/compose/ui/Alignment$Vertical;Z)Landroidx/compose/ui/Modifier;
112112
public abstract fun align (Landroidx/compose/ui/Modifier;Lcom/svenjacobs/reveal/RevealOverlayArrangement$Vertical;Landroidx/compose/ui/Alignment$Horizontal;Z)Landroidx/compose/ui/Modifier;
113+
public static synthetic fun align$default (Lcom/svenjacobs/reveal/RevealOverlayScope;Landroidx/compose/ui/Modifier;Lcom/svenjacobs/reveal/RevealOverlayArrangement$Horizontal;Landroidx/compose/ui/Alignment$Vertical;ZILjava/lang/Object;)Landroidx/compose/ui/Modifier;
114+
public static synthetic fun align$default (Lcom/svenjacobs/reveal/RevealOverlayScope;Landroidx/compose/ui/Modifier;Lcom/svenjacobs/reveal/RevealOverlayArrangement$Vertical;Landroidx/compose/ui/Alignment$Horizontal;ZILjava/lang/Object;)Landroidx/compose/ui/Modifier;
113115
}
114116

115117
public final class com/svenjacobs/reveal/RevealOverlayScope$DefaultImpls {
@@ -121,6 +123,9 @@ public abstract interface class com/svenjacobs/reveal/RevealScope {
121123
public abstract fun revealable (Landroidx/compose/ui/Modifier;Ljava/lang/Iterable;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
122124
public abstract fun revealable (Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
123125
public abstract fun revealable (Landroidx/compose/ui/Modifier;[Ljava/lang/Object;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
126+
public static synthetic fun revealable$default (Lcom/svenjacobs/reveal/RevealScope;Landroidx/compose/ui/Modifier;Ljava/lang/Iterable;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
127+
public static synthetic fun revealable$default (Lcom/svenjacobs/reveal/RevealScope;Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
128+
public static synthetic fun revealable$default (Lcom/svenjacobs/reveal/RevealScope;Landroidx/compose/ui/Modifier;[Ljava/lang/Object;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
124129
}
125130

126131
public final class com/svenjacobs/reveal/RevealScope$DefaultImpls {
@@ -130,7 +135,7 @@ public final class com/svenjacobs/reveal/RevealScope$DefaultImpls {
130135
}
131136

132137
public abstract interface class com/svenjacobs/reveal/RevealShape {
133-
public abstract fun asRect-uvyYCjk (J)Landroidx/compose/ui/geometry/Rect;
138+
public fun asRect-uvyYCjk (J)Landroidx/compose/ui/geometry/Rect;
134139
public abstract fun clip-Pq9zytI (JLandroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;)Landroidx/compose/ui/graphics/Path;
135140
}
136141

‎reveal-core/api/desktop/reveal-core.api‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ public abstract interface class com/svenjacobs/reveal/RevealOverlayArrangement$V
110110
public abstract interface class com/svenjacobs/reveal/RevealOverlayScope {
111111
public abstract fun align (Landroidx/compose/ui/Modifier;Lcom/svenjacobs/reveal/RevealOverlayArrangement$Horizontal;Landroidx/compose/ui/Alignment$Vertical;Z)Landroidx/compose/ui/Modifier;
112112
public abstract fun align (Landroidx/compose/ui/Modifier;Lcom/svenjacobs/reveal/RevealOverlayArrangement$Vertical;Landroidx/compose/ui/Alignment$Horizontal;Z)Landroidx/compose/ui/Modifier;
113+
public static synthetic fun align$default (Lcom/svenjacobs/reveal/RevealOverlayScope;Landroidx/compose/ui/Modifier;Lcom/svenjacobs/reveal/RevealOverlayArrangement$Horizontal;Landroidx/compose/ui/Alignment$Vertical;ZILjava/lang/Object;)Landroidx/compose/ui/Modifier;
114+
public static synthetic fun align$default (Lcom/svenjacobs/reveal/RevealOverlayScope;Landroidx/compose/ui/Modifier;Lcom/svenjacobs/reveal/RevealOverlayArrangement$Vertical;Landroidx/compose/ui/Alignment$Horizontal;ZILjava/lang/Object;)Landroidx/compose/ui/Modifier;
113115
}
114116

115117
public final class com/svenjacobs/reveal/RevealOverlayScope$DefaultImpls {
@@ -121,6 +123,9 @@ public abstract interface class com/svenjacobs/reveal/RevealScope {
121123
public abstract fun revealable (Landroidx/compose/ui/Modifier;Ljava/lang/Iterable;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
122124
public abstract fun revealable (Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
123125
public abstract fun revealable (Landroidx/compose/ui/Modifier;[Ljava/lang/Object;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
126+
public static synthetic fun revealable$default (Lcom/svenjacobs/reveal/RevealScope;Landroidx/compose/ui/Modifier;Ljava/lang/Iterable;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
127+
public static synthetic fun revealable$default (Lcom/svenjacobs/reveal/RevealScope;Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
128+
public static synthetic fun revealable$default (Lcom/svenjacobs/reveal/RevealScope;Landroidx/compose/ui/Modifier;[Ljava/lang/Object;Lcom/svenjacobs/reveal/RevealShape;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
124129
}
125130

126131
public final class com/svenjacobs/reveal/RevealScope$DefaultImpls {
@@ -130,7 +135,7 @@ public final class com/svenjacobs/reveal/RevealScope$DefaultImpls {
130135
}
131136

132137
public abstract interface class com/svenjacobs/reveal/RevealShape {
133-
public abstract fun asRect-uvyYCjk (J)Landroidx/compose/ui/geometry/Rect;
138+
public fun asRect-uvyYCjk (J)Landroidx/compose/ui/geometry/Rect;
134139
public abstract fun clip-Pq9zytI (JLandroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;)Landroidx/compose/ui/graphics/Path;
135140
}
136141

0 commit comments

Comments
 (0)