From 74a49a732eccfae94c9a45e647f84faabedeb2de Mon Sep 17 00:00:00 2001 From: Kris Johnson Date: Thu, 24 Jul 2025 10:18:45 -0400 Subject: [PATCH 1/5] chore: add top-level `.editorconfig`, copied from the `ditto` repository --- .editorconfig | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..abb18b548 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,39 @@ +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{cjs,js,json,ts}] +indent_size = 2 + +[*.sh] +# like -i=4 +indent_style = space +indent_size = 4 +switch_case_indent = false + +[[shell]] +# like -i=4 +indent_style = space +indent_size = 4 +switch_case_indent = false + +[{.cxx,gradlew*,node_modules}] +ignore = true + +[target/**] +ignore = true + +[.direnv/**] +ignore = true + +[**/Pods/**] +ignore = true + +[**/node_modules/**] +ignore = true + From a5aea6414c48bf6f29a5e2779f7f95c91efb5026 Mon Sep 17 00:00:00 2001 From: Kristopher Johnson Date: Thu, 24 Jul 2025 10:37:05 -0400 Subject: [PATCH 2/5] Update .editorconfig Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .editorconfig | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index abb18b548..dc080e048 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,11 +16,7 @@ indent_style = space indent_size = 4 switch_case_indent = false -[[shell]] -# like -i=4 -indent_style = space -indent_size = 4 -switch_case_indent = false +# Removed redundant and invalid [[shell]] section [{.cxx,gradlew*,node_modules}] ignore = true From cd5b72cdd38e75d61e33b90bf489de5196f2aa11 Mon Sep 17 00:00:00 2001 From: Kristopher Johnson Date: Thu, 24 Jul 2025 10:37:15 -0400 Subject: [PATCH 3/5] Update .editorconfig Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .editorconfig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.editorconfig b/.editorconfig index dc080e048..2e4f80d14 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,18 +18,18 @@ switch_case_indent = false # Removed redundant and invalid [[shell]] section -[{.cxx,gradlew*,node_modules}] -ignore = true +# Exclude files and directories by ensuring they are not matched by any section +# Files like .cxx, gradlew*, and node_modules are not explicitly matched in this file. -[target/**] -ignore = true +# Exclude target directory +[!target/**] -[.direnv/**] -ignore = true +# Exclude .direnv directory +[!.direnv/**] -[**/Pods/**] -ignore = true +# Exclude Pods directory +[!**/Pods/**] -[**/node_modules/**] -ignore = true +# Exclude node_modules directory +[!**/node_modules/**] From 18b62af5bd4695140368fba2ebb8ee193002ca85 Mon Sep 17 00:00:00 2001 From: Kris Johnson Date: Thu, 24 Jul 2025 10:39:00 -0400 Subject: [PATCH 4/5] chore(cpp): remove unnecessary comment --- .editorconfig | 1 - android-cpp/QuickStartTasksCPP/app/build.gradle.kts | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 2e4f80d14..404bc83d7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,7 +16,6 @@ indent_style = space indent_size = 4 switch_case_indent = false -# Removed redundant and invalid [[shell]] section # Exclude files and directories by ensuring they are not matched by any section # Files like .cxx, gradlew*, and node_modules are not explicitly matched in this file. diff --git a/android-cpp/QuickStartTasksCPP/app/build.gradle.kts b/android-cpp/QuickStartTasksCPP/app/build.gradle.kts index b5e5b5019..4983604f9 100644 --- a/android-cpp/QuickStartTasksCPP/app/build.gradle.kts +++ b/android-cpp/QuickStartTasksCPP/app/build.gradle.kts @@ -134,8 +134,8 @@ android { } dependencies { - // Ditto C++ SDK for Android - implementation("live.ditto:ditto-cpp:4.11.0") + // Ditto C++ SDK for Android - using local AAR + implementation(files("/Users/kristopherjohnson/work/cpp-revamp-identity/android/dittocpp/build/outputs/aar/dittocpp-release.aar")) implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) From 0f3916a5ca3766478393df50e3d4341da9c474df Mon Sep 17 00:00:00 2001 From: Kris Johnson Date: Thu, 24 Jul 2025 10:41:33 -0400 Subject: [PATCH 5/5] fix: revert accidental local AAR dependency in android-cpp build.gradle.kts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reverted the Ditto C++ SDK dependency from local AAR file back to the published Maven artifact version 4.11.0. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- android-cpp/QuickStartTasksCPP/app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-cpp/QuickStartTasksCPP/app/build.gradle.kts b/android-cpp/QuickStartTasksCPP/app/build.gradle.kts index 4983604f9..b5e5b5019 100644 --- a/android-cpp/QuickStartTasksCPP/app/build.gradle.kts +++ b/android-cpp/QuickStartTasksCPP/app/build.gradle.kts @@ -134,8 +134,8 @@ android { } dependencies { - // Ditto C++ SDK for Android - using local AAR - implementation(files("/Users/kristopherjohnson/work/cpp-revamp-identity/android/dittocpp/build/outputs/aar/dittocpp-release.aar")) + // Ditto C++ SDK for Android + implementation("live.ditto:ditto-cpp:4.11.0") implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx)