Version bump 1.5.12

This change includes bunch of misc tech debt cleaning. - Use Compose Multiplatform dependencies instead of Google's Compose artifacts - Removed Previews from richtext-ui. - Renamed CodeBlock platform files. - Kotlin updated to 1.9.22 - Compose compiler update to 1.5.8 - Changed MarkdownSample to use CommonmarkAstNodeParser and do synchronous Markdown rendering.
halilozercan · Feb 9, 2024 · 67865da · 67865da
1 parent db4de67
commit 67865da
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 318 deletions.
diff --git a/android-sample/build.gradle.kts b/android-sample/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
   id("com.android.application")
   kotlin("android")
+  id("org.jetbrains.compose") version Compose.desktopVersion
 }
 
 android {
@@ -36,8 +37,8 @@ dependencies {
   implementation(project(":slideshow"))
   implementation(AndroidX.appcompat)
   implementation(Compose.activity)
-  implementation(Compose.foundation)
-  implementation(Compose.icons)
-  implementation(Compose.material)
-  implementation(Compose.tooling)
+  implementation(compose.foundation)
+  implementation(compose.materialIconsExtended)
+  implementation(compose.material)
+  implementation(compose.uiTooling)
 }
diff --git a/android-sample/src/main/java/com/zachklipp/richtext/sample/MarkdownSample.kt b/android-sample/src/main/java/com/zachklipp/richtext/sample/MarkdownSample.kt
@@ -30,8 +30,9 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.em
-import com.halilibo.richtext.commonmark.Markdown
+import com.halilibo.richtext.commonmark.CommonmarkAstNodeParser
 import com.halilibo.richtext.commonmark.MarkdownParseOptions
+import com.halilibo.richtext.markdown.Markdown
 import com.halilibo.richtext.ui.RichTextStyle
 import com.halilibo.richtext.ui.material.RichText
 import com.halilibo.richtext.ui.resolveDefaults
@@ -104,13 +105,19 @@ import com.halilibo.richtext.ui.resolveDefaults
         SelectionContainer {
           Column(Modifier.verticalScroll(rememberScrollState())) {
             ProvideTextStyle(TextStyle(lineHeight = 1.3.em)) {
+              val parser = remember(markdownParseOptions) {
+                CommonmarkAstNodeParser(markdownParseOptions)
+              }
+              val astNode = remember(parser) {
+                parser.parse(sampleMarkdown)
+              }
+
               RichText(
                 style = richTextStyle,
                 modifier = Modifier.padding(8.dp),
               ) {
                 Markdown(
-                  content = sampleMarkdown,
-                  markdownParseOptions = markdownParseOptions,
+                  astNode = astNode,
                   onLinkClicked = {
                     Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
                   }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -51,7 +51,7 @@ subprojects {
         allWarningsAsErrors = true
       }
 
-      freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
+      freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn", "-Xexpect-actual-classes")
     }
   }
 

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -16,7 +16,7 @@ object Network {
 
 object Kotlin {
   // keep in sync with buildSrc/build.gradle.kts
-  val version = "1.9.20"
+  val version = "1.9.22"
   val binaryCompatibilityValidatorPlugin = "org.jetbrains.kotlinx:binary-compatibility-validator:0.9.0"
   val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
 
@@ -31,19 +31,12 @@ val ktlint = "org.jlleitschuh.gradle:ktlint-gradle:10.0.0"
 
 object Compose {
   val version = "1.5.4"
-  val compilerVersion = "1.5.4"
-  val desktopVersion = "1.5.11"
+  val compilerVersion = "1.5.8"
+  val desktopVersion = "1.5.12"
   val activity = "androidx.activity:activity-compose:1.7.2"
-  val foundation = "androidx.compose.foundation:foundation:$version"
-  val material = "androidx.compose.material:material:$version"
-  val material3 = "androidx.compose.material3:material3:1.0.1"
-  val icons = "androidx.compose.material:material-icons-extended:$version"
-  val test = "androidx.ui:ui-test:$version"
-  val tooling = "androidx.compose.ui:ui-tooling:$version"
   val toolingData = "androidx.compose.ui:ui-tooling-data:$version"
-  val desktopPreview = "org.jetbrains.compose.ui:ui-tooling-preview-desktop:$desktopVersion"
   val multiplatformUiUtil = "org.jetbrains.compose.ui:ui-util:$desktopVersion"
-  val coil = "io.coil-kt:coil-compose:2.4.0"
+  val coil = "io.coil-kt:coil-compose:2.5.0"
 }
 
 object Commonmark {

diff --git a/docs/richtext-ui-material3.md b/docs/richtext-ui-material3.md
@@ -1,4 +1,4 @@
-# Richtext UI Material
+# Richtext UI Material 3
 
 [![Android Library](https://img.shields.io/badge/Platform-Android-green.svg?style=for-the-badge)](https://developer.android.com/studio/build/dependencies)
 [![JVM Library](https://img.shields.io/badge/Platform-JVM-red.svg?style=for-the-badge)](https://kotlinlang.org/docs/mpp-intro.html)

diff --git a/printing/build.gradle.kts b/printing/build.gradle.kts
@@ -1,21 +1,22 @@
 plugins {
   id("richtext-android-library")
   id("org.jetbrains.dokka")
+  id("org.jetbrains.compose") version Compose.desktopVersion
 }
 
 android {
   namespace = "com.zachklipp.richtext.ui.printing"
 }
 
 dependencies {
-  implementation(Compose.foundation)
-  implementation(Compose.tooling)
+  implementation(compose.foundation)
+  implementation(compose.uiTooling)
   // For slot table analysis.
   implementation(Compose.toolingData)
   implementation(Compose.activity)
 
   // TODO Migrate off this.
-  implementation(Compose.material)
+  implementation(compose.material)
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).all {

diff --git a/richtext-markdown/gradle.properties b/richtext-markdown/gradle.properties
@@ -1,2 +1,2 @@
-POM_NAME=Compose Richtext Commonmark
-POM_DESCRIPTION=A library for rendering markdown in Compose using the Commonmark library.
+POM_NAME=Compose Richtext Markdown
+POM_DESCRIPTION=A library for rendering markdown represented as an AST in Compose.
diff --git a/richtext-ui/build.gradle.kts b/richtext-ui/build.gradle.kts
@@ -28,10 +28,6 @@ kotlin {
     }
     val jvmMain by getting {
       kotlin.srcDir("src/commonJvmAndroid/kotlin")
-      dependencies {
-        // requires installing https://plugins.jetbrains.com/plugin/16541-compose-multiplatform-ide-support
-        implementation(Compose.desktopPreview)
-      }
     }
   }
 }
diff --git a/...lin/com/halilibo/richtext/ui/CodeBlock.kt → ...halilibo/richtext/ui/CodeBlock.android.kt b/...lin/com/halilibo/richtext/ui/CodeBlock.kt → ...halilibo/richtext/ui/CodeBlock.android.kt
@@ -1,4 +1,3 @@
-@file:JvmName("CodeBlockAndroid")
 package com.halilibo.richtext.ui
 
 import androidx.compose.foundation.horizontalScroll

diff --git a/...t-ui/src/commonMain/kotlin/com/halilibo/richtext/ui/util/ConditionalTapGestureDetector.kt b/...t-ui/src/commonMain/kotlin/com/halilibo/richtext/ui/util/ConditionalTapGestureDetector.kt
@@ -6,13 +6,11 @@ import androidx.compose.foundation.gestures.GestureCancellationException
 import androidx.compose.foundation.gestures.PressGestureScope
 import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.gestures.forEachGesture
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.pointer.AwaitPointerEventScope
-import androidx.compose.ui.input.pointer.PointerEventTimeoutCancellationException
 import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventTimeoutCancellationException
 import androidx.compose.ui.input.pointer.PointerInputChange
 import androidx.compose.ui.input.pointer.PointerInputScope
 import androidx.compose.ui.input.pointer.changedToUp

diff --git a/...lin/com/halilibo/richtext/ui/CodeBlock.kt → ...halilibo/richtext/ui/CodeBlock.desktop.kt b/...lin/com/halilibo/richtext/ui/CodeBlock.kt → ...halilibo/richtext/ui/CodeBlock.desktop.kt
@@ -1,4 +1,3 @@
-@file:JvmName("CodeBlockJvm")
 package com.halilibo.richtext.ui
 
 import androidx.compose.foundation.HorizontalScrollbar

diff --git a/richtext-ui/src/jvmMain/kotlin/com/halilibo/richtext/ui/previews/BlockQuotePreview.kt b/richtext-ui/src/jvmMain/kotlin/com/halilibo/richtext/ui/previews/BlockQuotePreview.kt
diff --git a/richtext-ui/src/jvmMain/kotlin/com/halilibo/richtext/ui/previews/CodeBlockPreview.kt b/richtext-ui/src/jvmMain/kotlin/com/halilibo/richtext/ui/previews/CodeBlockPreview.kt
diff --git a/richtext-ui/src/jvmMain/kotlin/com/halilibo/richtext/ui/previews/FormattedListPreview.kt b/richtext-ui/src/jvmMain/kotlin/com/halilibo/richtext/ui/previews/FormattedListPreview.kt
diff --git a/richtext-ui/src/jvmMain/kotlin/com/halilibo/richtext/ui/previews/HeadingPreview.kt b/richtext-ui/src/jvmMain/kotlin/com/halilibo/richtext/ui/previews/HeadingPreview.kt
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ subprojects { @@
             allWarningsAsErrors = true
           }
-          freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
+          freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn", "-Xexpect-actual-classes")
         }
       }
@@ Expand Down @@