Merge branch 'master' into arduifine

Author: d-a-v

Diff for: arduino/libraries/librariesresolver/cpp.go

@@ -121,7 +121,6 @@ func computePriority(lib *libraries.Library, header, arch string) int {
 	header = strings.TrimSuffix(header, filepath.Ext(header))
 	header = simplify(header)
 	name := simplify(lib.Name)
-	realName := simplify(lib.RealName)
 
 	priority := 0
 
@@ -138,17 +137,15 @@ func computePriority(lib *libraries.Library, header, arch string) int {
 		priority += 0
 	}
 
-	if realName == header && name == header {
-		priority += 600
-	} else if realName == header || name == header {
+	if name == header {
 		priority += 500
-	} else if realName == header+"-master" || name == header+"-master" {
+	} else if name == header+"-master" {
 		priority += 400
-	} else if strings.HasPrefix(realName, header) || strings.HasPrefix(name, header) {
+	} else if strings.HasPrefix(name, header) {
 		priority += 300
-	} else if strings.HasSuffix(realName, header) || strings.HasSuffix(name, header) {
+	} else if strings.HasSuffix(name, header) {
 		priority += 200
-	} else if strings.Contains(realName, header) || strings.Contains(name, header) {
+	} else if strings.Contains(name, header) {
 		priority += 100
 	}
 

Diff for: arduino/libraries/librariesresolver/cpp_test.go

@@ -143,18 +143,3 @@ func TestCppHeaderResolver(t *testing.T) {
 	require.Equal(t, "Calculus Unified Lib", resolve("calculus_lib.h", l6, l7))
 	require.Equal(t, "Calculus Unified Lib", resolve("calculus_lib.h", l7, l6))
 }
-
-func TestCppHeaderResolverWithLibrariesInStrangeDirectoryNames(t *testing.T) {
-	resolver := NewCppResolver()
-	librarylist := libraries.List{}
-	librarylist.Add(&libraries.Library{Name: "onewire_2_3_4", RealName: "OneWire", Architectures: []string{"*"}})
-	librarylist.Add(&libraries.Library{Name: "onewireng_2_3_4", RealName: "OneWireNg", Architectures: []string{"avr"}})
-	resolver.headers["OneWire.h"] = librarylist
-	require.Equal(t, "onewire_2_3_4", resolver.ResolveFor("OneWire.h", "avr").Name)
-
-	librarylist2 := libraries.List{}
-	librarylist2.Add(&libraries.Library{Name: "OneWire", RealName: "OneWire", Architectures: []string{"*"}})
-	librarylist2.Add(&libraries.Library{Name: "onewire_2_3_4", RealName: "OneWire", Architectures: []string{"avr"}})
-	resolver.headers["OneWire.h"] = librarylist2
-	require.Equal(t, "OneWire", resolver.ResolveFor("OneWire.h", "avr").Name)
-}

Diff for: cli/config/validate.go

@@ -33,6 +33,8 @@ var validMap = map[string]reflect.Kind{
 	"sketch.always_export_binaries": reflect.Bool,
 	"metrics.addr":                  reflect.String,
 	"metrics.enabled":               reflect.Bool,
+	"network.proxy":                 reflect.String,
+	"network.user_agent_ext":        reflect.String,
 }
 
 func typeOf(key string) (reflect.Kind, error) {

Diff for: docs/sketch-specification.md

@@ -5,17 +5,17 @@ The programs that run on Arduino boards are called "sketches". This term was inh
 
 ## Sketch folders and files
 
+The sketch root folder name and code file names must start with a basic letter (`A`-`Z` or `a`-`z`) or number (`0`-`9`),
+followed by basic letters, numbers, underscores (`_`), dots (`.`) and dashes (`-`). The maximum length is 63 characters.
+
+Support for names starting with a number was added in Arduino IDE 1.8.4.
+
 ### Sketch root folder
 
 Because many Arduino sketches only contain a single .ino file, it's easy to think of that file as the sketch. However,
 it is the folder that is the sketch. The reason is that sketches may consist of multiple code files and the folder is
 what groups those files into a single program.
 
-The sketch root folder name must start with a basic letter (`A`-`Z` or `a`-`z`) or number (`0`-`9`), followed by basic
-letters, numbers, underscores (`_`), dots (`.`) and dashes (`-`). The maximum length is 63 characters.
-
-Support for sketch folder names starting with a number was added in Arduino IDE 1.8.4.
-
 ### Primary sketch file
 
 Every sketch must contain a `.ino` file with a file name matching the sketch root folder name.

Diff for: test/test_compile.py

@@ -998,31 +998,6 @@ def test_recompile_with_different_library(run_command, data_dir):
     assert f"Using previously compiled file: {obj_path}" not in res.stdout
 
 
-def test_compile_with_conflicting_libraries_include(run_command, data_dir, copy_sketch):
-    assert run_command("update")
-
-    assert run_command("core install arduino:[email protected]")
-
-    # Install conflicting libraries
-    git_url = "https://github.com/pstolarz/OneWireNg.git"
-    one_wire_ng_lib_path = Path(data_dir, "libraries", "onewireng_0_8_1")
-    assert Repo.clone_from(git_url, one_wire_ng_lib_path, multi_options=["-b 0.8.1"])
-
-    git_url = "https://github.com/PaulStoffregen/OneWire.git"
-    one_wire_lib_path = Path(data_dir, "libraries", "onewire_2_3_5")
-    assert Repo.clone_from(git_url, one_wire_lib_path, multi_options=["-b v2.3.5"])
-
-    sketch_path = copy_sketch("sketch_with_conflicting_libraries_include")
-    fqbn = "arduino:avr:uno"
-
-    res = run_command(f"compile -b {fqbn} {sketch_path} --verbose")
-    assert res.ok
-    lines = [l.strip() for l in res.stdout.splitlines()]
-    assert 'Multiple libraries were found for "OneWire.h"' in lines
-    assert f"Used: {one_wire_lib_path}" in lines
-    assert f"Not used: {one_wire_ng_lib_path}" in lines
-
-
 def test_compile_with_invalid_build_options_json(run_command, data_dir):
     assert run_command("update")