From 4be75f0a906e37e03a2203dd80fc689a8bed1c44 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 9 Jun 2023 11:16:29 -0700 Subject: [PATCH 1/3] MSRV 1.63 to match geo-types --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 4781bab1..76808fc6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ keywords = ["proj", "projection", "osgeo", "geo"] license = "MIT OR Apache-2.0" readme = "README.md" edition = "2018" +rust-version = "1.63" [dependencies] proj-sys = { version = "0.23.1", path = "proj-sys" } From 76746a3365259909f7b1257c3c41665bc5ce4deb Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 9 Jun 2023 11:34:33 -0700 Subject: [PATCH 2/3] update ci containers --- .github/workflows/test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f282958f..e5e2ddf7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,9 +40,9 @@ jobs: matrix: container_image: # Minimum supported rust (MSRV) - - "georust/proj-ci:proj-9.1.0-rust-1.58" + - "georust/proj-ci:proj-9.1.0-rust-1.63" # Latest stable rust - - "georust/proj-ci:proj-9.1.0-rust-1.64" + - "georust/proj-ci:proj-9.1.0-rust-1.70" features: - "" - "--features network" @@ -87,34 +87,34 @@ jobs: include: # Minimum supported rust (MSRV) - container: - image: georust/proj-ci:proj-9.1.0-rust-1.58 + image: georust/proj-ci:proj-9.1.0-rust-1.63 env: _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0 features: "" - container: - image: georust/proj-ci:proj-9.1.0-rust-1.58 + image: georust/proj-ci:proj-9.1.0-rust-1.63 env: _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1 features: "--features bundled_proj" - container: - image: georust/proj-ci-without-system-proj:proj-9.1.0-rust-1.58 + image: georust/proj-ci-without-system-proj:proj-9.1.0-rust-1.63 env: _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1 features: "" # Latest stable rust - container: - image: georust/proj-ci:proj-9.1.0-rust-1.64 + image: georust/proj-ci:proj-9.1.0-rust-1.70 env: _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0 features: "" - container: - image: georust/proj-ci:proj-9.1.0-rust-1.64 + image: georust/proj-ci:proj-9.1.0-rust-1.70 env: _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1 features: "--features bundled_proj" - container: - image: georust/proj-ci-without-system-proj:proj-9.1.0-rust-1.64 + image: georust/proj-ci-without-system-proj:proj-9.1.0-rust-1.70 env: _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1 features: "" From 0c2c7d77db932440909f1cd5339587b639b5c65b Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 9 Jun 2023 12:17:57 -0700 Subject: [PATCH 3/3] update changelog, add missing links --- CHANGES.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index e31ab484..066a6b5e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,11 +4,15 @@ - Bump `approx` dev dependency to match `geo-types`. This doesn't affect downstream users, only those building the proj crate for development. + - - Changed license field to [SPDX 2.1 license expression](https://spdx.dev/spdx-specification-21-web-version/#h.jxpfx0ykyb60) - - - Run clippy and apply fixes + - - Update to geo-types 0.7.8 + - +- Update MSRV to 1.63 + - ## 0.27.0 - Inline the functionality of the legacy `Info` trait directly into `Proj`/`ProjBuilder` and remove the `Info` trait.