Use consistent indent style throughout

Until now we've had multiple styles throught the project. This doesn't
buy us anything for contributors as each source file might be different
- totally negating the point of having a clang-format style in the first
place - indeed I started debugging clang-format since it was apparently
not formatting my adapter code as 4 spaces after my editor had loaded
the editconfig file specifying 4 spaces. I wasted an hour on that!

Here we codify everything as LLVM style, which seems to be used by the
majority of the project.

We also bump the clang-format version requirement to v18.1 to align with
dpc++.

Author: ldrumm

.clang-format

@@ -1,7 +1,4 @@
 ---
 Language:      Cpp
 BasedOnStyle:  LLVM
-IndentWidth:   4
-InsertBraces: true
-ReflowComments: false
 ...

.editorconfig

@@ -1,6 +1,15 @@
 [*]
 indent_style = space
+indent_size = 2
+
+[*.py]
 indent_size = 4
 
-[.github/workflows/*.yml]
-indent_size = 2
+[scripts/core/*]
+indent_size = 4
+
+[CMakeLists.txt]
+indent_size = 4
+
+[*.cmake]
+indent_size = 4

CMakeLists.txt

@@ -236,13 +236,13 @@ endif()
 
 # Check if clang-format (in correct version) is available for Cpp code formatting.
 if(UR_FORMAT_CPP_STYLE)
-    find_program(CLANG_FORMAT NAMES clang-format-15 clang-format-15.0 clang-format)
+    find_program(CLANG_FORMAT NAMES clang-format-18 clang-format-18.1 clang-format)
 
     if(CLANG_FORMAT)
         get_program_version_major_minor(${CLANG_FORMAT} CLANG_FORMAT_VERSION)
         message(STATUS "Found clang-format: ${CLANG_FORMAT} (version: ${CLANG_FORMAT_VERSION})")
 
-        set(CLANG_FORMAT_REQUIRED "15.0")
+        set(CLANG_FORMAT_REQUIRED "18.1")
         if(NOT (CLANG_FORMAT_VERSION VERSION_EQUAL CLANG_FORMAT_REQUIRED))
             message(FATAL_ERROR "required clang-format version is ${CLANG_FORMAT_REQUIRED}")
         endif()

REQUIREMENTS.md

@@ -3,9 +3,9 @@
 ## API and Library Requirements
 
 ### API Namespace
-* API’s will clearly define the functionality
-* API’s will use a consistent style within the library
-* APIs’ will not allow namespace collision when multiple libraries are linked in the same user application
+* APIs will clearly define the functionality
+* APIs will use a consistent style within the library
+* APIs will not allow namespace collision when multiple libraries are linked in the same user application
 * API will be consistent across libraries included in the product
 * Will not allow namespace collision when multiple libraries are linked in the same user application
 * Exceptions:

include/.clang-format

@@ -129,7 +129,7 @@ def jsonRead(path):
 def jsonWrite(path, data):
     try:
         with open(path, 'w') as fout:
-            fout.write(json.dumps(data, indent=4, sort_keys=True))
+            fout.write(json.dumps(data, indent=2, sort_keys=True))
     except:
         print("error: unable to write %s"%path)