Move group to 'org.jetbrains.compose.hot-reload'

.run/Samples_Counter_ Main.run.xml

@@ -23,4 +23,4 @@
       <option name="Gradle.BeforeRunTask" enabled="true" tasks="publishLocally" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
     </method>
   </configuration>
-</component>
+</component>

Contribute.md

@@ -58,7 +58,7 @@ dependencyResolutionManagement {
 5. In your local project, update the version of `compose-hot-reload` to whatever you set in step 1:
 
 ```
-id("org.jetbrains.compose-hot-reload") version "1.0.0-DEBUG"
+id("org.jetbrains.compose.hot-reload") version "1.0.0-DEBUG"
 ```
 
 6. Run project as usual.

README.md

@@ -39,7 +39,7 @@ plugins {
     kotlin("multiplatform") version "2.1.20-Beta2" // <- Use Kotlin 2.1.20-Beta2 or higher!
     kotlin("plugin.compose") version "2.1.20-Beta2" // <- Use Compose Compiler Plugin 2.1.20-Beta2 or higher!
     id("org.jetbrains.compose")
-    id("org.jetbrains.compose-hot-reload") version "1.0.0-dev-39" // <- add this additionally
+    id("org.jetbrains.compose.hot-reload") version "1.0.0-dev-40" // <- add this additionally
 }
 ```
 

buildSrc/src/main/kotlin/publishing-conventions.gradle.kts

@@ -46,7 +46,10 @@ plugins.withType<MavenPublishPlugin>().all {
         }
 
         publications.withType<MavenPublication>().configureEach {
-            this.signPublicationIfKeyPresent()
+            signPublicationIfKeyPresent()
+
+            artifactId = project.name.removePrefix("hot-reload-")
+
             pom {
                 name = project.name
                 description = "Compose Hot Reload implementation"

gradle.properties

@@ -3,10 +3,10 @@
 ############
 # Version used for publications
 # Will be bumped only right before release
-version=1.0.0-dev-39
+version=1.0.0-dev-40
 # Version used to bootstrap the repo
 # Mostly the same as the 'version'.
-bootstrap.version=1.0.0-dev-39
+bootstrap.version=1.0.0-dev-40
 ############
 # Gradle
 ############

hot-reload-gradle-plugin/build.gradle.kts

@@ -20,7 +20,7 @@ tasks.withType<Test>().configureEach {
 
 gradlePlugin {
     plugins.create("hot-reload") {
-        id = "org.jetbrains.compose-hot-reload"
+        id = "org.jetbrains.compose.hot-reload"
         implementationClass = "org.jetbrains.compose.reload.ComposeHotReloadPlugin"
     }
 }

hot-reload-gradle-plugin/src/main/kotlin/org/jetbrains/compose/reload/devToolsConfiguration.kt

@@ -48,7 +48,7 @@ internal val Project.composeHotReloadDevToolsConfiguration: Configuration
             )
 
             configuration.dependencies.add(
-                project.dependencies.create("org.jetbrains.compose:hot-reload-devtools:$HOT_RELOAD_VERSION")
+                project.dependencies.create("org.jetbrains.compose.hot-reload:devtools:$HOT_RELOAD_VERSION")
             )
 
             project.withComposePlugin {

hot-reload-gradle-plugin/src/main/kotlin/org/jetbrains/compose/reload/setupComposeHotReloadRuntimeDependency.kt

@@ -16,7 +16,7 @@ internal fun Project.setupComposeHotReloadRuntimeDependency() {
      */
     kotlinMultiplatformOrNull?.apply {
         sourceSets.commonMain.dependencies {
-            implementation("org.jetbrains.compose:hot-reload-runtime-api:$HOT_RELOAD_VERSION")
+            implementation("org.jetbrains.compose.hot-reload:runtime-api:$HOT_RELOAD_VERSION")
         }
     }
 
@@ -26,7 +26,7 @@ internal fun Project.setupComposeHotReloadRuntimeDependency() {
     kotlinJvmOrNull?.apply {
         val compilation = target.compilations.getByName("main")
         compilation.defaultSourceSet.dependencies {
-            implementation("org.jetbrains.compose:hot-reload-runtime-api:$HOT_RELOAD_VERSION")
+            implementation("org.jetbrains.compose.hot-reload:runtime-api:$HOT_RELOAD_VERSION")
         }
     }
 }

hot-reload-gradle-plugin/src/test/kotlin/org/jetbrains/compose/reload/tests/RecompilerPropertiesTest.kt

@@ -25,7 +25,7 @@ class RecompilerPropertiesTest {
 
 
         project.plugins.apply("org.jetbrains.kotlin.multiplatform")
-        project.plugins.apply("org.jetbrains.compose-hot-reload")
+        project.plugins.apply("org.jetbrains.compose.hot-reload")
         project.kotlinMultiplatformOrNull?.jvm()
 
         val hotRun = project.tasks.create<ComposeHotRun>("runHot")
@@ -44,7 +44,7 @@ class RecompilerPropertiesTest {
 
 
         subproject.plugins.apply("org.jetbrains.kotlin.multiplatform")
-        subproject.plugins.apply("org.jetbrains.compose-hot-reload")
+        subproject.plugins.apply("org.jetbrains.compose.hot-reload")
         subproject.kotlinMultiplatformOrNull?.jvm()
 
         val hotRun = subproject.tasks.create<ComposeHotRun>("runHot")

hot-reload-gradle-plugin/src/test/kotlin/org/jetbrains/compose/reload/tests/RunClasspathTest.kt

@@ -134,10 +134,10 @@ class RunClasspathTest {
 }
 
 private val hotReloadDependencies: Array<FileMatcher> = arrayOf(
-    PathRegex(".*/hot-reload-agent-$HOT_RELOAD_VERSION.jar"),
-    PathRegex(".*/hot-reload-analysis-$HOT_RELOAD_VERSION.jar"),
-    PathRegex(".*/hot-reload-core-$HOT_RELOAD_VERSION.jar"),
-    PathRegex(".*/hot-reload-orchestration-$HOT_RELOAD_VERSION.jar"),
-    PathRegex(".*/hot-reload-runtime-api-jvm-$HOT_RELOAD_VERSION.jar"),
-    PathRegex(".*/hot-reload-runtime-jvm-$HOT_RELOAD_VERSION-dev.jar"),
+    PathRegex(".*hot-reload/.*/agent-$HOT_RELOAD_VERSION.jar"),
+    PathRegex(".*hot-reload/.*/analysis-$HOT_RELOAD_VERSION.jar"),
+    PathRegex(".*hot-reload/.*/core-$HOT_RELOAD_VERSION.jar"),
+    PathRegex(".*hot-reload/.*/orchestration-$HOT_RELOAD_VERSION.jar"),
+    PathRegex(".*hot-reload/.*runtime-api-jvm-$HOT_RELOAD_VERSION.jar"),
+    PathRegex(".*hot-reload/.*/runtime-jvm-$HOT_RELOAD_VERSION-dev.jar"),
 )

hot-reload-gradle-utils/src/main/kotlin/org/jetbrains/compose/reload/gradle/agentConfiguration.kt

@@ -22,7 +22,7 @@ val Project.composeHotReloadAgentConfiguration: Configuration
             configuration.isCanBeResolved = true
 
             configuration.dependencies.add(
-                project.dependencies.create("org.jetbrains.compose:hot-reload-agent:$HOT_RELOAD_VERSION")
+                project.dependencies.create("org.jetbrains.compose.hot-reload:agent:$HOT_RELOAD_VERSION")
             )
         }
     }
@@ -31,7 +31,8 @@ val Project.composeHotReloadAgentConfiguration: Configuration
 fun Project.composeHotReloadAgentJar(): FileCollection {
     return composeHotReloadAgentConfiguration.incoming.artifactView { view ->
         view.componentFilter { element ->
-            element is ModuleComponentIdentifier && element.group == "org.jetbrains.compose" && element.module == "hot-reload-agent"
+            element is ModuleComponentIdentifier &&
+                element.group == "org.jetbrains.compose.hot-reload" && element.module == "agent"
         }
     }.files
 }

hot-reload-runtime-api/api/hot-reload-runtime-api.klib.api

@@ -5,7 +5,7 @@
 // - Show manifest properties: true
 // - Show declarations: true
 
-// Library unique name: <org.jetbrains.compose:hot-reload-runtime-api>
+// Library unique name: <org.jetbrains.compose.hot-reload:hot-reload-runtime-api>
 open annotation class org.jetbrains.compose.reload/DelicateHotReloadApi : kotlin/Annotation { // org.jetbrains.compose.reload/DelicateHotReloadApi|null[0]
     constructor <init>() // org.jetbrains.compose.reload/DelicateHotReloadApi.<init>|<init>(){}[0]
 }

hot-reload-runtime-api/build.gradle.kts

@@ -85,3 +85,11 @@ android {
         this.targetCompatibility = JavaVersion.VERSION_11
     }
 }
+
+publishing {
+    publications.withType<MavenPublication>().configureEach {
+        afterEvaluate {
+            artifactId = artifactId.removePrefix("hot-reload-")
+        }
+    }
+}

hot-reload-runtime-jvm/build.gradle.kts

@@ -57,7 +57,7 @@ The 'apiCheck' task will be configured to fail if this api dump does not match t
  */
 val devApiBuild = tasks.register<KotlinApiBuildTask>("devApiBuild") {
     inputClassesDirs = kotlin.target.compilations["dev"].output.classesDirs
-    outputApiFile = layout.buildDirectory.file("api/hot-reload-runtime-jvm-dev.api")
+    outputApiFile = layout.buildDirectory.file("api/runtime-jvm-dev.api")
     runtimeClasspath = project.files({ tasks.apiBuild.get().runtimeClasspath })
     nonPublicMarkers.add("org.jetbrains.compose.reload.InternalHotReloadApi")
 }

hot-reload-test/core/build.gradle.kts

@@ -19,6 +19,6 @@ dependencies {
 
 publishing {
     publications.withType<MavenPublication>().configureEach {
-        artifactId = "hot-reload-test-core"
+        artifactId = "test-core"
     }
 }

hot-reload-test/gradle-plugin/build.gradle.kts

@@ -12,13 +12,13 @@ plugins {
 
 publishing {
     publications.withType<MavenPublication>().configureEach {
-        this.artifactId = "hot-reload-test-gradle-plugin"
+        this.artifactId = "test-gradle-plugin"
     }
 }
 
 gradlePlugin {
     plugins.create("hot-reload-test") {
-        id = "org.jetbrains.compose-hot-reload-test"
+        id = "org.jetbrains.compose.hot-reload.test"
         implementationClass = "org.jetbrains.compose.reload.test.HotReloadTestPlugin"
     }
 }

hot-reload-test/gradle-plugin/src/main/kotlin/org/jetbrains/compose/reload/test/functionalTestTask.kt

@@ -103,7 +103,7 @@ internal fun Project.configureGradleTestTasks() {
 
 private fun registerHotReloadFunctionalTestTask(compilation: KotlinCompilation<*>): TaskProvider<HotReloadFunctionalTestTask> {
     compilation.defaultSourceSet.dependencies {
-        implementation("org.jetbrains.compose:hot-reload-test-gradle:${HOT_RELOAD_VERSION}")
+        implementation("org.jetbrains.compose.hot-reload:test-gradle:${HOT_RELOAD_VERSION}")
     }
 
     val task = compilation.project.tasks.register<HotReloadFunctionalTestTask>(

hot-reload-test/gradle-plugin/src/main/kotlin/org/jetbrains/compose/reload/test/unitTestTask.kt

@@ -129,8 +129,8 @@ private fun KotlinTarget.configureDefaultHotReloadTestTask() {
     compilation.associateWith(main)
 
     compilation.defaultSourceSet.dependencies {
-        implementation("org.jetbrains.compose:hot-reload-test:${HOT_RELOAD_VERSION}")
-        implementation("org.jetbrains.compose:hot-reload-runtime-jvm:${HOT_RELOAD_VERSION}:dev")
+        implementation("org.jetbrains.compose.hot-reload:test:${HOT_RELOAD_VERSION}")
+        implementation("org.jetbrains.compose.hot-reload:runtime-jvm:${HOT_RELOAD_VERSION}:dev")
         project.withComposePlugin {
             implementation(project.extensions.getByType<ComposeExtension>().dependencies.desktop.currentOs)
         }

hot-reload-test/gradle-testFixtures/build.gradle.kts

@@ -31,6 +31,6 @@ dependencies {
 
 publishing {
     publications.withType<MavenPublication>().configureEach {
-        artifactId = "hot-reload-test-gradle"
+        artifactId = "test-gradle"
     }
 }

hot-reload-test/gradle-testFixtures/src/main/kotlin/org/jetbrains/compose/reload/test/gradle/BuildGradleKtsExtension.kt

@@ -150,7 +150,7 @@ internal class DefaultBuildGradleKts : BuildGradleKtsExtension {
             kotlin("{{kotlin.plugin}}")
             kotlin("plugin.compose")
             id("org.jetbrains.compose")
-            id("org.jetbrains.compose-hot-reload")
+            id("org.jetbrains.compose.hot-reload")
             {{if $androidEnabledKey}}
             id("com.android.application")
             {{/if}}
@@ -167,7 +167,7 @@ internal class DefaultBuildGradleKts : BuildGradleKtsExtension {
 
     override fun jvmMainDependencies(context: ExtensionContext): String? = """
         implementation(compose.desktop.currentOs)
-        implementation("org.jetbrains.compose:hot-reload-test:$HOT_RELOAD_VERSION")
+        implementation("org.jetbrains.compose.hot-reload:test:$HOT_RELOAD_VERSION")
     """.trimIndent()
 
 

hot-reload-test/gradle-testFixtures/src/main/kotlin/org/jetbrains/compose/reload/test/gradle/SettingsGradleKtsExtension.kt

@@ -97,7 +97,7 @@ internal class DefaultSettingsGradleKts : SettingsGradleKtsExtension {
             kotlin("jvm") version "$kotlinVersion"
             kotlin("plugin.compose") version "$kotlinVersion"
             id("org.jetbrains.compose") version "$composeVersion"
-            id("org.jetbrains.compose-hot-reload") version "$HOT_RELOAD_VERSION"
+            id("org.jetbrains.compose.hot-reload") version "$HOT_RELOAD_VERSION"
             id("com.android.application") version "{{androidVersion}}"
         """.trimIndent().asTemplateOrThrow().renderOrThrow("androidVersion" to androidVersion)
     }
@@ -106,7 +106,7 @@ internal class DefaultSettingsGradleKts : SettingsGradleKtsExtension {
         return """
             maven("https://packages.jetbrains.team/maven/p/firework/dev") {
                 mavenContent {
-                    includeModuleByRegex("org.jetbrains.compose", "hot-reload.*")
+                    includeGroupAndSubgroups("org.jetbrains.compose.hot-reload")
                 }
             }
 
@@ -137,7 +137,7 @@ internal class DefaultSettingsGradleKts : SettingsGradleKtsExtension {
         return """
             maven("https://packages.jetbrains.team/maven/p/firework/dev") {
                 mavenContent {
-                    includeModuleByRegex("org.jetbrains.compose", "hot-reload.*")
+                    includeGroupAndSubgroups("org.jetbrains.compose.hot-reload")
                 }
             }
 

hot-reload-test/sample/build.gradle.kts

@@ -5,15 +5,15 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
     id("org.jetbrains.compose")
-    id("org.jetbrains.compose-hot-reload")
-    id("org.jetbrains.compose-hot-reload-test")
+    id("org.jetbrains.compose.hot-reload")
+    id("org.jetbrains.compose.hot-reload.test")
 }
 
 kotlin {
     jvm()
 
     sourceSets.jvmMain.dependencies {
-        implementation("org.jetbrains.compose:hot-reload-runtime-api:1.0.0-dev-39"
+        implementation("org.jetbrains.compose.hot-reload:runtime-api:1.0.0-dev-40")
         implementation(compose.runtime)
     }
 

hot-reload-test/sample/settings.gradle.kts

@@ -1,7 +1,7 @@
 pluginManagement {
     plugins {
-        id("org.jetbrains.compose-hot-reload") version "1.0.0-dev-39"
-        id("org.jetbrains.compose-hot-reload-test") version "1.0.0-dev-39"
+        id("org.jetbrains.compose.hot-reload") version "1.0.0-dev-40"
+        id("org.jetbrains.compose.hot-reload.test") version "1.0.0-dev-40"
     }
 
     repositories {

hot-reload-test/src/main/kotlin/org/jetbrains/compose/reload/test/composeUtils.kt

@@ -19,8 +19,8 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
-import org.jetbrains.compose.hot_reload_test.generated.resources.Res
-import org.jetbrains.compose.hot_reload_test.generated.resources.Roboto_Medium
+import org.jetbrains.compose.hot_reload.hot_reload_test.generated.resources.Res
+import org.jetbrains.compose.hot_reload.hot_reload_test.generated.resources.Roboto_Medium
 import org.jetbrains.compose.resources.Font
 
 /**

samples/bytecode-analyzer/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
     id("org.jetbrains.compose")
-    id("org.jetbrains.compose-hot-reload")
+    id("org.jetbrains.compose.hot-reload")
 }
 
 kotlin {
@@ -16,8 +16,8 @@ kotlin {
     }
 
     sourceSets.commonMain.dependencies {
-        implementation("org.jetbrains.compose:hot-reload-core:1.0.0-dev-39")
-        implementation("org.jetbrains.compose:hot-reload-analysis:1.0.0-dev-39")
+        implementation("org.jetbrains.compose.hot-reload:core:1.0.0-dev-40")
+        implementation("org.jetbrains.compose.hot-reload:analysis:1.0.0-dev-40")
 
         implementation("io.sellmair:evas:1.2.0")
         implementation("io.sellmair:evas-compose:1.2.0")

samples/bytecode-analyzer/settings.gradle.kts

@@ -1,6 +1,6 @@
 pluginManagement {
     plugins {
-        id("org.jetbrains.compose-hot-reload") version "1.0.0-dev-39"
+        id("org.jetbrains.compose.hot-reload") version "1.0.0-dev-40"
     }
 
     repositories {

samples/counter/app/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
     id("org.jetbrains.compose")
-    id("org.jetbrains.compose-hot-reload")
+    id("org.jetbrains.compose.hot-reload")
 }
 
 composeCompiler {

samples/counter/build.gradle.kts

@@ -2,5 +2,5 @@ plugins {
     kotlin("multiplatform") apply false
     kotlin("plugin.compose") apply false
     id("org.jetbrains.compose") apply false
-    id("org.jetbrains.compose-hot-reload") apply false
-}
+    id("org.jetbrains.compose.hot-reload") apply false
+}

samples/counter/settings.gradle.kts

@@ -1,6 +1,6 @@
 pluginManagement {
     plugins {
-        id("org.jetbrains.compose-hot-reload") version "1.0.0-dev-39"
+        id("org.jetbrains.compose.hot-reload") version "1.0.0-dev-40"
     }
 
     repositories {

samples/counter/widgets/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
     id("org.jetbrains.compose")
-    id("org.jetbrains.compose-hot-reload")
+    id("org.jetbrains.compose.hot-reload")
 }
 
 composeCompiler {
@@ -18,7 +18,7 @@ kotlin {
     sourceSets.jvmMain.dependencies {
         implementation("io.sellmair:evas:1.2.0")
         implementation("io.sellmair:evas-compose:1.2.0")
-        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
         implementation(compose.desktop.currentOs)
         implementation(compose.foundation)
         implementation(compose.material3)