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: 1 addition & 1 deletion android-java/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
ditto = "4.13.1"
ditto = "4.14.3"
agp = "8.7.3"
constraintlayout = "2.2.0"
kotlin = "2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion android-kotlin/QuickStartTasks/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ appcompat = "1.7.1"
datastorePreferences = "1.1.7"
koin-bom = "4.1.0"
coroutines-tests = "1.10.2"
ditto = "4.13.1"
ditto = "4.14.3"
monitor = "1.7.2"

[libraries]
Expand Down
2 changes: 1 addition & 1 deletion cpp-tui/taskscpp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BUILD_TYPE ?= Debug

# Ditto SDK version and platform detection
DITTO_SDK_VERSION ?= 4.13.1
DITTO_SDK_VERSION ?= 4.14.3
PLATFORM := $(shell uname -s | tr '[:upper:]' '[:lower:]')
ARCH := $(shell uname -m)

Expand Down
2 changes: 1 addition & 1 deletion dotnet-maui/DittoMauiTasksApp/DittoMauiTasksApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
<PackageReference Include="Ditto" Version="4.13.1" />
<PackageReference Include="Ditto" Version="4.14.3" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ private void StartSync()
{
try
{
ditto.StartSync();
ditto.Sync.Start();

// Register a subscription, which determines what data syncs to this peer
// https://docs.ditto.live/sdk/latest/sync/syncing-data#creating-subscriptions
Expand Down Expand Up @@ -358,7 +358,7 @@ private void StopSync()

try
{
ditto.StopSync();
ditto.Sync.Stop();
}
catch (Exception e)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageReference Include="Ditto" Version="4.13.1" />
<PackageReference Include="Ditto" Version="4.14.3" />
<PackageReference Include="Terminal.Gui" Version="1.17.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Ditto" Version="4.13.1" />
<PackageReference Include="Ditto" Version="4.14.3" />
<PackageReference Include="Terminal.Gui" Version="1.17.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion dotnet-tui/DittoDotNetTasksConsole/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static async Task Main(string[] args)

// Disable Ditto's standard-error logging, which would interfere
// with the the Terminal.Gui UI.
DittoLogger.SetLoggingEnabled(false);
DittoLogger.IsEnabled = false;
RunTerminalGui(peer);
}
catch (Exception ex)
Expand Down
6 changes: 3 additions & 3 deletions dotnet-tui/DittoDotNetTasksConsole/TasksPeer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class TasksPeer : IDisposable
public string AppId { get; private set; }
public string PlaygroundToken { get; private set; }

public bool IsSyncActive => _ditto.IsSyncActive;
public bool IsSyncActive => _ditto.Sync.IsActive;

private Ditto _ditto;

Expand Down Expand Up @@ -275,7 +275,7 @@ public DittoStoreObserver ObserveTasksCollection(Func<IList<ToDoTask>, Task> han
/// </summary>
public void StartSync()
{
_ditto.StartSync();
_ditto.Sync.Start();
}

/// <summary>
Expand All @@ -287,6 +287,6 @@ public void StopSync()
{
subscription.Cancel();
}
_ditto.StopSync();
_ditto.Sync.Stop();
}
}
2 changes: 1 addition & 1 deletion dotnet-winforms/IntegrationTest/IntegrationTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Ditto" Version="4.11.1" />
<PackageReference Include="Ditto" Version="4.14.3" />
<PackageReference Include="System.Text.Json" Version="9.0.4" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion dotnet-winforms/TasksApp/DittoTasksApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Ditto" Version="4.13.1" />
<PackageReference Include="Ditto" Version="4.14.3" />
<PackageReference Include="System.Text.Json" Version="9.0.4" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion dotnet-winforms/TasksApp/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

// Disable Ditto's standard-error logging, which would interfere
// with the the Terminal.Gui UI.
DittoLogger.SetLoggingEnabled(false);
DittoLogger.IsEnabled = false;
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
Expand All @@ -39,7 +39,7 @@

string resourceName = "DittoTasksApp..env";

using (Stream stream = assembly.GetManifestResourceStream(resourceName))

Check warning on line 42 in dotnet-winforms/TasksApp/Program.cs

View workflow job for this annotation

GitHub Actions / Build

Converting null literal or possible null value to non-nullable type.
{
if (stream == null)
{
Expand All @@ -49,7 +49,7 @@
using (var reader = new StreamReader(stream))
{
string line;
while ((line = reader.ReadLine()) != null)

Check warning on line 52 in dotnet-winforms/TasksApp/Program.cs

View workflow job for this annotation

GitHub Actions / Build

Converting null literal or possible null value to non-nullable type.
{
line = line.Trim();

Expand Down
6 changes: 3 additions & 3 deletions dotnet-winforms/TasksApp/TasksPeer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
public string AuthUrl { get; private set; }
public string WebsocketUrl { get; private set; }

public bool IsSyncActive => _ditto.IsSyncActive;
public bool IsSyncActive => _ditto.Sync.IsActive;

private Ditto _ditto;

Expand Down Expand Up @@ -251,9 +251,9 @@
// Deserialize the JSON documents into ToDoTask objects
var tasks = queryResult.Items.Select(d =>
JsonSerializer.Deserialize<ToDoTask>(d.JsonString())
).OrderBy(t => t.Id).ToList();

Check warning on line 254 in dotnet-winforms/TasksApp/TasksPeer.cs

View workflow job for this annotation

GitHub Actions / Build

Dereference of a possibly null reference.

await handler(tasks);

Check warning on line 256 in dotnet-winforms/TasksApp/TasksPeer.cs

View workflow job for this annotation

GitHub Actions / Build

Argument of type 'List<ToDoTask?>' cannot be used for parameter 'arg' of type 'IList<ToDoTask>' in 'Task Func<IList<ToDoTask>, Task>.Invoke(IList<ToDoTask> arg)' due to differences in the nullability of reference types.
}
catch (Exception e)
{
Expand All @@ -267,7 +267,7 @@
/// </summary>
public void StartSync()
{
_ditto.StartSync();
_ditto.Sync.Start();
}

/// <summary>
Expand All @@ -279,6 +279,6 @@
{
subscription.Cancel();
}
_ditto.StopSync();
_ditto.Sync.Stop();
}
}
18 changes: 9 additions & 9 deletions flutter_app/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PODS:
- ditto_live (4.13.1):
- DittoFlutter (= 4.13.1)
- ditto_live (4.14.3):
- DittoFlutter (= 4.14.3)
- Flutter
- DittoFlutter (4.13.1)
- DittoFlutter (4.14.3)
- Flutter (1.0.0)
- integration_test (0.0.1):
- Flutter
Expand Down Expand Up @@ -36,12 +36,12 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/permission_handler_apple/ios"

SPEC CHECKSUMS:
ditto_live: 93459c7d7c067ba16d4104925ea80c54dd13bf67
DittoFlutter: 26e21d5665e9bcc11660c4eceb1ec66b8ba64667
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
ditto_live: 01cde75b8b98f45b65c13dfad5b4667e1bcf0306
DittoFlutter: 1745a5b3152fb758f1604f5f9a26fb3d64362dba
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d

PODFILE CHECKSUM: 1959d098c91d8a792531a723c4a9d7e9f6a01e38

Expand Down
14 changes: 7 additions & 7 deletions flutter_app/macos/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PODS:
- ditto_live (4.13.1):
- DittoFlutter (= 4.13.1)
- ditto_live (4.14.3):
- DittoFlutter (= 4.14.3)
- FlutterMacOS
- DittoFlutter (4.13.1)
- DittoFlutter (4.14.3)
- FlutterMacOS (1.0.0)
- path_provider_foundation (0.0.1):
- Flutter
Expand All @@ -26,10 +26,10 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin

SPEC CHECKSUMS:
ditto_live: a46b3eba63227c95adffe6094d3153a74c060d0c
DittoFlutter: 26e21d5665e9bcc11660c4eceb1ec66b8ba64667
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
ditto_live: ea593266e0fef6ae9e87f94f07bcaf62e331262d
DittoFlutter: 1745a5b3152fb758f1604f5f9a26fb3d64362dba
FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564

PODFILE CHECKSUM: 7eb978b976557c8c1cd717d8185ec483fd090a82

Expand Down
42 changes: 21 additions & 21 deletions flutter_app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ packages:
dependency: transitive
description:
name: characters
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "1.4.1"
clock:
dependency: transitive
description:
Expand Down Expand Up @@ -69,10 +69,10 @@ packages:
dependency: "direct main"
description:
name: ditto_live
sha256: f095d52ec464e0c50323a4c37717a4e4727c00c035be8e11c0120b5bac927103
sha256: "103c5e3963e1b6988114840ff2ff9d469fb8032124659fb6ec8c8465a19c7c8f"
url: "https://pub.dev"
source: hosted
version: "4.13.1"
version: "4.14.3"
equatable:
dependency: "direct main"
description:
Expand Down Expand Up @@ -179,26 +179,26 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev"
source: hosted
version: "10.0.9"
version: "11.0.2"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
url: "https://pub.dev"
source: hosted
version: "3.0.9"
version: "3.0.10"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
version: "3.0.2"
lints:
dependency: transitive
description:
Expand All @@ -219,26 +219,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
url: "https://pub.dev"
source: hosted
version: "0.12.17"
version: "0.12.18"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
url: "https://pub.dev"
source: hosted
version: "0.11.1"
version: "0.13.0"
meta:
dependency: transitive
description:
name: meta
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
url: "https://pub.dev"
source: hosted
version: "1.16.0"
version: "1.17.0"
path:
dependency: transitive
description:
Expand Down Expand Up @@ -424,10 +424,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
url: "https://pub.dev"
source: hosted
version: "0.7.4"
version: "0.7.9"
typed_data:
dependency: transitive
description:
Expand All @@ -440,10 +440,10 @@ packages:
dependency: transitive
description:
name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.2.0"
vm_service:
dependency: transitive
description:
Expand Down Expand Up @@ -477,5 +477,5 @@ packages:
source: hosted
version: "1.1.0"
sdks:
dart: ">=3.7.0-0 <4.0.0"
dart: ">=3.9.0-0 <4.0.0"
flutter: ">=3.24.0"
2 changes: 1 addition & 1 deletion flutter_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
flutter:
sdk: flutter

ditto_live: 4.13.1
ditto_live: ^4.14.3

# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
Expand Down
8 changes: 4 additions & 4 deletions javascript-tui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion javascript-tui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"dist"
],
"dependencies": {
"@dittolive/ditto": "4.13.1",
"@dittolive/ditto": "^4.14.3",
"dotenv": "^16.4.5",
"ink": "^4.1.0",
"meow": "^11.0.0",
Expand Down
Loading
Loading