Skip to content

Commit 02fec3d

Browse files
Merge pull request #1105 from cypherstack/gradle_ndk
Gradle ndk
2 parents f1014a6 + 3251159 commit 02fec3d

33 files changed

+817
-1013
lines changed

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G
1+
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version '8.6.0' apply false
21+
id "com.android.application" version '8.7.0' apply false
2222
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
2323
}
2424

docs/building.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ Install [Rust](https://www.rust-lang.org/tools/install) via [rustup.rs](https://
7272
```
7373
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
7474
source ~/.bashrc
75-
rustup install 1.67.1 1.71.0 1.72.0 1.73.0
76-
rustup default 1.67.1
75+
rustup install 1.85.1
76+
rustup default 1.85.1
7777
cargo install cargo-ndk --version 2.12.7 --locked
7878
```
7979

@@ -209,12 +209,12 @@ brew install brotli cairo coreutils gdbm gettext glib gmp libevent libidn2 libng
209209
```
210210
<!-- TODO: determine which of the above list are not needed at all. -->
211211

212-
Download and install [Rust](https://www.rust-lang.org/tools/install). [Rustup](https://rustup.rs/) is recommended for Rust setup. Use `rustc` to confirm successful installation. Install toolchains 1.67.1 and 1.72.0 and `cbindgen` and `cargo-lipo` too. You will also have to add the platform target(s) `aarch64-apple-ios` and/or `aarch64-apple-darwin`. You can use the command(s):
212+
Download and install [Rust](https://www.rust-lang.org/tools/install). [Rustup](https://rustup.rs/) is recommended for Rust setup. Use `rustc` to confirm successful installation. Install toolchain 1.85.1 and `cbindgen` and `cargo-lipo` too. You will also have to add the platform target(s) `aarch64-apple-ios` and/or `aarch64-apple-darwin`. You can use the command(s):
213213
```
214214
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
215215
source ~/.bashrc
216-
rustup install 1.67.1 1.71.0 1.72.0 1.73.0
217-
rustup default 1.67.1
216+
rustup install 1.85.1
217+
rustup default 1.85.1
218218
cargo install cargo-ndk --version 2.12.7 --locked
219219
cargo install cbindgen cargo-lipo
220220
rustup target add aarch64-apple-ios aarch64-apple-darwin
@@ -306,8 +306,8 @@ Run `flutter doctor` in PowerShell to confirm its installation.
306306
### Rust
307307
Install [Rust](https://www.rust-lang.org/tools/install) on the Windows host (not in WSL2). Download the installer from [rustup.rs](https://rustup.rs), make sure it works on the commandline (you may need to open a new terminal), and install the following versions:
308308
```
309-
rustup install 1.67.1 1.71.0 1.72.0 1.73.0
310-
rustup default 1.67.1
309+
rustup install 1.85.1
310+
rustup default 1.85.1
311311
cargo install cargo-ndk --version 2.12.7 --locked
312312
```
313313

0 commit comments

Comments
 (0)