Merge pull request #332 from MohamedRejeb/main

Merge main into 1.x

Author: MohamedRejeb

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2024 Mohamed Rejeb
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -20,17 +20,19 @@ A rich text editor library for both Jetpack Compose and Compose Multiplatform, f
 
 Compose Rich Editor is available on `mavenCentral()`.
 
-### K1
-
 ```kotlin
-implementation("com.mohamedrejeb.richeditor:richeditor-compose:1.0.0-rc05")
+implementation("com.mohamedrejeb.richeditor:richeditor-compose:1.0.0-rc06")
 ```
 
-### K2
+## Compatibility
 
-```kotlin
-implementation("com.mohamedrejeb.richeditor:richeditor-compose:1.0.0-rc05-k2")
-```
+[![Maven Central](https://img.shields.io/maven-central/v/com.mohamedrejeb.richeditor/richeditor-compose)](https://search.maven.org/search?q=g:%22com.mohamedrejeb.richeditor%22%20AND%20a:%22richeditor-compose%22)
+
+| Kotlin version | Compose version | Compose Rich Editor version |
+|----------------|-----------------|-----------------------------|
+| 2.0.10         | 1.6.11          | 1.0.0-rc06                  |
+| 2.0.0          | 1.6.10          | 1.0.0-rc05-k2               |
+| 1.9.24         | 1.6.10          | 1.0.0-rc05                  |
 
 ## Quick Start
 

build.gradle.kts

@@ -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)
 }

convention-plugins/src/main/kotlin/root.publication.gradle.kts

@@ -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-rc06"
 }
 
 nexusPublishing {

docs/index.md

@@ -18,17 +18,19 @@ A rich text editor library for both Jetpack Compose and Compose Multiplatform, f
 
 Compose Rich Editor is available on `mavenCentral()`.
 
-### K1
-
 ```kotlin
-implementation("com.mohamedrejeb.richeditor:richeditor-compose:1.0.0-rc05")
+implementation("com.mohamedrejeb.richeditor:richeditor-compose:1.0.0-rc06")
 ```
 
-### K2
+## Compatibility
 
-```kotlin
-implementation("com.mohamedrejeb.richeditor:richeditor-compose:1.0.0-rc05-k2")
-```
+[![Maven Central](https://img.shields.io/maven-central/v/com.mohamedrejeb.richeditor/richeditor-compose)](https://search.maven.org/search?q=g:%22com.mohamedrejeb.richeditor%22%20AND%20a:%22richeditor-compose%22)
+
+| Kotlin version | Compose version | Compose Rich Editor version |
+|----------------|-----------------|-----------------------------|
+| 2.0.10         | 1.6.11          | 1.0.0-rc06                  |
+| 2.0.0          | 1.6.10          | 1.0.0-rc05-k2               |
+| 1.9.24         | 1.6.10          | 1.0.0-rc05                  |
 
 ## Quick Start
 

gradle/libs.versions.toml

@@ -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"
 
@@ -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" }
@@ -38,18 +39,20 @@ 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" }
 ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
+ktor-client-wasm = { module = "io.ktor:ktor-client-js-wasm-js", version.ref = "ktor" }
 
 [plugins]
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 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"