From 8cce818feab8aec2c1e33abbd09e656b20320bf7 Mon Sep 17 00:00:00 2001 From: John Smith Date: Tue, 23 Aug 2022 12:55:15 -0400 Subject: [PATCH] clarify instructions, adjust flutter app --- README.md | 47 ++++---------------- veilid-flutter/example/ios/Podfile.lock | 2 +- veilid-flutter/example/ios/Runner/Info.plist | 2 + veilid-flutter/example/lib/config.dart | 8 ++-- 4 files changed, 15 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index a01ba7ad..6ad68114 100644 --- a/README.md +++ b/README.md @@ -80,51 +80,20 @@ cd veilid-flutter Development of Veilid on MacOS is possible on both Intel and ARM hardware. Development requires: +* Android Studio * Xcode, preferably latest version * Homebrew [here](https://brew.sh) * Android SDK and NDK -* Java 8 * Rust -You may decide to use Android Studio [here](https://developer.android.com/studio) -to maintain your Android dependencies. If so, use the dependency manager -within your IDE. If you plan on using Flutter for Veilid development, the Android Studio -method is highly recommended as you may run into path problems with the 'flutter' -command line without it. If you do so, you may skip to -[Run Veilid setup script](#Run Veilid setup script). +You will need to use Android Studio [here](https://developer.android.com/studio) +to maintain your Android dependencies. Use the SDK Manager in the IDE to install the following packages (use package details view to select version): +* Android SDK Build Tools (30.0.3) +* NDK (Side-by-side) (22.0.7026061) +* Cmake (3.22.1) +* Android SDK Command Line Tools (latest) (7.0/latest) -* build-tools;30.0.3 -* ndk;22.0.7026061 -* cmake;3.22.1 - -#### Setup Java - -```shell -brew install openjdk@8 -``` -and then symlink it as appropriate for your system: - -Intel: -```shell -sudo ln -sfn /usr/local/opt/openjdk@8/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-8.jdk -``` - -ARM: -```shell -sudo ln -sfn /opt/homebrew/openjdk@8/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-8.jdk -``` - - -#### Setup Dependencies using the CLI - -Otherwise, you may choose to use Android `sdkmanager`. Use -the command line to install the requisite package versions: `brew install android-commandlinetools` - -```shell -sdkmanager --install "build-tools;30.0.3" -sdkmanager --install "ndk;22.0.7026061" -sdkmanager --install "cmake;3.22.1" -``` +#### Setup command line environment Export environment variables and add the Android SDK platform-tools directory to your path. diff --git a/veilid-flutter/example/ios/Podfile.lock b/veilid-flutter/example/ios/Podfile.lock index c72712f5..cded9b52 100644 --- a/veilid-flutter/example/ios/Podfile.lock +++ b/veilid-flutter/example/ios/Podfile.lock @@ -21,7 +21,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - veilid: 9141c973879377a5ce4f659b227ec01f0d687530 + veilid: 804173397bd9d07c5a70ac6933cc2afbe54afc82 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c diff --git a/veilid-flutter/example/ios/Runner/Info.plist b/veilid-flutter/example/ios/Runner/Info.plist index e60c506f..85116a21 100644 --- a/veilid-flutter/example/ios/Runner/Info.plist +++ b/veilid-flutter/example/ios/Runner/Info.plist @@ -43,5 +43,7 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + diff --git a/veilid-flutter/example/lib/config.dart b/veilid-flutter/example/lib/config.dart index 1fb61c92..6829ce11 100644 --- a/veilid-flutter/example/lib/config.dart +++ b/veilid-flutter/example/lib/config.dart @@ -39,10 +39,10 @@ Future getDefaultVeilidConfig() async { network: VeilidConfigNetwork( connectionInitialTimeoutMs: 2000, connectionInactivityTimeoutMs: 60000, - maxConnectionsPerIp4: 8, - maxConnectionsPerIp6Prefix: 8, + maxConnectionsPerIp4: 32, + maxConnectionsPerIp6Prefix: 32, maxConnectionsPerIp6PrefixSize: 56, - maxConnectionFrequencyPerMin: 8, + maxConnectionFrequencyPerMin: 128, clientWhitelistTimeoutMs: 300000, reverseConnectionReceiptTimeMs: 5000, holePunchReceiptTimeMs: 5000, @@ -86,7 +86,7 @@ Future getDefaultVeilidConfig() async { natpmp: true, detectAddressChanges: true, enableLocalPeerScope: false, - restrictedNatRetries: 3, + restrictedNatRetries: 0, tls: VeilidConfigTLS( certificatePath: "", privateKeyPath: "",