Skip to content

Use Kotlin 2.2.20 #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
egorikftp wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use Kotlin 2.2.20 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ sample-compileSdk = "36"
sample-minSdk = "23"
sample-targetSdk = "36"

kotlin = "2.3.10"
kotlin = "2.2.20"
jetbrains-compose = "1.10.1"
camerax = "1.5.3"
lifecycle = "2.9.6"
Expand Down
1 change: 0 additions & 1 deletion sample/app-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,4 @@ dependencies {
implementation(libs.androidx.hilt.compose)
implementation(libs.hilt.android)
ksp(libs.hilt.compiler)
ksp("org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10") // hilt + android 2.3.0 workaround
}
5 changes: 4 additions & 1 deletion sample/app-wasm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ kotlin {
commonWebpackConfig {
outputFileName = "tiamatApp.js"
devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply {
static(project.projectDir.path)
static = (static ?: mutableListOf()).apply {
// Serve sources to debug inside browser
add(project.projectDir.path)
}
}
}
}
Expand Down
1 change: 0 additions & 1 deletion tiamat-destinations/compiler-plugin/api/tiamat-destinations-compiler.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public final class com/composegears/tiamat/destinations/TiamatDestinationsComman

public final class com/composegears/tiamat/destinations/TiamatDestinationsComponentRegistrar : org/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar {
public fun <init> ()V
public fun getPluginId ()Ljava/lang/String;
public fun getSupportsK2 ()Z
public fun registerExtensions (Lorg/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar$ExtensionStorage;Lorg/jetbrains/kotlin/config/CompilerConfiguration;)V
}
Expand Down
1 change: 0 additions & 1 deletion .../main/kotlin/com/composegears/tiamat/destinations/TiamatDestinationsComponentRegistrar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import org.jetbrains.kotlin.config.CompilerConfiguration

@OptIn(ExperimentalCompilerApi::class)
class TiamatDestinationsComponentRegistrar : CompilerPluginRegistrar() {
override val pluginId: String = "tiamat-destinations-compiler"

override val supportsK2: Boolean = true

Expand Down