From dd7a046466728a779cec84155019b4bba59b6c14 Mon Sep 17 00:00:00 2001 From: Nuno Ribeiro Date: Wed, 11 Aug 2021 11:07:36 +0200 Subject: [PATCH 1/5] Adds Android winit<->ndk_glue version match table --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 717d52e0ee..d816a9992b 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,17 @@ book]. This library makes use of the [ndk-rs](https://github.com/rust-windowing/android-ndk-rs) crates, refer to that repo for more documentation. +The `ndk_glue` version needs to match the version used by `winit`. Otherwise, the application will not start correctly as `ndk_glue`'s internal NativeActivity static is not the same due to version mismatch. + +`ndk_glue` <-> `winit` version comparison tables: + +| | winit 0.24 | winit 0.25 | +|----------------|:--------------:|---------------:| +| ndk_glue 0.2.1 | ✅ | | +| ndk_glue 0.3.0 | | ✅ | +| ndk_glue 0.4.0 | | | + + Running on an Android device needs a dynamic system library, add this to Cargo.toml: ```toml [[example]] From 4e8c47d6d1e94ef5b0eb5f134df3fad78d5b16ee Mon Sep 17 00:00:00 2001 From: Nuno Ribeiro Date: Wed, 11 Aug 2021 11:10:43 +0200 Subject: [PATCH 2/5] Fixes justification --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d816a9992b..df6285fbae 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ The `ndk_glue` version needs to match the version used by `winit`. Otherwise, th `ndk_glue` <-> `winit` version comparison tables: | | winit 0.24 | winit 0.25 | -|----------------|:--------------:|---------------:| +|----------------|:--------------:|:--------------:| | ndk_glue 0.2.1 | ✅ | | | ndk_glue 0.3.0 | | ✅ | | ndk_glue 0.4.0 | | | From 1bea7a23e1d3b606b02d6ccdfe1b18ef0963748f Mon Sep 17 00:00:00 2001 From: Nuno Ribeiro Date: Wed, 11 Aug 2021 11:12:26 +0200 Subject: [PATCH 3/5] Adds crosses --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index df6285fbae..900c855612 100644 --- a/README.md +++ b/README.md @@ -98,9 +98,9 @@ The `ndk_glue` version needs to match the version used by `winit`. Otherwise, th | | winit 0.24 | winit 0.25 | |----------------|:--------------:|:--------------:| -| ndk_glue 0.2.1 | ✅ | | -| ndk_glue 0.3.0 | | ✅ | -| ndk_glue 0.4.0 | | | +| ndk_glue 0.2.1 | ✅ | ❌ | +| ndk_glue 0.3.0 | ❌ | ✅ | +| ndk_glue 0.4.0 | ❌ | ❌ | Running on an Android device needs a dynamic system library, add this to Cargo.toml: From 989020a8c4695339be3a51c82f55540acf654f78 Mon Sep 17 00:00:00 2001 From: Nuno Ribeiro Date: Wed, 11 Aug 2021 19:34:57 +0200 Subject: [PATCH 4/5] Address review and instead of a m:n table it shows a 1:1 version compatibility --- README.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 900c855612..20cd564d99 100644 --- a/README.md +++ b/README.md @@ -94,16 +94,15 @@ This library makes use of the [ndk-rs](https://github.com/rust-windowing/android The `ndk_glue` version needs to match the version used by `winit`. Otherwise, the application will not start correctly as `ndk_glue`'s internal NativeActivity static is not the same due to version mismatch. -`ndk_glue` <-> `winit` version comparison tables: - -| | winit 0.24 | winit 0.25 | -|----------------|:--------------:|:--------------:| -| ndk_glue 0.2.1 | ✅ | ❌ | -| ndk_glue 0.3.0 | ❌ | ✅ | -| ndk_glue 0.4.0 | ❌ | ❌ | +`ndk_glue` <-> `winit` version comparison compatibility: +| winit | ndk_glue | +| :---: | :------------------: | +| 0.24 | `ndk_glue = "0.2.1"` | +| 0.25 | `ndk_glue = "0.2.1"` | Running on an Android device needs a dynamic system library, add this to Cargo.toml: + ```toml [[example]] name = "request_redraw_threaded" From 55a1a5e23706c71229534f5a86c8525bddcb0224 Mon Sep 17 00:00:00 2001 From: Nuno Ribeiro Date: Wed, 11 Aug 2021 19:51:11 +0200 Subject: [PATCH 5/5] Addresses review --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 20cd564d99..074e41ee0f 100644 --- a/README.md +++ b/README.md @@ -98,8 +98,8 @@ The `ndk_glue` version needs to match the version used by `winit`. Otherwise, th | winit | ndk_glue | | :---: | :------------------: | -| 0.24 | `ndk_glue = "0.2.1"` | -| 0.25 | `ndk_glue = "0.2.1"` | +| 0.24 | `ndk_glue = "0.2.0"` | +| 0.25 | `ndk_glue = "0.3.0"` | Running on an Android device needs a dynamic system library, add this to Cargo.toml: