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
2 changes: 2 additions & 0 deletions .github/workflows/benchmarks-smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ jobs:
./gradlew :benchmarks:run

benchmarks-wasm-d8:
# temporarily disabled after Compose update
if: false
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/desktop/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
mavenCentral()
}
}
2 changes: 1 addition & 1 deletion benchmarks/intellij/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version = "1.0-SNAPSHOT"
repositories {
mavenCentral()
google()
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
maven { url = uri("https://packages.jetbrains.team/maven/p/cmp/dev") }
}

dependencies {
Expand Down
5 changes: 4 additions & 1 deletion benchmarks/multiplatform/benchmarks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repositories {
mavenLocal()
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}

kotlin {
Expand Down Expand Up @@ -216,6 +216,8 @@ project.the<org.jetbrains.kotlin.gradle.targets.wasm.binaryen.BinaryenEnvSpec>()

val jsOrWasmRegex = Regex("js|wasm")

// not needed for now
/*
configurations.all {
resolutionStrategy.eachDependency {
if (requested.group.startsWith("org.jetbrains.skiko") &&
Expand All @@ -226,3 +228,4 @@ configurations.all {
}
}
}
*/
3 changes: 1 addition & 2 deletions benchmarks/multiplatform/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ allprojects {
repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
mavenLocal()
}
}
12 changes: 6 additions & 6 deletions benchmarks/multiplatform/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[versions]
compose-multiplatform = "1.8.1"
kotlin = "2.2.0"
kotlinx-coroutines = "1.8.0"
kotlinx-serialization = "1.8.0"
kotlinx-io = "0.7.0"
compose-multiplatform = "1.9.3"
kotlin = "2.2.21"
kotlinx-coroutines = "1.10.2"
kotlinx-serialization = "1.9.0"
kotlinx-io = "0.8.2"
kotlinx-datetime = "0.6.2"
ktor = "3.0.0-wasm2"
ktor = "3.3.3"

[libraries]
kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/multiplatform/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pluginManagement {
mavenLocal()
mavenCentral()
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we setup an URL similar to Kotlin in the future (maybe not now). Something like:

https://redirector.kotlinlang.org/maven/cmp-dev/

This repo can be used by external users to use daily builds. https://packages.jetbrains.team looks like an internal link. Use cases:

  • users don't want to wait for 2-weakly builds to try a just committed change
  • we can ask users to try some build to investigate an issue or try a fix

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's the plan.
Unfortunately, there is already such a redirect to our old dev repo, so to not introduce further confusion I decide to migrate first, update redirect and then use it in our samples

google()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ci/build-helpers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ For exmaple, for [Skiko](https://github.com/JetBrains/skiko/blob/29d227acb689317
./gradlew publish
```

It is published automatically to https://maven.pkg.jetbrains.space/public/p/compose/internal on any change in the CMP sources by this CI task:
It is published automatically to https://packages.jetbrains.team/maven/p/cmp/dev on any change in the CMP sources by this CI task:
https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_PublishBuildHelpers

## Publish as a local library
Expand Down
2 changes: 1 addition & 1 deletion ci/build-helpers/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ fun PublishingExtension.configurePublishing(project: Project) {
name = "ComposeInternalRepo"
url = uri(
System.getenv("COMPOSE_INTERNAL_REPO_URL")
?: "https://maven.pkg.jetbrains.space/public/p/compose/internal"
?: "https://packages.jetbrains.team/maven/p/cmp/dev"
)
credentials {
username =
Expand Down
2 changes: 1 addition & 1 deletion ci/build-helpers/cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ val downloadArtifactsFromComposeDev by tasks.registering(DownloadFromSpaceMavenR
originalArtifactsRoot
)
})
spaceRepoUrl.set("https://maven.pkg.jetbrains.space/public/p/compose/dev")
spaceRepoUrl.set("https://packages.jetbrains.team/maven/p/cmp/dev")
}

val fixModulesBeforePublishing by tasks.registering(FixModulesBeforePublishingTask::class) {
Expand Down
2 changes: 1 addition & 1 deletion ci/build-helpers/cli/buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/space/maven")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion ci/build-helpers/publishing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

repositories {
maven("https://maven.pkg.jetbrains.space/public/p/space/maven")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}

val embeddedDependencies by configurations.creating { isTransitive = false }
Expand Down
2 changes: 1 addition & 1 deletion ci/compose-uber-jar/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class ComposeUberJarProperties {
get() = typedProperty<String>(COMPOSE_VERSION_FILE_PROPERTY)

val composeRepoUrl: String
get() = System.getenv("COMPOSE_REPO_URL") ?: "https://maven.pkg.jetbrains.space/public/p/compose/dev"
get() = System.getenv("COMPOSE_REPO_URL") ?: "https://packages.jetbrains.team/maven/p/cmp/dev"

val composeRepoUserName: String?
get() = System.getenv("COMPOSE_REPO_USERNAME")
Expand Down
2 changes: 1 addition & 1 deletion ci/templates/desktop-template/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
google()
}

Expand Down
2 changes: 1 addition & 1 deletion ci/templates/desktop-template/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}

plugins {
Expand Down
2 changes: 1 addition & 1 deletion ci/templates/html-library-template/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
google()
}

Expand Down
2 changes: 1 addition & 1 deletion ci/templates/html-library-template/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}

plugins {
Expand Down
2 changes: 1 addition & 1 deletion ci/templates/maven-test-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</repository>
<repository>
<id>composeDev</id>
<url>https://maven.pkg.jetbrains.space/public/p/compose/dev</url>
<url>https://packages.jetbrains.team/maven/p/cmp/dev</url>
</repository>
</repositories>

Expand Down
2 changes: 1 addition & 1 deletion ci/templates/multiplatform-template/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ subprojects {
repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}
}
2 changes: 1 addition & 1 deletion ci/templates/multiplatform-template/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
google()
}

Expand Down
4 changes: 2 additions & 2 deletions components/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pluginManagement {
google()
gradlePluginPortal()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
if (extra["compose.useMavenLocal"] == "true") {
mavenLocal()
}
Expand Down Expand Up @@ -31,7 +31,7 @@ dependencyResolutionManagement {
}
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}

versionCatalogs {
Expand Down
4 changes: 2 additions & 2 deletions compose/integrations/composable-test-cases/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ allprojects {
repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") // to test with kotlin dev builds
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
maven("https://redirector.kotlinlang.org/maven/dev/") // to test with kotlin dev builds

maven("https://packages.jetbrains.team/maven/p/kt/dev")
maven("https://redirector.kotlinlang.org/maven/dev")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ pluginManagement {
google()
gradlePluginPortal()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
maven("https://packages.jetbrains.team/maven/p/kt/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
maven("https://redirector.kotlinlang.org/maven/dev")
maven {
url = uri("${rootDir}/build/maven-project")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ allprojects {
repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pluginManagement {
google()
gradlePluginPortal()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
mavenLocal()
}

Expand Down
2 changes: 1 addition & 1 deletion compose/ios-manual-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ allprojects {
repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}
}
2 changes: 1 addition & 1 deletion compose/ios-manual-tests/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
google()
}

Expand Down
2 changes: 1 addition & 1 deletion compose/scripts/validateProjects.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Script to validate projects and verify if they can compile.
# Don't add examples, which don't depend on maven.pkg.jetbrains.space, because they won't be able to compile.
# Example must be buildable with dev builds, so they should have dev maven repo set up.

set -euo pipefail

Expand Down
2 changes: 1 addition & 1 deletion examples/chat/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ allprojects {
repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}
}
2 changes: 1 addition & 1 deletion examples/chat/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
google()
}

Expand Down
2 changes: 1 addition & 1 deletion examples/codeviewer/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ allprojects {
repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
mavenLocal()
}
}
2 changes: 1 addition & 1 deletion examples/codeviewer/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
google()
mavenLocal()
}
Expand Down
2 changes: 1 addition & 1 deletion examples/graphics-2d/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ allprojects {
repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}
}
2 changes: 1 addition & 1 deletion examples/graphics-2d/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
google()
}

Expand Down
2 changes: 1 addition & 1 deletion examples/html/compose-bird/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version = "1.0.0-alpha01"
// Add maven repositories
repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
google()
}

Expand Down
2 changes: 1 addition & 1 deletion examples/html/compose-bird/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}

plugins {
Expand Down
2 changes: 1 addition & 1 deletion examples/html/compose-in-js/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version = "1.0"
repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}


Expand Down
2 changes: 1 addition & 1 deletion examples/html/compose-in-js/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
}

plugins {
Expand Down
2 changes: 1 addition & 1 deletion examples/html/landing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://packages.jetbrains.team/maven/p/cmp/dev")
google()
}

Expand Down
Loading
Loading