Merge #474

bors[bot] · RaresCon · web-flow · commit 33e3848e634e · 2023-05-22T17:49:16.000Z
474: Updated `license` for APIs r=jrvanwhy a=RaresCon ### Pull Request Overview I've updated the `license` field in several `Cargo.toml` files to SPDX expression for APIs. This PR resolves #463. ### Testing Strategy This pull request didn't need testing. ### TODO or Help Wanted This pull request still needs review. ### Documentation Updated - [x] No updates required. Co-authored-by: RaresCon <rares.constantin2002@gmail.com>
diff --git a/apis/adc/Cargo.toml b/apis/adc/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_adc"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2021"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock adc driver"
diff --git a/apis/air_quality/Cargo.toml b/apis/air_quality/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_air_quality"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2021"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock air quality driver"
diff --git a/apis/alarm/Cargo.toml b/apis/alarm/Cargo.toml
@@ -5,7 +5,7 @@ authors = [
     "Tock Project Developers <tock-dev@googlegroups.com>",
     "dcz <gihuac.dcz@porcupinefactory.org>",
 ]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2018"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock alarm driver"
diff --git a/apis/ambient_light/Cargo.toml b/apis/ambient_light/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_ambient_light"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2021"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock ambient light driver"
diff --git a/apis/buttons/Cargo.toml b/apis/buttons/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_buttons"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2018"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock buttons driver"
diff --git a/apis/buzzer/Cargo.toml b/apis/buzzer/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_buzzer"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2021"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock buzzer driver"
diff --git a/apis/console/Cargo.toml b/apis/console/Cargo.toml
@@ -5,7 +5,7 @@ authors = [
     "Tock Project Developers <tock-dev@googlegroups.com>",
     "dcz <gihuac.dcz@porcupinefactory.org>",
 ]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2021"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock console driver"
diff --git a/apis/gpio/Cargo.toml b/apis/gpio/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_gpio"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2018"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock gpio driver"
diff --git a/apis/leds/Cargo.toml b/apis/leds/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_leds"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2021"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock leds driver"
diff --git a/apis/low_level_debug/Cargo.toml b/apis/low_level_debug/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_low_level_debug"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2021"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock low-level debug drivers"
diff --git a/apis/ninedof/Cargo.toml b/apis/ninedof/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_ninedof"
 version = "0.1.0"
 authors = [ "Tock Project Developers <tock-dev@googlegroups.com>" ]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2018"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock nine degrees of freedom driver"
diff --git a/apis/proximity/Cargo.toml b/apis/proximity/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_proximity"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2021"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock proximity driver"
diff --git a/apis/sound_pressure/Cargo.toml b/apis/sound_pressure/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_sound_pressure"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2018"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock sound pressure driver"
diff --git a/apis/temperature/Cargo.toml b/apis/temperature/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libtock_temperature"
 version = "0.1.0"
 authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-license = "MIT/Apache-2.0"
+license = "Apache-2.0 OR MIT"
 edition = "2021"
 repository = "https://www.github.com/tock/libtock-rs"
 description = "libtock temperature driver"

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ authors = [`
`5`	`5`	`"Tock Project Developers <[email protected]>",`
`6`	`6`	`"dcz <[email protected]>",`
`7`	`7`	`]`
`8`		`-license = "MIT/Apache-2.0"`
	`8`	`+license = "Apache-2.0 OR MIT"`
`9`	`9`	`edition = "2018"`
`10`	`10`	`repository = "https://www.github.com/tock/libtock-rs"`
`11`	`11`	`description = "libtock alarm driver"`