Skip to content
New issue

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

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

Already on GitHub? # to your account

Update kotlin to 2.0.10 #286

Merged
merged 16 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ plugins {
alias(libs.plugins.kotlinAndroid).apply(false)
alias(libs.plugins.kotlinMultiplatform).apply(false)
alias(libs.plugins.composeMultiplatform).apply(false)
alias(libs.plugins.compose.compiler).apply(false)
alias(libs.plugins.bcv).apply(false)
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

allprojects {
group = "com.mohamedrejeb.richeditor"
version = System.getenv("VERSION") ?: "1.0.0-rc05"
version = System.getenv("VERSION") ?: "1.0.0-rc05-k2"
}

nexusPublishing {
Expand Down
24 changes: 13 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[versions]
agp = "8.2.2"
kotlin = "1.9.24"
compose = "1.6.10"
kotlin = "2.0.10"
compose = "1.6.11"
dokka = "1.9.10"

ksoup = "0.3.2"
jetbrainsMarkdown = "0.7.0"
coil = "3.0.0-alpha06"
ksoup = "0.4.0"
jetbrainsMarkdown = "0.7.3"
coil = "3.0.0-alpha10"

nexus-publish = "2.0.0"

# For sample
compose-compiler = "1.5.14"
activity-compose = "1.9.0"
voyager = "1.1.0-alpha04"
richeditor = "1.0.0-rc04"
androidx-appcompat = "1.7.0"
activity-compose = "1.9.1"
voyager = "1.1.0-beta02"
richeditor = "1.0.0-rc05"
coroutines = "1.8.1"
ktor = "3.0.0-wasm2"
ktor = "3.0.0-beta-2"
android-minSdk = "21"
android-compileSdk = "34"

Expand All @@ -30,6 +30,7 @@ coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil"
nexus-publish = { module = "io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin", version.ref = "nexus-publish" }

# For sample
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
richeditor-compose = { module = "com.mohamedrejeb.richeditor:richeditor-compose", version.ref = "richeditor" }
Expand All @@ -38,7 +39,7 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine
kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }

coil-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil" }
coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor", version.ref = "coil" }
coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }

ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
Expand All @@ -51,5 +52,6 @@ androidApplication = { id = "com.android.application", version.ref = "agp" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
bcv = "org.jetbrains.kotlinx.binary-compatibility-validator:0.16.2"
1,215 changes: 720 additions & 495 deletions kotlin-js-store/yarn.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ final object com.mohamedrejeb.richeditor.coil3/Coil3ImageLoader : com.mohamedrej
final fun load(kotlin/Any, androidx.compose.runtime/Composer?, kotlin/Int): com.mohamedrejeb.richeditor.model/ImageData // com.mohamedrejeb.richeditor.coil3/Coil3ImageLoader.load|load(kotlin.Any;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
}

final const val com.mohamedrejeb.richeditor.coil3/com_mohamedrejeb_richeditor_coil3_Coil3ImageLoader$stableprop // com.mohamedrejeb.richeditor.coil3/com_mohamedrejeb_richeditor_coil3_Coil3ImageLoader$stableprop|#static{}com_mohamedrejeb_richeditor_coil3_Coil3ImageLoader$stableprop[0]
final val com.mohamedrejeb.richeditor.coil3/com_mohamedrejeb_richeditor_coil3_Coil3ImageLoader$stableprop // com.mohamedrejeb.richeditor.coil3/com_mohamedrejeb_richeditor_coil3_Coil3ImageLoader$stableprop|#static{}com_mohamedrejeb_richeditor_coil3_Coil3ImageLoader$stableprop[0]

final fun com.mohamedrejeb.richeditor.coil3/com_mohamedrejeb_richeditor_coil3_Coil3ImageLoader$stableprop_getter(): kotlin/Int // com.mohamedrejeb.richeditor.coil3/com_mohamedrejeb_richeditor_coil3_Coil3ImageLoader$stableprop_getter|com_mohamedrejeb_richeditor_coil3_Coil3ImageLoader$stableprop_getter(){}[0]
19 changes: 12 additions & 7 deletions richeditor-compose-coil3/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl

plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.androidLibrary)
alias(libs.plugins.bcv)
Expand All @@ -11,17 +14,18 @@ plugins {
kotlin {
explicitApi()
applyDefaultHierarchyTemplate()

androidTarget {
publishLibraryVariants("release")
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_1_8)
}
}
jvm("desktop") {
jvmToolchain(11)
}

jvmToolchain(11)
jvm("desktop")

js(IR) {
browser()
}
Expand All @@ -33,6 +37,7 @@ kotlin {
}
}
}

iosX64()
iosArm64()
iosSimulatorArm64()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
import com.mohamedrejeb.richeditor.model.ImageData
import com.mohamedrejeb.richeditor.model.ImageLoader

@OptIn(ExperimentalRichTextApi::class)
@ExperimentalRichTextApi
public object Coil3ImageLoader: ImageLoader {

@Composable
Expand Down
Loading
Loading