Merge branch 'master' into tyler/fix-on-conflict

bfops · web-flow · commit b7ec6c4c78fd · 2025-11-21T17:48:36.000-08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -94,44 +94,44 @@ inherits = "release"
 debug = true
 
 [workspace.package]
-version = "1.8.0"
+version = "1.9.0"
 edition = "2021"
 # update rust-toolchain.toml too!
 rust-version = "1.90.0"
 
 [workspace.dependencies]
-spacetimedb = { path = "crates/bindings", version = "=1.8.0" }
-spacetimedb-auth = { path = "crates/auth", version = "=1.8.0" }
-spacetimedb-bindings-macro = { path = "crates/bindings-macro", version = "=1.8.0" }
-spacetimedb-bindings-sys = { path = "crates/bindings-sys", version = "=1.8.0" }
-spacetimedb-cli = { path = "crates/cli", version = "=1.8.0" }
-spacetimedb-client-api = { path = "crates/client-api", version = "=1.8.0" }
-spacetimedb-client-api-messages = { path = "crates/client-api-messages", version = "=1.8.0" }
-spacetimedb-codegen = { path = "crates/codegen", version = "=1.8.0" }
-spacetimedb-commitlog = { path = "crates/commitlog", version = "=1.8.0" }
-spacetimedb-core = { path = "crates/core", version = "=1.8.0" }
-spacetimedb-data-structures = { path = "crates/data-structures", version = "=1.8.0" }
-spacetimedb-datastore = { path = "crates/datastore", version = "=1.8.0" }
-spacetimedb-durability = { path = "crates/durability", version = "=1.8.0" }
-spacetimedb-execution = { path = "crates/execution", version = "=1.8.0" }
-spacetimedb-expr = { path = "crates/expr", version = "=1.8.0" }
-spacetimedb-lib = { path = "crates/lib", default-features = false, version = "=1.8.0" }
-spacetimedb-memory-usage = { path = "crates/memory-usage", version = "=1.8.0", default-features = false }
-spacetimedb-metrics = { path = "crates/metrics", version = "=1.8.0" }
-spacetimedb-paths = { path = "crates/paths", version = "=1.8.0" }
-spacetimedb-pg = { path = "crates/pg", version = "=1.8.0" }
-spacetimedb-physical-plan = { path = "crates/physical-plan", version = "=1.8.0" }
-spacetimedb-primitives = { path = "crates/primitives", version = "=1.8.0" }
-spacetimedb-query = { path = "crates/query", version = "=1.8.0" }
-spacetimedb-sats = { path = "crates/sats", version = "=1.8.0" }
-spacetimedb-schema = { path = "crates/schema", version = "=1.8.0" }
-spacetimedb-standalone = { path = "crates/standalone", version = "=1.8.0" }
-spacetimedb-sql-parser = { path = "crates/sql-parser", version = "=1.8.0" }
-spacetimedb-table = { path = "crates/table", version = "=1.8.0" }
-spacetimedb-vm = { path = "crates/vm", version = "=1.8.0" }
-spacetimedb-fs-utils = { path = "crates/fs-utils", version = "=1.8.0" }
-spacetimedb-snapshot = { path = "crates/snapshot", version = "=1.8.0" }
-spacetimedb-subscription = { path = "crates/subscription", version = "=1.8.0" }
+spacetimedb = { path = "crates/bindings", version = "=1.9.0" }
+spacetimedb-auth = { path = "crates/auth", version = "=1.9.0" }
+spacetimedb-bindings-macro = { path = "crates/bindings-macro", version = "=1.9.0" }
+spacetimedb-bindings-sys = { path = "crates/bindings-sys", version = "=1.9.0" }
+spacetimedb-cli = { path = "crates/cli", version = "=1.9.0" }
+spacetimedb-client-api = { path = "crates/client-api", version = "=1.9.0" }
+spacetimedb-client-api-messages = { path = "crates/client-api-messages", version = "=1.9.0" }
+spacetimedb-codegen = { path = "crates/codegen", version = "=1.9.0" }
+spacetimedb-commitlog = { path = "crates/commitlog", version = "=1.9.0" }
+spacetimedb-core = { path = "crates/core", version = "=1.9.0" }
+spacetimedb-data-structures = { path = "crates/data-structures", version = "=1.9.0" }
+spacetimedb-datastore = { path = "crates/datastore", version = "=1.9.0" }
+spacetimedb-durability = { path = "crates/durability", version = "=1.9.0" }
+spacetimedb-execution = { path = "crates/execution", version = "=1.9.0" }
+spacetimedb-expr = { path = "crates/expr", version = "=1.9.0" }
+spacetimedb-lib = { path = "crates/lib", default-features = false, version = "=1.9.0" }
+spacetimedb-memory-usage = { path = "crates/memory-usage", version = "=1.9.0", default-features = false }
+spacetimedb-metrics = { path = "crates/metrics", version = "=1.9.0" }
+spacetimedb-paths = { path = "crates/paths", version = "=1.9.0" }
+spacetimedb-pg = { path = "crates/pg", version = "=1.9.0" }
+spacetimedb-physical-plan = { path = "crates/physical-plan", version = "=1.9.0" }
+spacetimedb-primitives = { path = "crates/primitives", version = "=1.9.0" }
+spacetimedb-query = { path = "crates/query", version = "=1.9.0" }
+spacetimedb-sats = { path = "crates/sats", version = "=1.9.0" }
+spacetimedb-schema = { path = "crates/schema", version = "=1.9.0" }
+spacetimedb-standalone = { path = "crates/standalone", version = "=1.9.0" }
+spacetimedb-sql-parser = { path = "crates/sql-parser", version = "=1.9.0" }
+spacetimedb-table = { path = "crates/table", version = "=1.9.0" }
+spacetimedb-vm = { path = "crates/vm", version = "=1.9.0" }
+spacetimedb-fs-utils = { path = "crates/fs-utils", version = "=1.9.0" }
+spacetimedb-snapshot = { path = "crates/snapshot", version = "=1.9.0" }
+spacetimedb-subscription = { path = "crates/subscription", version = "=1.9.0" }
 
 # Prevent `ahash` from pulling in `getrandom` by disabling default features.
 # Modules use `getrandom02` and we need to prevent an incompatible version
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -5,7 +5,7 @@ Business Source License 1.1
 Parameters
 
 Licensor:             Clockwork Laboratories, Inc.
-Licensed Work:        SpacetimeDB 1.8.0
+Licensed Work:        SpacetimeDB 1.9.0
                       The Licensed Work is
                       (c) 2023 Clockwork Laboratories, Inc.
                       
@@ -21,7 +21,7 @@ Additional Use Grant: You may make use of the Licensed Work provided your
                       Licensed Work by creating tables whose schemas are
                       controlled by such third parties.
 
-Change Date:          2030-11-11
+Change Date:          2030-11-20
 
 Change License:       GNU Affero General Public License v3.0 with a linking
                       exception
diff --git a/crates/bindings-csharp/BSATN.Codegen/BSATN.Codegen.csproj b/crates/bindings-csharp/BSATN.Codegen/BSATN.Codegen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>SpacetimeDB.BSATN.Codegen</AssemblyName>
-    <Version>1.8.0</Version>
+    <Version>1.9.0</Version>
     <Title>SpacetimeDB BSATN Codegen</Title>
     <Description>The SpacetimeDB BSATN Codegen implements the Roslyn incremental generators for BSATN serialization/deserialization in C#.</Description>
   </PropertyGroup>
diff --git a/crates/bindings-csharp/BSATN.Runtime/BSATN.Runtime.csproj b/crates/bindings-csharp/BSATN.Runtime/BSATN.Runtime.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>SpacetimeDB.BSATN.Runtime</AssemblyName>
-    <Version>1.8.0</Version>
+    <Version>1.9.0</Version>
     <Title>SpacetimeDB BSATN Runtime</Title>
     <Description>The SpacetimeDB BSATN Runtime implements APIs for BSATN serialization/deserialization in C#.</Description>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
diff --git a/crates/bindings-csharp/Codegen/Codegen.csproj b/crates/bindings-csharp/Codegen/Codegen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>SpacetimeDB.Codegen</AssemblyName>
-    <Version>1.8.0</Version>
+    <Version>1.9.0</Version>
     <Title>SpacetimeDB Module Codegen</Title>
     <Description>The SpacetimeDB Codegen implements the Roslyn incremental generators for writing SpacetimeDB modules in C#.</Description>
   </PropertyGroup>
diff --git a/crates/bindings-csharp/Runtime/Runtime.csproj b/crates/bindings-csharp/Runtime/Runtime.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>SpacetimeDB.Runtime</AssemblyName>
-    <Version>1.8.0</Version>
+    <Version>1.9.0</Version>
     <Title>SpacetimeDB Module Runtime</Title>
     <Description>The SpacetimeDB Runtime implements the database runtime bindings for writing SpacetimeDB modules in C#.</Description>
   </PropertyGroup>
diff --git a/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/index.ts b/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/index.ts
diff --git a/crates/bindings-typescript/package.json b/crates/bindings-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spacetimedb",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "API and ABI bindings for the SpacetimeDB TypeScript module library",
   "homepage": "https://github.com/clockworklabs/SpacetimeDB#readme",
   "bugs": {
diff --git a/crates/cli/src/subcommands/project/typescript/package._json b/crates/cli/src/subcommands/project/typescript/package._json
@@ -10,6 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "spacetimedb": "1.8.*"
+    "spacetimedb": "1.9.*"
   }
 }
diff --git a/crates/cli/templates/basic-c-sharp/server/StdbModule.csproj b/crates/cli/templates/basic-c-sharp/server/StdbModule.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SpacetimeDB.Runtime" Version="1.8.*" />
+    <PackageReference Include="SpacetimeDB.Runtime" Version="1.9.*" />
   </ItemGroup>
 
 </Project>
diff --git a/crates/cli/templates/basic-rust/client/Cargo.toml b/crates/cli/templates/basic-rust/client/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-spacetimedb-sdk = "1.8.*"
+spacetimedb-sdk = "1.9.*"
diff --git a/crates/cli/templates/basic-rust/server/Cargo.toml b/crates/cli/templates/basic-rust/server/Cargo.toml
@@ -9,5 +9,5 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-spacetimedb = "1.8.*"
+spacetimedb = "1.9.*"
 log = "0.4"
diff --git a/crates/codegen/tests/snapshots/codegen__codegen_typescript.snap b/crates/codegen/tests/snapshots/codegen__codegen_typescript.snap
@@ -495,7 +495,7 @@ const reducersSchema = __reducers(
 
 const REMOTE_MODULE = {
   versionInfo: {
-    cliVersion: "1.8.0" as const,
+    cliVersion: "1.9.0" as const,
   },
   tables: tablesSchema.schemaType.tables,
   reducers: reducersSchema.reducersType.reducers,
diff --git a/demo/Blackholio/server-csharp/StdbModule.csproj b/demo/Blackholio/server-csharp/StdbModule.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SpacetimeDB.Runtime" Version="1.8.*" />
+    <PackageReference Include="SpacetimeDB.Runtime" Version="1.9.*" />
   </ItemGroup>
 
 </Project>
diff --git a/licenses/BSL.txt b/licenses/BSL.txt
@@ -5,7 +5,7 @@ Business Source License 1.1
 Parameters
 
 Licensor:             Clockwork Laboratories, Inc.
-Licensed Work:        SpacetimeDB 1.8.0
+Licensed Work:        SpacetimeDB 1.9.0
                       The Licensed Work is
                       (c) 2023 Clockwork Laboratories, Inc.
                       
@@ -21,7 +21,7 @@ Additional Use Grant: You may make use of the Licensed Work provided your
                       Licensed Work by creating tables whose schemas are
                       controlled by such third parties.
 
-Change Date:          2030-11-11
+Change Date:          2030-11-20
 
 Change License:       GNU Affero General Public License v3.0 with a linking
                       exception
diff --git a/sdks/csharp/SpacetimeDB.ClientSDK.csproj b/sdks/csharp/SpacetimeDB.ClientSDK.csproj
@@ -16,16 +16,16 @@
     <PackageIcon>logo.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/clockworklabs/com.clockworklabs.spacetimedbsdk</RepositoryUrl>
-    <AssemblyVersion>1.8.0</AssemblyVersion>
-    <Version>1.8.0</Version>
+    <AssemblyVersion>1.9.0</AssemblyVersion>
+    <Version>1.9.0</Version>
     <DefaultItemExcludes>$(DefaultItemExcludes);*~/**</DefaultItemExcludes>
     <!-- We want to save DLLs for Unity which doesn't support NuGet. -->
     <RestorePackagesPath>packages</RestorePackagesPath>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SpacetimeDB.BSATN.Runtime" Version="1.8.*" />
+    <PackageReference Include="SpacetimeDB.BSATN.Runtime" Version="1.9.*" />
 
     <InternalsVisibleTo Include="SpacetimeDB.Tests" />
   </ItemGroup>
diff --git a/sdks/csharp/examples~/quickstart-chat/server/StdbModule.csproj b/sdks/csharp/examples~/quickstart-chat/server/StdbModule.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SpacetimeDB.Runtime" Version="1.8.*" />
+    <PackageReference Include="SpacetimeDB.Runtime" Version="1.9.*" />
   </ItemGroup>
 
 </Project>
diff --git a/sdks/csharp/examples~/regression-tests/server/StdbModule.csproj b/sdks/csharp/examples~/regression-tests/server/StdbModule.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SpacetimeDB.Runtime" Version="1.8.*" />
+    <PackageReference Include="SpacetimeDB.Runtime" Version="1.9.*" />
   </ItemGroup>
 
 </Project>
diff --git a/sdks/csharp/package.json b/sdks/csharp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.clockworklabs.spacetimedbsdk",
   "displayName": "SpacetimeDB SDK",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "The SpacetimeDB Client SDK is a software development kit (SDK) designed to interact with and manipulate SpacetimeDB modules..",
   "keywords": [],
   "author": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "spacetimedb",`
`3`		`- "version": "1.8.0",`
	`3`	`+ "version": "1.9.0",`
`4`	`4`	`"description": "API and ABI bindings for the SpacetimeDB TypeScript module library",`
`5`	`5`	`"homepage": "https://github.com/clockworklabs/SpacetimeDB#readme",`
`6`	`6`	`"bugs": {`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@`
`10`	`10`	`"author": "",`
`11`	`11`	`"license": "ISC",`
`12`	`12`	`"dependencies": {`
`13`		`- "spacetimedb": "1.8.*"`
	`13`	`+ "spacetimedb": "1.9.*"`
`14`	`14`	`}`
`15`	`15`	`}`