Skip to content
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
26 changes: 13 additions & 13 deletions artwork/imageviewerrepo/fetching.list
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/1.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/2.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/3.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/4.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/5.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/6.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/7.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/8.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/9.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/10.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/11.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/12.jpg
https://raw.githubusercontent.com/JetBrains/compose-jb/master/artwork/imageviewerrepo/13.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/1.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/2.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/3.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/4.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/5.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/6.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/7.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/8.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/9.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/10.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/11.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/12.jpg
https://raw.githubusercontent.com/JetBrains/compose-multiplatform/master/artwork/imageviewerrepo/13.jpg
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ abstract class FixModulesBeforePublishingTask : DefaultTask() {

private fun fixPomIfNeeded(pom: PomDocument) {
pom.fillMissingTags(
projectUrl = "https://github.com/JetBrains/compose-jb",
projectUrl = "https://github.com/JetBrains/compose-multiplatform",
projectInceptionYear = "2020",
licenseName = "The Apache Software License, Version 2.0",
licenseUrl = "https://www.apache.org/licenses/LICENSE-2.0.txt",
licenseDistribution = "repo",
scmConnection = "scm:git:https://github.com/JetBrains/compose-jb.git",
scmDeveloperConnection = "scm:git:https://github.com/JetBrains/compose-jb.git",
scmUrl = "https://github.com/JetBrains/compose-jb",
scmConnection = "scm:git:https://github.com/JetBrains/compose-multiplatform.git",
scmDeveloperConnection = "scm:git:https://github.com/JetBrains/compose-multiplatform.git",
scmUrl = "https://github.com/JetBrains/compose-multiplatform",
developerName = "Compose Multiplatform Team",
developerOrganization = "JetBrains",
developerOrganizationUrl = "https://www.jetbrains.com",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import javax.xml.transform.dom.DOMSource
import javax.xml.transform.stream.StreamResult

/**
projectUrl = "https://github.com/JetBrains/compose-jb",
projectUrl = "https://github.com/JetBrains/compose-multiplatform",
projectInceptionYear = "2020",
licenseName = "The Apache Software License, Version 2.0",
licenseUrl = "https://www.apache.org/licenses/LICENSE-2.0.txt",
licenseDistribution = "repo",
scmConnection = "scm:git:https://github.com/JetBrains/compose-jb.git",
scmDeveloperConnection = "scm:git:https://github.com/JetBrains/compose-jb.git",
scmUrl = "https://github.com/JetBrains/compose-jb",
scmConnection = "scm:git:https://github.com/JetBrains/compose-multiplatform.git",
scmDeveloperConnection = "scm:git:https://github.com/JetBrains/compose-multiplatform.git",
scmUrl = "https://github.com/JetBrains/compose-multiplatform",
developerName = "Compose Multiplatform Team",
developerOrganization = "JetBrains",
developerOrganizationUrl = "https://www.jetbrains.com",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fun Project.configureMavenPublication(

pom {
this.name.set(name)
url.set("https://github.com/JetBrains/compose-jb")
url.set("https://github.com/JetBrains/compose-multiplatform")
licenses {
license {
this.name.set("The Apache License, Version 2.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Tests {

@Test
// Issue: content.Abc$composable_z540rc_k$ is not a function
// https://github.com/JetBrains/compose-jb/issues/2549
// https://youtrack.jetbrains.com/issue/CMP-2549
fun testComposableInAnonymousObject() = runTest {
val root = composeText {
val content: HasComposable2 = createHasComposable()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface SomeInterface {
}

// Known to fail with k/js and decoys enabled
// https://github.com/JetBrains/compose-jb/issues/2615
// https://youtrack.jetbrains.com/issue/CMP-2615
@Composable
fun CallsRememberAnonymousObject() {
val obj = remember { object {} }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ fun ComposeWebLibraries() {
A(attrs = {
classes(WtTexts.wtButton, WtTexts.wtButtonThemeLight, WtOffsets.wtTopOffset48, WtOffsets.wtTopOffsetSm24)
target(ATarget.Blank)
}, href = "https://github.com/jetbrains/compose-jb#compose-for-web") {
}, href = "https://github.com/jetbrains/compose-multiplatform#compose-html") {
Text("See all features")
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private fun getCards(): List<GetStartedCardPresentation> {
links = listOf(
LinkOnCard(
linkText = "View tutorial",
linkUrl = "https://github.com/JetBrains/compose-jb/tree/master/tutorials/Web/Getting_Started"
linkUrl = "https://github.com/JetBrains/compose-multiplatform/tree/master/tutorials/HTML/Getting_Started"
)
)
),
Expand All @@ -32,7 +32,7 @@ private fun getCards(): List<GetStartedCardPresentation> {
links = listOf(
LinkOnCard(
linkText = "Explore the source code",
linkUrl = "https://github.com/JetBrains/compose-jb/tree/master/examples/web-landing"
linkUrl = "https://github.com/JetBrains/compose-multiplatform/tree/master/examples/html/landing"
)
)
),
Expand All @@ -42,7 +42,7 @@ private fun getCards(): List<GetStartedCardPresentation> {
links = listOf(
LinkOnCard(
linkText = "Explore the source code",
linkUrl = "https://github.com/JetBrains/compose-jb/tree/master/examples/web-compose-bird"
linkUrl = "https://github.com/JetBrains/compose-multiplatform/tree/master/examples/html/compose-bird"
),
LinkOnCard(
linkText = "Play",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private fun IntroAboutComposeWeb() {
classes(WtTexts.wtButton, WtOffsets.wtTopOffset24)
target(ATarget.Blank)
},
href = "https://github.com/jetbrains/compose-jb"
href = "https://github.com/jetbrains/compose-multiplatform"
) {
Text("Explore on GitHub")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fun ApplicationScope.ImageViewerDesktop() {
size = getPreferredWindowSize(720, 857)
),
icon = painterResource(Res.drawable.ic_imageviewer_round),
// https://github.com/JetBrains/compose-jb/issues/2741
// https://youtrack.jetbrains.com/issue/CMP-2741
onKeyEvent = {
if (it.type == KeyEventType.KeyUp) {
when (it.key) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import java.util.*
private fun decode(input: String) = input.toCharArray().map { it + 1 }.joinToString("")

val defaultAuth = decode("/`4/81b6db605e8d6``bdc7ecba8d2/a7/370`20")
val defaultRepo = Pair("JetBrains", "compose-jb")
val defaultRepo = Pair("JetBrains", "compose-multiplatform")

sealed class Result<out R> {
data class Success<out T>(val data: T) : Result<T>()
Expand Down
2 changes: 1 addition & 1 deletion examples/issues/desktop/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.compose.desktop.application.dsl.TargetFormat

plugins {
kotlin("multiplatform") // kotlin("jvm") doesn't work well in IDEA/AndroidStudio (https://github.com/JetBrains/compose-jb/issues/22)
kotlin("multiplatform")
kotlin("plugin.compose")
id("org.jetbrains.compose")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import java.awt.Dimension
* val VIDEO_URL = """file:///${Path("videos/example.mp4")}"""
* ```
* To package a video with the app distributable,
* see [this tutorial](https://github.com/JetBrains/compose-jb/tree/master/tutorials/Native_distributions_and_local_execution#adding-files-to-packaged-application)
* see [this tutorial](https://kotlinlang.org/docs/multiplatform/compose-native-distribution.html#adding-files-to-packaged-application)
* and then use a URL syntax like this:
* ```kotlin
* val VIDEO_URL = """file:///${Path(System.getProperty("compose.application.resources.dir")) / "example.mp4"}"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ internal actual fun VideoPlayerImpl(
/*
* To be able to access window in the commented code below,
* extend the player composable function from WindowScope.
* See https://github.com/JetBrains/compose-jb/issues/176#issuecomment-812514936
* See https://github.com/JetBrains/compose-multiplatform/issues/176#issuecomment-812514936
* and its subsequent comments.
*
* We could also just fullscreen the whole window:
* `window.placement = WindowPlacement.Fullscreen`
* See https://github.com/JetBrains/compose-multiplatform/issues/1489
* See https://youtrack.jetbrains.com/issue/CMP-5141
*/
// mediaPlayer.fullScreen().strategy(ExclusiveModeFullScreenStrategy(window))
mediaPlayer.fullScreen().toggle()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fun Project.configureMavenPublication(

pom {
this.name.set(name)
url.set("https://github.com/JetBrains/compose-jb")
url.set("https://github.com/JetBrains/compose-multiplatform")
licenses {
license {
this.name.set("The Apache License, Version 2.0")
Expand Down
4 changes: 2 additions & 2 deletions gradle-plugins/buildSrc/src/main/kotlin/BuildProperties.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import org.gradle.api.Project
object BuildProperties {
const val name = "JetBrains Compose Plugin"
const val group = "org.jetbrains.compose"
const val website = "https://www.jetbrains.com/lp/compose/"
const val vcs = "https://github.com/JetBrains/compose-jb"
const val website = "https://kotlinlang.org/compose-multiplatform/"
const val vcs = "https://github.com/JetBrains/compose-multiplatform"
fun composeVersion(project: Project): String =
System.getenv("COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION")
?: project.findProperty("compose.version") as String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# https://github.com/Kotlin/kotlinx.coroutines/issues/2046
-dontwarn android.annotation.SuppressLint

# https://github.com/JetBrains/compose-jb/issues/2393
# https://youtrack.jetbrains.com/issue/CMP-2393
-dontnote kotlin.coroutines.jvm.internal.**
-dontnote kotlin.internal.**
-dontnote kotlin.jvm.internal.**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

kotlin {
// empty stub (no actual android app) to detect configuration conflicts
// like https://github.com/JetBrains/compose-jb/issues/2345
// like https://youtrack.jetbrains.com/issue/CMP-2345
androidLibrary {
namespace = "org.jetbrains.compose.testapp"
compileSdk = 35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {

kotlin {
// empty stub (no actual android app) to detect configuration conflicts
// like https://github.com/JetBrains/compose-jb/issues/2345
// like https://youtrack.jetbrains.com/issue/CMP-2345
androidLibrary {
namespace = "org.jetbrains.compose.testapp"
compileSdk = 35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

kotlin {
// empty stub (no actual android app) to detect configuration conflicts
// like https://github.com/JetBrains/compose-jb/issues/2345
// like https://youtrack.jetbrains.com/issue/CMP-2345
androidLibrary {
namespace = "org.jetbrains.compose.testapp"
compileSdk = 35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class AnonymousObjectsInComposable {

@Test
// Issue: content.Abc$composable_z540rc_k$ is not a function
// https://github.com/JetBrains/compose-jb/issues/2549
// https://youtrack.jetbrains.com/issue/CMP-2549
fun testComposableInAnonymousObject() {
renderComposableInBody {
val content: HasComposable2 = createHasComposable()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import kotlin.test.assertEquals
* Classes under tests are defined in jsMain intentionally.
* The reason is to test cross-module compilation + runtime behaviour.
*
* Reporeted Issues:
* https://github.com/JetBrains/compose-jb/issues/746
* https://github.com/JetBrains/compose-jb/issues/1052
* Reported Issues:
* https://youtrack.jetbrains.com/issue/CMP-6299
* https://youtrack.jetbrains.com/issue/CMP-5305
*/
class ComposablesInConstructorTests {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ class InheritanceTests {

@Test
// Issues:
// https://github.com/JetBrains/compose-jb/issues/2291
// https://github.com/JetBrains/compose-jb/issues/2660
// https://youtrack.jetbrains.com/issue/CMP-2291
// https://youtrack.jetbrains.com/issue/CMP-2660
fun implementComposableCollection() {
val collection = createComposableCollection().apply {
add {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import kotlin.test.assertEquals

/**
* Covers the issues:
* - https://github.com/JetBrains/compose-jb/issues/2539
* - https://github.com/JetBrains/compose-jb/issues/2535
* - https://youtrack.jetbrains.com/issue/CMP-2539
* - https://youtrack.jetbrains.com/issue/CMP-2535
*/
class StabilityTests {

Expand Down Expand Up @@ -187,7 +187,7 @@ class StabilityTests {
}


@Test // issue https://github.com/JetBrains/compose-jb/issues/2535
@Test // issue https://youtrack.jetbrains.com/issue/CMP-2535
fun test_remembers_correct_attrs() = runBlockingTest {
val root = document.body!!.appendElement("div") {
id = "root"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @Module:Main

// https://github.com/JetBrains/compose-jb/issues/1436
// https://youtrack.jetbrains.com/issue/CMP-5176

import kotlin.reflect.KProperty
import androidx.compose.runtime.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @Module:Main

// https://github.com/JetBrains/compose-jb/issues/827
// https://youtrack.jetbrains.com/issue/CMP-6374

import kotlin.reflect.KProperty
import androidx.compose.runtime.Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @Module:Main

// https://github.com/JetBrains/compose-jb/issues/1226
// https://youtrack.jetbrains.com/issue/CMP-6163

// TODO: move this to passing cases after kotlin 1.6.0
import kotlin.reflect.KProperty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class NullWrapper<T> : NullableWrapper<T>() {
override val value: T? get() = null
}

@Composable // https://github.com/JetBrains/compose-jb/issues/1226
@Composable // https://youtrack.jetbrains.com/issue/CMP-6163
fun <T> ComposableWithTypedDefaultValue(
onChange: (NullableWrapper<T>) -> Unit,
valueWrapper: NullableWrapper<T> = NullWrapper()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @Module:Main

// https://github.com/JetBrains/compose-jb/issues/827
// https://youtrack.jetbrains.com/issue/CMP-6374

import kotlin.reflect.KProperty
import androidx.compose.runtime.Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// https://github.com/JetBrains/compose-jb/issues/774
// https://youtrack.jetbrains.com/issue/CMP-6188
// fixed in https://github.com/JetBrains/androidx/pull/118

import androidx.compose.runtime.Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.jetbrains.compose.web.attributes

// if you change API for this interface, note that there is a link to this file in this tutorial: https://github.com/JetBrains/compose-jb/blob/master/tutorials/Web/Events_Handling/README.md#other-event-handlers
// if you change API for this interface, note that there is a link to this file in this tutorial: https://github.com/JetBrains/compose-multiplatform/blob/master/tutorials/HTML/Events_Handling/README.md#other-event-handlers

import androidx.compose.web.events.SyntheticDragEvent
import androidx.compose.web.events.SyntheticEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ open class StyleSheet(
@Suppress("EqualsOrHashCode")
internal class CSSSelfSelector(var selector: CSSSelector? = null) : CSSSelector() {
override fun toString(): String =
throw IllegalStateException("You can't concatenate `String + CSSSelector` which contains `self` or `root`. Use `selector(<your string>)` to convert `String` to `CSSSelector` for proper work. https://github.com/JetBrains/compose-jb/issues/1440")
throw IllegalStateException("You can't concatenate `String + CSSSelector` which contains `self` or `root`. Use `selector(<your string>)` to convert `String` to `CSSSelector` for proper work. https://youtrack.jetbrains.com/issue/CMP-5174")

override fun asString(): String =
selector?.asString() ?: throw IllegalStateException("You can't instantiate self")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import org.w3c.dom.Element

/**
* ElementScope allows adding effects to the Composable representing html element.
* Also see a tutorial: https://github.com/JetBrains/compose-jb/tree/master/tutorials/Web/Using_Effects
* Also see a tutorial: https://github.com/JetBrains/compose-multiplatform/tree/master/tutorials/HTML/Using_Effects
*
* Example:
* ```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ open class SyntheticMouseEvent internal constructor(
val ctrlKey: Boolean = nativeEvent.ctrlKey
val metaKey: Boolean = nativeEvent.metaKey

// https://github.com/JetBrains/compose-jb/issues/1053
// https://youtrack.jetbrains.com/issue/CMP-5304
// movementX and movementY are undefined in SafariMobile MouseEvent
val movementX: Int = (nativeEvent.asDynamic().movementX as? Int) ?: 0
val movementY: Int = (nativeEvent.asDynamic().movementY as? Int) ?: 0
Expand Down
2 changes: 1 addition & 1 deletion html/core/src/jsTest/kotlin/elements/AttributesTests.kt
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ class AttributesTests {
)
}

@Test // issue: https://github.com/JetBrains/compose-jb/issues/981
@Test // issue: https://youtrack.jetbrains.com/issue/CMP-6338
fun attributesUpdateShouldNotCauseInlineStylesCleanUp() = runTest {
var hasValue by mutableStateOf(false)

Expand Down
Loading