Fix format-xx.sh files wrt logging, add proper Swift formatting configuration.

Author: badlogic

Package.swift

@@ -27,7 +27,7 @@ let package = Package(
                 .byName(
                     name: "Spine",
                     condition: .when(platforms: [
-                        .iOS,
+                        .iOS
                     ])
                 ),
                 "SpineCppLite",
@@ -38,21 +38,21 @@ let package = Package(
         .target(
             name: "Spine",
             dependencies: [
-                "SpineCppLite", "SpineShadersStructs"
+                "SpineCppLite", "SpineShadersStructs",
             ],
             path: "spine-ios/Sources/Spine"
         ),
         .target(
             name: "SpineCppLite",
             path: "spine-ios/Sources/SpineCppLite",
             linkerSettings: [
-                .linkedLibrary("c++"),
+                .linkedLibrary("c++")
             ]
         ),
         .systemLibrary(
             name: "SpineShadersStructs",
             path: "spine-ios/Sources/SpineShadersStructs"
-        )
+        ),
     ],
     cxxLanguageStandard: .cxx11
 )

formatters/.swift-format

@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "lineLength": 150,
+  "indentation": {
+    "spaces": 4
+  },
+  "tabWidth": 4,
+  "maximumBlankLines": 2,
+  "respectsExistingLineBreaks": true,
+  "lineBreakBeforeControlFlowKeywords": false,
+  "lineBreakBeforeEachArgument": false,
+  "lineBreakBeforeEachGenericRequirement": false,
+  "prioritizeKeepingFunctionOutputTogether": true,
+  "indentConditionalCompilationBlocks": true,
+  "lineBreakAroundMultilineExpressionChainComponents": false,
+  "rules": {
+    "AllPublicDeclarationsHaveDocumentation": false,
+    "AlwaysUseLowerCamelCase": true,
+    "AmbiguousTrailingClosureOverload": true,
+    "BeginDocumentationCommentWithOneLineSummary": false,
+    "DoNotUseSemicolons": true,
+    "DontRepeatTypeInStaticProperties": true,
+    "FileScopedDeclarationPrivacy": true,
+    "FullyIndirectEnum": true,
+    "GroupNumericLiterals": true,
+    "IdentifiersMustBeASCII": true,
+    "NeverForceUnwrap": false,
+    "NeverUseForceTry": false,
+    "NeverUseImplicitlyUnwrappedOptionals": false,
+    "NoAccessLevelOnExtensionDeclaration": true,
+    "NoBlockComments": true,
+    "NoCasesWithOnlyFallthrough": true,
+    "NoEmptyTrailingClosureParentheses": true,
+    "NoLabelsInCasePatterns": true,
+    "NoLeadingUnderscores": false,
+    "NoParensAroundConditions": true,
+    "NoVoidReturnOnFunctionSignature": true,
+    "OneCasePerLine": true,
+    "OneVariableDeclarationPerLine": true,
+    "OnlyOneTrailingClosureArgument": false,
+    "OrderedImports": true,
+    "ReturnVoidInsteadOfEmptyTuple": true,
+    "UseEarlyExits": false,
+    "UseLetInEveryBoundCaseVariable": true,
+    "UseShorthandTypeNames": true,
+    "UseSingleLinePropertyGetter": true,
+    "UseSynthesizedInitializer": true,
+    "UseTripleSlashForDocumentationComments": true,
+    "UseWhereClausesInForLoops": false,
+    "ValidateDocumentationComments": false
+  }
+}

formatters/format-cpp.sh

@@ -1,16 +1,21 @@
 #!/bin/bash
 set -e
 
-# Format C/C++ files with clang-format
-echo "Formatting C/C++ files..."
-
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
+# Source logging utilities
+source "$dir/logging/logging.sh"
+
+log_title "C/C++ Formatting"
+
 # Store original directory
 pushd "$dir" > /dev/null
 
-if [ ! -f ".clang-format" ]; then
-    echo "Error: .clang-format not found in formatters directory"
+log_action "Checking for formatters/.clang-format"
+if [ -f ".clang-format" ]; then
+    log_ok
+else
+    log_fail
     popd > /dev/null
     exit 1
 fi
@@ -22,47 +27,47 @@ cpp_dirs=(
     "../spine-cpp/src/spine"
     "../spine-cpp/spine-cpp-lite"
     "../spine-cpp/tests"
-    
+
     # spine-c
     "../spine-c/include"
     "../spine-c/src"
     "../spine-c/src/generated"
     "../spine-c/tests"
-    
+
     # spine-godot
     "../spine-godot/spine_godot"
-    
+
     # spine-ue
     "../spine-ue/Source/SpineUE"
     "../spine-ue/Plugins/SpinePlugin/Source/SpinePlugin/Public"
     "../spine-ue/Plugins/SpinePlugin/Source/SpinePlugin/Private"
     "../spine-ue/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public"
     "../spine-ue/Plugins/SpinePlugin/Source/SpineEditorPlugin/Private"
-    
+
     # spine-glfw
     "../spine-glfw/src"
     "../spine-glfw/example"
-    
+
     # spine-sdl
     "../spine-sdl/src"
     "../spine-sdl/example"
-    
+
     # spine-sfml
     "../spine-sfml/c/src/spine"
     "../spine-sfml/c/example"
     "../spine-sfml/cpp/src/spine"
     "../spine-sfml/cpp/example"
-    
+
     # spine-cocos2dx
     "../spine-cocos2dx/spine-cocos2dx/src/spine"
     "../spine-cocos2dx/example/Classes"
-    
+
     # spine-ios
     "../spine-ios/Sources/SpineCppLite"
     "../spine-ios/Sources/SpineCppLite/include"
     "../spine-ios/Sources/SpineShadersStructs"
     "../spine-ios/Example/Spine iOS Example"
-    
+
     # spine-flutter
     "../spine-flutter/ios/Classes"
     "../spine-flutter/macos/Classes"
@@ -86,22 +91,16 @@ for cpp_dir in "${cpp_dirs[@]}"; do
     fi
 done
 
-echo "Found ${#files[@]} C/C++ files to format"
 
-# Format all files in one call - works for both Docker and native
-echo "Formatting ${#files[@]} files..."
-if ! clang-format -i -style=file:".clang-format" "${files[@]}" 2>&1; then
-    echo "Error: clang-format failed"
-    errors=1
+log_action "Formatting ${#files[@]} C/C++ files"
+if FORMAT_OUTPUT=$(clang-format -i -style=file:".clang-format" "${files[@]}" 2>&1); then
+    log_ok
 else
-    errors=0
-fi
-
-if [ $errors -gt 0 ]; then
-    echo "Completed with $errors errors"
+    log_fail
+    log_error_output "$FORMAT_OUTPUT"
+    popd > /dev/null
+    exit 1
 fi
 
-echo "C/C++ formatting complete"
-
 # Return to original directory
 popd > /dev/null

formatters/format-csharp.sh

@@ -1,48 +1,66 @@
 #!/bin/bash
 set -e
 
-# Format C# files with dotnet-format
-echo "Formatting C# files..."
-
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
+# Source logging utilities
+source "$dir/logging/logging.sh"
+
+log_title "C# Formatting"
+
 if command -v dotnet &> /dev/null; then
     # Store original directory
     pushd "$dir" > /dev/null
-    
-    # Copy .editorconfig to C# directories
+
     cp .editorconfig ../spine-csharp/ 2>/dev/null || true
     cp .editorconfig ../spine-monogame/ 2>/dev/null || true
     cp .editorconfig ../spine-unity/ 2>/dev/null || true
 
     # Format spine-csharp
+    log_action "Formatting spine-csharp"
     pushd ../spine-csharp > /dev/null
-    dotnet format spine-csharp.csproj --no-restore --verbosity quiet 2>/dev/null || echo "Warning: Some issues with spine-csharp formatting"
+    if DOTNET_OUTPUT=$(dotnet format spine-csharp.csproj --no-restore --verbosity quiet 2>&1); then
+        log_ok
+    else
+        log_warn
+        log_detail "$DOTNET_OUTPUT"
+    fi
     popd > /dev/null
-    
+
     # Format spine-monogame
+    log_action "Formatting spine-monogame"
     pushd ../spine-monogame > /dev/null
-    dotnet format --no-restore --verbosity quiet 2>/dev/null || echo "Warning: Some issues with spine-monogame formatting"
+    if DOTNET_OUTPUT=$(dotnet format --no-restore --verbosity quiet 2>&1); then
+        log_ok
+    else
+        log_warn
+        log_detail "$DOTNET_OUTPUT"
+    fi
     popd > /dev/null
-    
+
     # Format spine-unity - look for .cs files directly
-    if [ -d ../spine-unity ]; then
-        echo "Formatting spine-unity C# files directly..."
-        pushd ../spine-unity > /dev/null
-        # Find all .cs files and format them using dotnet format whitespace
+    log_action "Formatting spine-unity C# files"
+    pushd ../spine-unity > /dev/null
+    # Find all .cs files and format them using dotnet format whitespace
+    cs_files=$(find . -name "*.cs" -type f -not -path "./Library/*" -not -path "./Temp/*" -not -path "./obj/*" -not -path "./bin/*" | wc -l | tr -d ' ')
+    if [ "$cs_files" -gt 0 ]; then
         find . -name "*.cs" -type f -not -path "./Library/*" -not -path "./Temp/*" -not -path "./obj/*" -not -path "./bin/*" | while read -r file; do
             dotnet format whitespace --include "$file" --no-restore 2>/dev/null || true
         done
-        popd > /dev/null
+        log_ok
+    else
+        log_skip
     fi
+    popd > /dev/null
 
-    # Clean up .editorconfig files
     rm -f ../spine-csharp/.editorconfig
     rm -f ../spine-monogame/.editorconfig
     rm -f ../spine-unity/.editorconfig
-    
+
     # Return to original directory
     popd > /dev/null
 else
-    echo "Warning: dotnet not found. Skipping C# formatting."
+    log_fail
+    log_error_output "dotnet not found. Please install .NET SDK to format C# files."
+    exit 1
 fi

formatters/format-dart.sh

@@ -1,22 +1,44 @@
 #!/bin/bash
 set -e
 
-# Format Dart files
-echo "Formatting Dart files..."
-
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
+# Source logging utilities
+source "$dir/logging/logging.sh"
+
+log_title "Dart Formatting"
+
 # Store original directory
 pushd "$dir" > /dev/null
 
 if command -v dart &> /dev/null; then
-    find .. -name "*.dart" \
+    dart_files=$(find .. -name "*.dart" \
         -not -path "*/.*" \
         -not -path "*/node_modules/*" \
-        -not -path "*/build/*" \
-        -exec dart format --page-width 120 {} +
+        -not -path "*/build/*" | wc -l | tr -d ' ')
+
+    if [ "$dart_files" -gt 0 ]; then
+        log_action "Formatting $dart_files Dart files"
+        if DART_OUTPUT=$(find .. -name "*.dart" \
+            -not -path "*/.*" \
+            -not -path "*/node_modules/*" \
+            -not -path "*/build/*" \
+            -exec dart format --page-width 120 {} + 2>&1); then
+            log_ok
+        else
+            log_fail
+            log_error_output "$DART_OUTPUT"
+            popd > /dev/null
+            exit 1
+        fi
+    else
+        log_action "Formatting Dart files"
+        log_skip
+    fi
 else
-    echo "Warning: dart not found. Skipping Dart formatting."
+    log_fail
+    log_error_output "dart not found. Please install Dart SDK to format Dart files."
+    exit 1
 fi
 
 # Return to original directory

formatters/format-haxe.sh

@@ -1,21 +1,45 @@
 #!/bin/bash
 set -e
 
-# Format Haxe files
-echo "Formatting Haxe files..."
-
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
+# Source logging utilities
+source "$dir/logging/logging.sh"
+
+log_title "Haxe Formatting"
+
 # Store original directory
 pushd "$dir" > /dev/null
 
-if command -v haxelib &> /dev/null && haxelib list formatter &> /dev/null; then
-    # Format spine-haxe directory
-    if [ -d ../spine-haxe ]; then
-        haxelib run formatter -s ../spine-haxe
+if command -v haxelib &> /dev/null; then
+    log_action "Checking Haxe formatter availability"
+    if HAXELIB_OUTPUT=$(haxelib list formatter 2>&1); then
+        log_ok
+
+        # Format spine-haxe directory
+        if [ -d ../spine-haxe ]; then
+            log_action "Formatting spine-haxe directory"
+            if FORMATTER_OUTPUT=$(haxelib run formatter -s ../spine-haxe 2>&1); then
+                log_ok
+            else
+                log_fail
+                log_error_output "$FORMATTER_OUTPUT"
+                popd > /dev/null
+                exit 1
+            fi
+        else
+            log_action "Formatting spine-haxe directory"
+            log_skip
+        fi
+    else
+        log_fail
+        log_error_output "Haxe formatter not found. Install with: haxelib install formatter"
+        exit 1
     fi
 else
-    echo "Warning: haxe formatter not found. Install with: haxelib install formatter"
+    log_fail
+    log_error_output "haxelib not found. Please install Haxe to format Haxe files."
+    exit 1
 fi
 
 # Return to original directory