Skip to content
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.

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

Update kotlin to 1.9.10 and compose to 1.5.1 #105

Merged
merged 1 commit into from
Sep 6, 2023
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: 0 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ kotlin.mpp.enableCInteropCommonization=true

#Android
android.useAndroidX=true
android.disableAutomaticComponentCreation=true

#Web
kotlin.js.compiler=ir
org.jetbrains.compose.experimental.jscanvas.enabled=true

#iOS
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
agp = "7.4.2"
kotlin = "1.9.0"
compose = "1.5.0"
dokka = "1.8.20"
agp = "8.0.2"
kotlin = "1.9.10"
compose = "1.5.1"
dokka = "1.9.0"

ksoup = "0.2.1"
jetbrainsMarkdown = "0.3.1"

# For sample
compose-compiler = "1.4.6"
compose-compiler = "1.5.2"
activity-compose = "1.7.2"
voyager = "1.0.0-rc06"
richeditor = "1.0.0-beta02"
Expand Down
760 changes: 263 additions & 497 deletions kotlin-js-store/yarn.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions sample/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ kotlin {
dependencies {
api(compose.runtime)
api(compose.foundation)
api(compose.ui)
api(compose.material)
api(compose.material3)
api(compose.materialIconsExtended)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ fun RichEditorContent() {
RichTextEditor(
modifier = Modifier.fillMaxWidth(),
state = richTextState,
readOnly = true,
)

Divider(modifier = Modifier.padding(vertical = 20.dp))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
package com.mohamedrejeb.richeditor.sample.common

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.ComposeUIViewController
import com.moriatsushi.insetsx.WindowInsetsUIViewController
import platform.UIKit.*

@Suppress("unused", "FunctionName")
fun MainViewController(
topSafeArea: Float,
bottomSafeArea: Float
): UIViewController {
return WindowInsetsUIViewController {
fun MainViewController(): UIViewController {
return ComposeUIViewController {
Box(
modifier = Modifier
.fillMaxSize()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ struct ComposeViewControllerToSwiftUI: UIViewControllerRepresentable {
}

func makeUIViewController(context: Context) -> UIViewController {
return Main_iosKt.MainViewController(
topSafeArea: topSafeArea,
bottomSafeArea: bottomSafeArea
)
return Main_iosKt.MainViewController()
}

func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
Expand Down
1 change: 0 additions & 1 deletion sample/web/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ kotlin {
sourceSets {
val jsMain by getting {
dependencies {
implementation(compose.ui)
implementation(project(":sample:common"))
}
}
Expand Down
6 changes: 1 addition & 5 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
pluginManagement {
repositories {
google {
mavenContent {
releasesOnly()
}
}
google()
mavenCentral()
mavenLocal()
gradlePluginPortal()
Expand Down