diff --git a/gradle-plugins/compose/src/test/test-projects/application/custom-compiler-args/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/custom-compiler-args/build.gradle index a802d1ec063..2949d9367f4 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/custom-compiler-args/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/custom-compiler-args/build.gradle @@ -6,11 +6,6 @@ plugins { id "org.jetbrains.compose" } -repositories { - google() - jetbrainsCompose() -} - kotlin { jvm("desktop") js(IR) { diff --git a/gradle-plugins/compose/src/test/test-projects/application/custom-compiler-args/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/custom-compiler-args/settings.gradle index ae2468d612c..083b143a651 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/custom-compiler-args/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/custom-compiler-args/settings.gradle @@ -6,6 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "simple" diff --git a/gradle-plugins/compose/src/test/test-projects/application/custom-compiler/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/custom-compiler/build.gradle index c67e4bf6133..dada61fc6f3 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/custom-compiler/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/custom-compiler/build.gradle @@ -7,8 +7,12 @@ plugins { } repositories { + mavenLocal() + mavenCentral() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } google() - jetbrainsCompose() } dependencies { diff --git a/gradle-plugins/compose/src/test/test-projects/application/customCompilerUnsupportedPlatformsWarning/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/customCompilerUnsupportedPlatformsWarning/build.gradle index 8b6820a3ddf..04c2be309bb 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/customCompilerUnsupportedPlatformsWarning/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/customCompilerUnsupportedPlatformsWarning/build.gradle @@ -3,11 +3,6 @@ plugins { id "org.jetbrains.compose" } -repositories { - google() - jetbrainsCompose() -} - kotlin { def platforms = project.property("platforms").split(",") if (platforms.contains("jvm")) { diff --git a/gradle-plugins/compose/src/test/test-projects/application/customCompilerUnsupportedPlatformsWarning/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/customCompilerUnsupportedPlatformsWarning/settings.gradle index 0a2b43ab6c6..fe85d46d013 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/customCompilerUnsupportedPlatformsWarning/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/customCompilerUnsupportedPlatformsWarning/settings.gradle @@ -6,6 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "customCompilerUnsupportedPlatformsWarning" diff --git a/gradle-plugins/compose/src/test/test-projects/application/defaultArgs/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/defaultArgs/settings.gradle index 9e2a3a08e0a..1531cffa135 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/defaultArgs/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/defaultArgs/settings.gradle @@ -6,5 +6,20 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } diff --git a/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/build.gradle index 0f75fc67978..427b63b1ad0 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/build.gradle @@ -5,14 +5,6 @@ plugins { id "org.jetbrains.compose" } -repositories { - google() - mavenCentral() - maven { - url "https://maven.pkg.jetbrains.space/public/p/compose/dev" - } -} - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation compose.desktop.currentOs diff --git a/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/settings.gradle index 9e2a3a08e0a..1531cffa135 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/settings.gradle @@ -6,5 +6,20 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } diff --git a/gradle-plugins/compose/src/test/test-projects/application/javaLogger/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/javaLogger/settings.gradle index 6994155e62e..de29cd85445 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/javaLogger/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/javaLogger/settings.gradle @@ -6,6 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "javaLogger" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/application/jvm/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/jvm/build.gradle index 6ec0e3b58ff..4ac0b9f8b21 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/jvm/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/jvm/build.gradle @@ -5,10 +5,6 @@ plugins { id "org.jetbrains.compose" } -repositories { - jetbrainsCompose() -} - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation compose.desktop.currentOs diff --git a/gradle-plugins/compose/src/test/test-projects/application/jvm/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/jvm/settings.gradle index 43d540efb8c..9df72a09ce6 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/jvm/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/jvm/settings.gradle @@ -6,6 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "simple" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/build.gradle.kts index 39d923ec20e..c8f6ac82b5d 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/build.gradle.kts +++ b/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/build.gradle.kts @@ -6,10 +6,6 @@ plugins { id("org.jetbrains.compose") } -repositories { - jetbrainsCompose() -} - dependencies { implementation(kotlin("stdlib")) implementation(compose.desktop.currentOs) diff --git a/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/settings.gradle index 43d540efb8c..9df72a09ce6 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/settings.gradle @@ -6,6 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "simple" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/application/macOptions/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/macOptions/settings.gradle index 9e2a3a08e0a..1531cffa135 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/macOptions/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/macOptions/settings.gradle @@ -6,5 +6,20 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } diff --git a/gradle-plugins/compose/src/test/test-projects/application/macSign/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/macSign/settings.gradle index 9e2a3a08e0a..1531cffa135 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/macSign/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/macSign/settings.gradle @@ -6,5 +6,20 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } diff --git a/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/settings.gradle index 0a6293e7be4..89f91ba82fc 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/settings.gradle @@ -6,6 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } include ':lib1:utils', ':lib2:utils', ':app' \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle index 2425d698b8c..33fc77b2844 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle @@ -6,11 +6,6 @@ plugins { id "org.jetbrains.compose" } -repositories { - jetbrainsCompose() - google() -} - kotlin { // empty stub (no actual android app) to detect configuration conflicts // like https://github.com/JetBrains/compose-jb/issues/2345 diff --git a/gradle-plugins/compose/src/test/test-projects/application/mpp/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/mpp/settings.gradle index 919c627862a..e0c242bc637 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/mpp/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/mpp/settings.gradle @@ -7,7 +7,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "mpp" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle index b99bd02d22e..33188819c9f 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle @@ -6,11 +6,6 @@ plugins { id "org.jetbrains.compose" } -repositories { - jetbrainsCompose() - google() -} - kotlin { targetHierarchy.default() diff --git a/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/settings.gradle index 0b59b8314da..142c0d28b47 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/settings.gradle @@ -7,7 +7,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "mpp" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/settings.gradle index 9e2a3a08e0a..1531cffa135 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/settings.gradle @@ -6,5 +6,20 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } diff --git a/gradle-plugins/compose/src/test/test-projects/application/proguard/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/proguard/build.gradle index 9a16e0469ef..7fe038689d2 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/proguard/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/proguard/build.gradle @@ -6,10 +6,6 @@ plugins { id "org.jetbrains.compose" } -repositories { - jetbrainsCompose() -} - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation compose.desktop.currentOs diff --git a/gradle-plugins/compose/src/test/test-projects/application/proguard/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/proguard/settings.gradle index 43d540efb8c..9df72a09ce6 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/proguard/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/proguard/settings.gradle @@ -6,6 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "simple" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/application/resources/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/resources/settings.gradle index 43d540efb8c..9df72a09ce6 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/resources/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/resources/settings.gradle @@ -6,6 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "simple" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/settings.gradle index 43d540efb8c..9df72a09ce6 100644 --- a/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/settings.gradle @@ -6,6 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "simple" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/misc/iosMokoResources/settings.gradle b/gradle-plugins/compose/src/test/test-projects/misc/iosMokoResources/settings.gradle index 7ce2258db9f..791e06efa4a 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/iosMokoResources/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/misc/iosMokoResources/settings.gradle @@ -7,7 +7,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" } + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "iosResources" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/misc/iosResources/settings.gradle b/gradle-plugins/compose/src/test/test-projects/misc/iosResources/settings.gradle index bcfce8c1d40..d1c65ad19c0 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/iosResources/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/misc/iosResources/settings.gradle @@ -6,7 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" } + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "iosResources" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/settings.gradle b/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/settings.gradle index aace426b6a1..afca8638e99 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/settings.gradle @@ -6,7 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" } + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "jsMpp" \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/settings.gradle b/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/settings.gradle index f5bad52c886..b5adbc29ea7 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/settings.gradle @@ -7,6 +7,18 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' } diff --git a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/settings.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/settings.gradle.kts index d6a2536613d..5b229446bae 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/settings.gradle.kts +++ b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/settings.gradle.kts @@ -4,6 +4,7 @@ include(":featureModule") //include(":appModule") pluginManagement { repositories { + mavenLocal() gradlePluginPortal() mavenCentral() google() @@ -11,7 +12,6 @@ pluginManagement { maven("https://packages.jetbrains.team/files/p/mpp/kgp-for-compose2") maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") - mavenLocal() } plugins { id("org.jetbrains.kotlin.multiplatform").version("KOTLIN_VERSION_PLACEHOLDER") diff --git a/gradle-plugins/compose/src/test/test-projects/misc/nativeCacheKind/settings.gradle b/gradle-plugins/compose/src/test/test-projects/misc/nativeCacheKind/settings.gradle index 6155b39d24f..5717a21c960 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/nativeCacheKind/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/misc/nativeCacheKind/settings.gradle @@ -6,7 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" } + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "nativeCacheKind" diff --git a/gradle-plugins/compose/src/test/test-projects/misc/nativeCacheKindError/settings.gradle b/gradle-plugins/compose/src/test/test-projects/misc/nativeCacheKindError/settings.gradle index 6155b39d24f..5a99487916b 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/nativeCacheKindError/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/misc/nativeCacheKindError/settings.gradle @@ -6,7 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" } + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenCentral() + mavenLocal() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "nativeCacheKind" diff --git a/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/build.gradle b/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/build.gradle index c726f9fc5cc..c6583d3c0a4 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/build.gradle @@ -5,10 +5,6 @@ plugins { id "org.jetbrains.compose" } -repositories { - jetbrainsCompose() -} - kotlin { js(IR) { browser() diff --git a/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/settings.gradle b/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/settings.gradle index c8796489356..3e41d3e3e9a 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/settings.gradle +++ b/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/settings.gradle @@ -6,7 +6,21 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" } + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } + } +} +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + google() + maven { + url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' + } } } rootProject.name = "skikoWasm" \ No newline at end of file