Skip to content

Commit 569a0cd

Browse files
skydovesskydoves
authored
Downgrade to Kotlin 1.9.25 (#1258)
1 parent fb6c09f commit 569a0cd

File tree

5 files changed

+60
-55
lines changed

5 files changed

+60
-55
lines changed

‎build-logic/convention/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ java {
1313
dependencies {
1414
compileOnly(libs.android.gradlePlugin)
1515
compileOnly(libs.kotlin.gradlePlugin)
16-
compileOnly(libs.compose.compiler.gradlePlugin)
16+
// compileOnly(libs.compose.compiler.gradlePlugin) -> Enable with Kotlin 2.0+
1717
compileOnly(libs.spotless.gradlePlugin)
1818
}
1919

‎build-logic/convention/src/main/kotlin/io/getstream/video/AndroidCompose.kt‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,27 @@ import org.gradle.kotlin.dsl.assign
77
import org.gradle.kotlin.dsl.configure
88
import org.gradle.kotlin.dsl.dependencies
99
import org.gradle.kotlin.dsl.getByType
10-
import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
11-
import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
10+
// import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
11+
// import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
1212

1313
/**
1414
* Configure Compose-specific options
1515
*/
1616
internal fun Project.configureAndroidCompose(
1717
commonExtension: CommonExtension<*, *, *, *, *, *>,
1818
) {
19-
pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
19+
// pluginManager.apply("org.jetbrains.kotlin.plugin.compose") -> Enable with Kotlin 2.0+
2020
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
2121

2222
commonExtension.apply {
2323
buildFeatures {
2424
compose = true
2525
}
26+
27+
// Remove this with Kotlin 2.0+
28+
composeOptions {
29+
kotlinCompilerExtensionVersion = "1.5.15"
30+
}
2631
}
2732

2833
dependencies {
@@ -31,9 +36,9 @@ internal fun Project.configureAndroidCompose(
3136
add("androidTestImplementation", platform(bom))
3237
}
3338

34-
extensions.configure<ComposeCompilerGradlePluginExtension> {
35-
featureFlags.addAll(ComposeFeatureFlag.StrongSkipping, ComposeFeatureFlag.IntrinsicRemember)
36-
reportsDestination = layout.buildDirectory.dir("compose_compiler")
37-
stabilityConfigurationFile = rootProject.layout.projectDirectory.file("compose_compiler_config.conf")
38-
}
39+
// extensions.configure<ComposeCompilerGradlePluginExtension> { -> Enable with Kotlin 2.0+
40+
// featureFlags.addAll(ComposeFeatureFlag.StrongSkipping, ComposeFeatureFlag.IntrinsicRemember)
41+
// reportsDestination = layout.buildDirectory.dir("compose_compiler")
42+
// stabilityConfigurationFile = rootProject.layout.projectDirectory.file("compose_compiler_config.conf")
43+
// }
3944
}

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
plugins {
1414
alias(libs.plugins.android.application) apply false
1515
alias(libs.plugins.kotlin.android) apply false
16-
alias(libs.plugins.compose.compiler) apply false
16+
// alias(libs.plugins.compose.compiler) apply false -> Enable with Kotlin 2.0+
1717
alias(libs.plugins.kotlin.serialization) apply false
1818
alias(libs.plugins.kotlin.compatibility.validator) apply false
1919
alias(libs.plugins.ksp) apply false

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ androidGradlePlugin = "8.4.2"
33
cameraCamera2 = "1.3.4"
44
spotless = "6.21.0"
55
nexusPlugin = "1.3.0"
6-
kotlin = "2.0.21"
7-
ksp = "2.0.21-1.0.26"
8-
kotlinSerialization = "1.7.3"
6+
kotlin = "1.9.25"
7+
ksp = "1.9.25-1.0.20"
8+
kotlinSerialization = "1.6.3"
99
kotlinSerializationConverter = "1.0.0"
1010
kotlinxCoroutines = "1.9.0"
1111

‎stream-video-android-core/api/stream-video-android-core.api‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3806,13 +3806,13 @@ public final class io/getstream/video/android/core/model/IceCandidate {
38063806
public fun toString ()Ljava/lang/String;
38073807
}
38083808

3809-
public synthetic class io/getstream/video/android/core/model/IceCandidate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
3809+
public final class io/getstream/video/android/core/model/IceCandidate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
38103810
public static final field INSTANCE Lio/getstream/video/android/core/model/IceCandidate$$serializer;
3811-
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
3812-
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/core/model/IceCandidate;
3811+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
3812+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/core/model/IceCandidate;
38133813
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
3814-
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
3815-
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/core/model/IceCandidate;)V
3814+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
3815+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/core/model/IceCandidate;)V
38163816
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
38173817
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
38183818
}
@@ -4408,13 +4408,13 @@ public final class io/getstream/video/android/core/socket/ErrorResponse : java/l
44084408
public fun toString ()Ljava/lang/String;
44094409
}
44104410

4411-
public synthetic class io/getstream/video/android/core/socket/ErrorResponse$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
4411+
public final class io/getstream/video/android/core/socket/ErrorResponse$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
44124412
public static final field INSTANCE Lio/getstream/video/android/core/socket/ErrorResponse$$serializer;
4413-
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
4414-
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/core/socket/ErrorResponse;
4413+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
4414+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/core/socket/ErrorResponse;
44154415
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
4416-
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
4417-
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/core/socket/ErrorResponse;)V
4416+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
4417+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/core/socket/ErrorResponse;)V
44184418
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
44194419
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
44204420
}
@@ -4435,13 +4435,13 @@ public final class io/getstream/video/android/core/socket/SocketError {
44354435
public fun toString ()Ljava/lang/String;
44364436
}
44374437

4438-
public synthetic class io/getstream/video/android/core/socket/SocketError$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
4438+
public final class io/getstream/video/android/core/socket/SocketError$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
44394439
public static final field INSTANCE Lio/getstream/video/android/core/socket/SocketError$$serializer;
4440-
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
4441-
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/core/socket/SocketError;
4440+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
4441+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/core/socket/SocketError;
44424442
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
4443-
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
4444-
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/core/socket/SocketError;)V
4443+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
4444+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/core/socket/SocketError;)V
44454445
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
44464446
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
44474447
}
@@ -6477,13 +6477,13 @@ public final class io/getstream/video/android/datastore/model/StreamUserPreferen
64776477
public fun toString ()Ljava/lang/String;
64786478
}
64796479

6480-
public synthetic class io/getstream/video/android/datastore/model/StreamUserPreferences$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
6480+
public final class io/getstream/video/android/datastore/model/StreamUserPreferences$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
64816481
public static final field INSTANCE Lio/getstream/video/android/datastore/model/StreamUserPreferences$$serializer;
6482-
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
6483-
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/datastore/model/StreamUserPreferences;
6482+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
6483+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/datastore/model/StreamUserPreferences;
64846484
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
6485-
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
6486-
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/datastore/model/StreamUserPreferences;)V
6485+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
6486+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/datastore/model/StreamUserPreferences;)V
64876487
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
64886488
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
64896489
}
@@ -6508,13 +6508,13 @@ public final class io/getstream/video/android/model/Device {
65086508
public fun toString ()Ljava/lang/String;
65096509
}
65106510

6511-
public synthetic class io/getstream/video/android/model/Device$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
6511+
public final class io/getstream/video/android/model/Device$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
65126512
public static final field INSTANCE Lio/getstream/video/android/model/Device$$serializer;
6513-
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
6514-
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/model/Device;
6513+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
6514+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/model/Device;
65156515
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
6516-
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
6517-
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/model/Device;)V
6516+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
6517+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/model/Device;)V
65186518
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
65196519
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
65206520
}
@@ -6543,24 +6543,24 @@ public final class io/getstream/video/android/model/StreamCallId : android/os/Pa
65436543
public final fun component4 ()Z
65446544
public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lio/getstream/video/android/model/StreamCallId;
65456545
public static synthetic fun copy$default (Lio/getstream/video/android/model/StreamCallId;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Lio/getstream/video/android/model/StreamCallId;
6546-
public final fun describeContents ()I
6546+
public fun describeContents ()I
65476547
public fun equals (Ljava/lang/Object;)Z
65486548
public final fun getCid ()Ljava/lang/String;
65496549
public final fun getId ()Ljava/lang/String;
65506550
public final fun getType ()Ljava/lang/String;
65516551
public fun hashCode ()I
65526552
public final fun isValid ()Z
65536553
public fun toString ()Ljava/lang/String;
6554-
public final fun writeToParcel (Landroid/os/Parcel;I)V
6554+
public fun writeToParcel (Landroid/os/Parcel;I)V
65556555
}
65566556

6557-
public synthetic class io/getstream/video/android/model/StreamCallId$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
6557+
public final class io/getstream/video/android/model/StreamCallId$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
65586558
public static final field INSTANCE Lio/getstream/video/android/model/StreamCallId$$serializer;
6559-
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
6560-
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/model/StreamCallId;
6559+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
6560+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/model/StreamCallId;
65616561
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
6562-
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
6563-
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/model/StreamCallId;)V
6562+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
6563+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/model/StreamCallId;)V
65646564
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
65656565
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
65666566
}
@@ -6618,13 +6618,13 @@ public final class io/getstream/video/android/model/User {
66186618
public fun toString ()Ljava/lang/String;
66196619
}
66206620

6621-
public synthetic class io/getstream/video/android/model/User$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
6621+
public final class io/getstream/video/android/model/User$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
66226622
public static final field INSTANCE Lio/getstream/video/android/model/User$$serializer;
6623-
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
6624-
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/model/User;
6623+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
6624+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/model/User;
66256625
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
6626-
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
6627-
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/model/User;)V
6626+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
6627+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/model/User;)V
66286628
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
66296629
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
66306630
}
@@ -6664,13 +6664,13 @@ public final class io/getstream/video/android/model/UserDevices {
66646664
public fun toString ()Ljava/lang/String;
66656665
}
66666666

6667-
public synthetic class io/getstream/video/android/model/UserDevices$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
6667+
public final class io/getstream/video/android/model/UserDevices$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
66686668
public static final field INSTANCE Lio/getstream/video/android/model/UserDevices$$serializer;
6669-
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
6670-
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/model/UserDevices;
6669+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
6670+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/getstream/video/android/model/UserDevices;
66716671
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
6672-
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
6673-
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/model/UserDevices;)V
6672+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
6673+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/getstream/video/android/model/UserDevices;)V
66746674
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
66756675
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
66766676
}

0 commit comments

Comments
 (0)