Skip to content

Commit 24f9b41

Browse files
committed
build: bump min supported kotlin to 2.0
1 parent 73b6d7f commit 24f9b41

7 files changed

Lines changed: 9 additions & 6 deletions

File tree

android-agent/api/android-agent.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public final class io/opentelemetry/android/agent/OpenTelemetryRumInitializer {
1010
public final class io/opentelemetry/android/agent/connectivity/Compression : java/lang/Enum {
1111
public static final field GZIP Lio/opentelemetry/android/agent/connectivity/Compression;
1212
public static final field NONE Lio/opentelemetry/android/agent/connectivity/Compression;
13+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
1314
public static fun valueOf (Ljava/lang/String;)Lio/opentelemetry/android/agent/connectivity/Compression;
1415
public static fun values ()[Lio/opentelemetry/android/agent/connectivity/Compression;
1516
}

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020

2121
extra["java_version"] = JavaVersion.VERSION_1_8
2222
extra["jvm_target"] = JvmTarget.JVM_1_8
23-
extra["kotlin_min_supported_version"] = KotlinVersion.KOTLIN_1_8
23+
extra["kotlin_min_supported_version"] = KotlinVersion.KOTLIN_2_0
2424

2525
allprojects {
2626
repositories {

common/api/common.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public final class io/opentelemetry/android/common/internal/features/networkattr
8181
public static final field TRANSPORT_VPN Lio/opentelemetry/android/common/internal/features/networkattributes/data/NetworkState;
8282
public static final field TRANSPORT_WIFI Lio/opentelemetry/android/common/internal/features/networkattributes/data/NetworkState;
8383
public static final field TRANSPORT_WIRED Lio/opentelemetry/android/common/internal/features/networkattributes/data/NetworkState;
84+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
8485
public final fun getHumanName ()Ljava/lang/String;
8586
public static fun valueOf (Ljava/lang/String;)Lio/opentelemetry/android/common/internal/features/networkattributes/data/NetworkState;
8687
public static fun values ()[Lio/opentelemetry/android/common/internal/features/networkattributes/data/NetworkState;

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ junit = "6.0.1"
88
byteBuddy = "1.18.2"
99
okhttp = "5.3.2"
1010
spotless = "8.1.0"
11-
kotlin = "2.2.21"
11+
kotlin = "2.3.0"
1212
androidPlugin = "8.13.2"
1313
kspPlugin = "2.3.3"
1414
junitKtx = "1.3.0"

instrumentation/compose/click/src/main/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeClickEventGenerator.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ internal class ComposeClickEventGenerator(
4141
.setAttribute(APP_SCREEN_COORDINATE_X, motionEvent.x.toLong())
4242
.emit()
4343

44-
composeTapTargetDetector.findTapTarget(window.decorView, motionEvent.x, motionEvent.y)?.let { layoutNode ->
44+
val node: LayoutNode? = composeTapTargetDetector.findTapTarget(window.decorView, motionEvent.x, motionEvent.y)
45+
node?.let { layoutNode ->
4546
createEvent(VIEW_CLICK_EVENT_NAME)
4647
.setAllAttributes(createNodeAttributes(layoutNode))
4748
.emit()

instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeInstrumentationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ internal class ComposeInstrumentationTest {
126126
every { window.decorView } returns composeView
127127
every { composeView.childCount } returns 0
128128

129-
val mockLayoutNode =
129+
val mockLayoutNode: LayoutNode =
130130
createMockLayoutNode(
131131
targetX = motionEvent.x,
132132
targetY = motionEvent.y,

instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeTapTargetDetectorTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ internal class ComposeTapTargetDetectorTest {
107107
MotionEvent.obtain(0L, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, 250f, 50f, 0)
108108
every { composeView.childCount } returns 0
109109

110-
val mockLayoutNode =
110+
val mockLayoutNode: LayoutNode =
111111
createMockLayoutNode(
112112
targetX = motionEvent.x,
113113
targetY = motionEvent.y,
@@ -128,7 +128,7 @@ internal class ComposeTapTargetDetectorTest {
128128
MotionEvent.obtain(0L, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, 250f, 50f, 0)
129129
every { composeView.childCount } returns 0
130130

131-
val mockLayoutNode =
131+
val mockLayoutNode: LayoutNode =
132132
createMockLayoutNode(
133133
targetX = motionEvent.x,
134134
targetY = motionEvent.y,

0 commit comments

Comments
 (0)