From e2ca8ee8151f487537146fbfc86a614b01e64a8e Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Sat, 26 Mar 2022 18:46:21 -0700
Subject: [PATCH] Arduino-cli 0.14 is ancient and unsupported.

Remove the workarounds for its old deprecated --build-properties syntax.
Also fix the other place we were using the deprecated syntax
---
 etc/makefiles/arduino-cli.mk | 13 +------------
 etc/makefiles/sketch.mk      |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/etc/makefiles/arduino-cli.mk b/etc/makefiles/arduino-cli.mk
index ac8ffbd7..4ee3d94a 100644
--- a/etc/makefiles/arduino-cli.mk
+++ b/etc/makefiles/arduino-cli.mk
@@ -104,22 +104,11 @@ _arduino_props := $(shell ${ARDUINO_CLI}  compile $(fqbn_arg) --show-properties
 
 _arduino_prop = $(subst $1=,,$(subst 🔥, ,$(filter $1=%,$(_arduino_props))))
 
-_arduino_version := $(shell ${ARDUINO_CLI} version | sed 's/.*Version: \([0-9][0-9\.]*\).*/\1/')
-
-export ARDUINO_CLI_VERSION ?= $(_arduino_version)
-
-_arduino_build_property_flag := $(shell echo -e "0.14\n${ARDUINO_CLI_VERSION}" | sort -C -t. -k1,1n -k2,2n && echo "YES")
-
-ARDUINO_BUILD_PROP_FLAG := --build-properties
-ifeq ($(_arduino_build_property_flag),YES)
-ARDUINO_BUILD_PROP_FLAG := --build-property
-endif
-
 # How to use_arduino_prop
 # $(call _arduino_prop,recipe.hooks.sketch.prebuild.2.pattern)
 
 ifneq ($(KALEIDOSCOPE_CCACHE),) 
-ccache_wrapper_property := $(ARDUINO_BUILD_PROP_FLAG) "compiler.wrapper.cmd=ccache"
+ccache_wrapper_property := --build-property compiler.wrapper.cmd=ccache
 endif
 
 .PHONY: configure-arduino-cli install-arduino-core-kaleidoscope install-arduino-core-avr
diff --git a/etc/makefiles/sketch.mk b/etc/makefiles/sketch.mk
index d54a7ef3..abec3273 100644
--- a/etc/makefiles/sketch.mk
+++ b/etc/makefiles/sketch.mk
@@ -162,7 +162,7 @@ clean:
 
 
 ifneq ($(LOCAL_CFLAGS),)
-local_cflags_property = --build-properties "compiler.cpp.extra_flags=${LOCAL_CFLAGS}"
+local_cflags_property = --build-property "compiler.cpp.extra_flags=${LOCAL_CFLAGS}"
 else
 local_cflags_property =
 endif