Rename io.github.ethersync => org.teamtype

zormit · zormit · commit a15d3cf4789a · 2026-03-05T00:13:46.000+01:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,6 +32,6 @@ jobs:
            uses: softprops/action-gh-release@v2
            with:
               files: |
-                  ./build/distributions/ethersync-0.7.0-SNAPSHOT.zip
+                  ./build/distributions/teamtype-0.9.0-SNAPSHOT.zip
               tag_name: nightly
               prerelease: true
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,9 +7,9 @@ plugins {
    alias(libs.plugins.testLogger)
 }
 
-group = "io.github.ethersync"
+group = "org.teamtype"
 
-version = "0.7.0-SNAPSHOT"
+version = "0.9.0-SNAPSHOT"
 
 repositories {
    mavenCentral()
diff --git a/src/main/kotlin/org/teamtype/EthersyncService.kt b/src/main/kotlin/org/teamtype/EthersyncService.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync
+package org.teamtype
 
 import kotlinx.coroutines.Job
 
diff --git a/src/main/kotlin/org/teamtype/EthersyncServiceImpl.kt b/src/main/kotlin/org/teamtype/EthersyncServiceImpl.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync
+package org.teamtype
 
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.process.ColoredProcessHandler
@@ -24,11 +24,11 @@ import com.intellij.util.io.BaseOutputReader
 import com.intellij.util.io.await
 import com.intellij.util.io.awaitExit
 import com.intellij.util.io.readLineAsync
-import io.github.ethersync.protocol.*
-import io.github.ethersync.settings.AppSettings
-import io.github.ethersync.sync.Changetracker
-import io.github.ethersync.sync.Cursortracker
-import io.github.ethersync.ui.ToolWindow
+import org.teamtype.ethersync.protocol.*
+import org.teamtype.settings.AppSettings
+import org.teamtype.sync.Changetracker
+import org.teamtype.sync.Cursortracker
+import org.teamtype.ui.ToolWindow
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.consumeEach
@@ -42,20 +42,22 @@ import java.nio.file.Files
 import java.nio.file.attribute.PosixFilePermissions
 import java.util.concurrent.Executors
 
-private val LOG = logger<EthersyncServiceImpl>()
+private val LOG = logger<org.teamtype.EthersyncServiceImpl>()
 
 @Service(Service.Level.PROJECT)
 class EthersyncServiceImpl(
    private val project: Project,
    private val cs: CoroutineScope,
-) : EthersyncService {
+) : org.teamtype.EthersyncService {
 
-   private var launcher: Launcher<RemoteEthersyncClientProtocol>? = null
+   private var launcher: Launcher<org.teamtype.protocol.RemoteEthersyncClientProtocol>? = null
    private var daemonProcess: ColoredProcessHandler? = null
    private var clientProcess: Process? = null
 
-   private val changetracker: Changetracker = Changetracker(project, cs)
-   private val cursortracker: Cursortracker = Cursortracker(project, cs)
+   private val changetracker: org.teamtype.sync.Changetracker =
+       _root_ide_package_.org.teamtype.sync.Changetracker(project, cs)
+   private val cursortracker: org.teamtype.sync.Cursortracker =
+       _root_ide_package_.org.teamtype.sync.Cursortracker(project, cs)
 
    /** test-only! */
    var attachDaemonOutputToUi: Boolean = true
diff --git a/src/main/kotlin/org/teamtype/Icons.kt b/src/main/kotlin/org/teamtype/Icons.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync
+package org.teamtype
 
 import com.intellij.openapi.util.IconLoader
 
diff --git a/src/main/kotlin/org/teamtype/StartEthersyncDaemonAction.kt b/src/main/kotlin/org/teamtype/StartEthersyncDaemonAction.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync
+package org.teamtype
 
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnAction
diff --git a/src/main/kotlin/org/teamtype/StartEthersyncDaemonTerminalShellCommandHandler.kt b/src/main/kotlin/org/teamtype/StartEthersyncDaemonTerminalShellCommandHandler.kt
@@ -1,10 +1,10 @@
-package io.github.ethersync
+package org.teamtype
 
 import com.intellij.execution.Executor
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.terminal.TerminalShellCommandHandler
-import io.github.ethersync.settings.AppSettings
+import org.teamtype.settings.AppSettings
 
 class StartEthersyncDaemonTerminalShellCommandHandler : TerminalShellCommandHandler {
     override fun execute(
diff --git a/src/main/kotlin/org/teamtype/StopEthersyncDaemonAction.kt b/src/main/kotlin/org/teamtype/StopEthersyncDaemonAction.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync
+package org.teamtype
 
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnAction
diff --git a/src/main/kotlin/org/teamtype/protocol/CursorEvent.kt b/src/main/kotlin/org/teamtype/protocol/CursorEvent.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.protocol
+package org.teamtype.protocol
 
 import com.google.gson.annotations.SerializedName
 import org.eclipse.lsp4j.Range
diff --git a/src/main/kotlin/org/teamtype/protocol/CursorRequest.kt b/src/main/kotlin/org/teamtype/protocol/CursorRequest.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.protocol
+package org.teamtype.protocol
 
 import com.google.gson.annotations.SerializedName
 import org.eclipse.lsp4j.Range
diff --git a/src/main/kotlin/org/teamtype/protocol/Delta.kt b/src/main/kotlin/org/teamtype/protocol/Delta.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.protocol
+package org.teamtype.protocol
 
 import com.google.gson.annotations.SerializedName
 import org.eclipse.lsp4j.Range
diff --git a/src/main/kotlin/org/teamtype/protocol/DocumentCloseRequest.kt b/src/main/kotlin/org/teamtype/protocol/DocumentCloseRequest.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.protocol
+package org.teamtype.protocol
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/src/main/kotlin/org/teamtype/protocol/DocumentOpenRequest.kt b/src/main/kotlin/org/teamtype/protocol/DocumentOpenRequest.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.protocol
+package org.teamtype.protocol
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/src/main/kotlin/org/teamtype/protocol/EditEvent.kt b/src/main/kotlin/org/teamtype/protocol/EditEvent.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.protocol
+package org.teamtype.protocol
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/src/main/kotlin/org/teamtype/protocol/EditRequest.kt b/src/main/kotlin/org/teamtype/protocol/EditRequest.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.protocol
+package org.teamtype.protocol
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/src/main/kotlin/org/teamtype/protocol/EthersyncEditorProtocol.kt b/src/main/kotlin/org/teamtype/protocol/EthersyncEditorProtocol.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.protocol
+package org.teamtype.protocol
 
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification
 
diff --git a/src/main/kotlin/org/teamtype/protocol/RemoteEthersyncClientProtocol.kt b/src/main/kotlin/org/teamtype/protocol/RemoteEthersyncClientProtocol.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.protocol
+package org.teamtype.protocol
 
 import com.google.gson.JsonObject
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification
diff --git a/src/main/kotlin/org/teamtype/settings/AppSettings.kt b/src/main/kotlin/org/teamtype/settings/AppSettings.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.settings
+package org.teamtype.settings
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.PersistentStateComponent
@@ -7,7 +7,7 @@ import com.intellij.openapi.components.Storage
 import org.jetbrains.annotations.NonNls
 
 @State(
-   name = "io.github.ethersync.settings.AppSettings",
+   name = "org.teamtype.settings.AppSettings",
    storages = [Storage("EthersyncSettingsPlugin.xml")]
 )
 class AppSettings : PersistentStateComponent<AppSettings.State> {
diff --git a/src/main/kotlin/org/teamtype/settings/AppSettingsComponent.kt b/src/main/kotlin/org/teamtype/settings/AppSettingsComponent.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.settings
+package org.teamtype.settings
 
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBTextField
diff --git a/src/main/kotlin/org/teamtype/settings/AppSettingsConfigurable.kt b/src/main/kotlin/org/teamtype/settings/AppSettingsConfigurable.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.settings
+package org.teamtype.settings
 
 import com.intellij.openapi.options.Configurable
 import org.jetbrains.annotations.Nls
diff --git a/src/main/kotlin/org/teamtype/sync/Changetracker.kt b/src/main/kotlin/org/teamtype/sync/Changetracker.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.sync
+package org.teamtype.sync
 
 import com.intellij.openapi.application.EDT
 import com.intellij.openapi.command.WriteCommandAction
@@ -10,10 +10,10 @@ import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.project.Project
-import io.github.ethersync.protocol.Delta
-import io.github.ethersync.protocol.EditEvent
-import io.github.ethersync.protocol.EditRequest
-import io.github.ethersync.protocol.RemoteEthersyncClientProtocol
+import org.teamtype.protocol.Delta
+import org.teamtype.protocol.EditEvent
+import org.teamtype.protocol.EditRequest
+import org.teamtype.protocol.RemoteEthersyncClientProtocol
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.future.await
diff --git a/src/main/kotlin/org/teamtype/sync/Cursortracker.kt b/src/main/kotlin/org/teamtype/sync/Cursortracker.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.sync
+package org.teamtype.sync
 
 import com.intellij.openapi.application.EDT
 import com.intellij.openapi.editor.Editor
@@ -12,9 +12,9 @@ import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.rd.util.withUiContext
 import com.intellij.ui.JBColor
-import io.github.ethersync.protocol.CursorEvent
-import io.github.ethersync.protocol.CursorRequest
-import io.github.ethersync.protocol.RemoteEthersyncClientProtocol
+import org.teamtype.protocol.CursorEvent
+import org.teamtype.protocol.CursorRequest
+import org.teamtype.protocol.RemoteEthersyncClientProtocol
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.future.await
diff --git a/src/main/kotlin/org/teamtype/ui/EthersyncToolWindowFactory.kt b/src/main/kotlin/org/teamtype/ui/EthersyncToolWindowFactory.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.ui
+package org.teamtype.ui
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
@@ -9,7 +9,7 @@ import com.intellij.ui.content.ContentFactory
 class EthersyncToolWindowFactory : ToolWindowFactory {
 
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
-        val panel = io.github.ethersync.ui.ToolWindow(project)
+        val panel = org.teamtype.ethersync.ui.ToolWindow(project)
 
         toolWindow.contentManager.addContent(ContentFactory.getInstance()
             .createContent(panel, "Daemon", true))
diff --git a/src/main/kotlin/org/teamtype/ui/ToolWindow.kt b/src/main/kotlin/org/teamtype/ui/ToolWindow.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync.ui
+package org.teamtype.ui
 
 import com.intellij.execution.filters.TextConsoleBuilderFactory
 import com.intellij.execution.process.ProcessHandler
@@ -8,8 +8,8 @@ import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.project.Project
-import io.github.ethersync.StartEthersyncDaemonAction
-import io.github.ethersync.StopEthersyncDaemonAction
+import org.teamtype.StartEthersyncDaemonAction
+import org.teamtype.StopEthersyncDaemonAction
 import java.awt.BorderLayout
 import javax.swing.JPanel
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,8 +1,8 @@
 <idea-plugin>
-   <id>io.github.ethersync</id>
+   <id>org.teamtype</id>
 
-   <name>Ethersync</name>
-   <vendor url="https://ethersync.github.io/ethersync/">Ethersync GitHub Org</vendor>
+   <name>Teamtype</name>
+   <vendor url="https://teamtype.org">teamtype.org</vendor>
 
    <description><![CDATA[
    Ethersync enables real-time co-editing of local text files. You can use it for pair programming or note-taking, for example! Think Google Docs, but from the comfort of your favorite text editor!
@@ -13,31 +13,31 @@
 
    <extensions defaultExtensionNs="com.intellij">
       <applicationService
-         serviceImplementation="io.github.ethersync.settings.AppSettings"/>
+         serviceImplementation="org.teamtype.settings.AppSettings"/>
       <applicationConfigurable
          parentId="tools"
-         instance="io.github.ethersync.settings.AppSettingsConfigurable"
-         id="io.github.ethersync.settings.AppSettingsConfigurable"
+         instance="org.teamtype.settings.AppSettingsConfigurable"
+         id="org.teamtype.settings.AppSettingsConfigurable"
          displayName="Ethersync"/>
 
       <projectService
-         serviceInterface="io.github.ethersync.EthersyncService"
-         serviceImplementation="io.github.ethersync.EthersyncServiceImpl"/>
+         serviceInterface="org.teamtype.EthersyncService"
+         serviceImplementation="org.teamtype.EthersyncServiceImpl"/>
 
       <toolWindow
            id="ethersync"
            icon="/toolbar.svg"
-           factoryClass="io.github.ethersync.ui.EthersyncToolWindowFactory"/>
+           factoryClass="org.teamtype.ui.EthersyncToolWindowFactory"/>
 
       <terminal.shellCommandHandler
-           implementation="io.github.ethersync.StartEthersyncDaemonTerminalShellCommandHandler"/>
+           implementation="org.teamtype.StartEthersyncDaemonTerminalShellCommandHandler"/>
       <iconMapper mappingFile="EthersyncIconMappings.json"/>
    </extensions>
 
    <actions>
       <action
          id="StartEthersyncDaemon"
-         class="io.github.ethersync.StartEthersyncDaemonAction"
+         class="org.teamtype.StartEthersyncDaemonAction"
          text="Code with Ethersync"
          description="Connect to a running ethersync daemon or start a new peer"
          icon="/toolbar.svg">
diff --git a/src/test/kotlin/org/teamtype/EthersyncServiceImplTest.kt b/src/test/kotlin/org/teamtype/EthersyncServiceImplTest.kt
@@ -1,4 +1,4 @@
-package io.github.ethersync
+package org.teamtype
 
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.components.service

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ plugins {`
`7`	`7`	`alias(libs.plugins.testLogger)`
`8`	`8`	`}`
`9`	`9`
`10`		`-group = "io.github.ethersync"`
	`10`	`+group = "org.teamtype"`
`11`	`11`
`12`		`-version = "0.7.0-SNAPSHOT"`
	`12`	`+version = "0.9.0-SNAPSHOT"`
`13`	`13`
`14`	`14`	`repositories {`
`15`	`15`	`mavenCentral()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.github.ethersync`
	`1`	`+package org.teamtype`
`2`	`2`
`3`	`3`	`import kotlinx.coroutines.Job`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.github.ethersync.protocol`
	`1`	`+package org.teamtype.protocol`
`2`	`2`
`3`	`3`	`import com.google.gson.annotations.SerializedName`
`4`	`4`	`import org.eclipse.lsp4j.Range`