From d39c9343b732c8e5d0659a5ba59b6a8d3731763c Mon Sep 17 00:00:00 2001 From: John Smith Date: Sun, 2 Jul 2023 11:31:40 -0400 Subject: [PATCH] updates --- android/app/build.gradle | 1 + flutter_config.sh | 7 ++++-- lib/veilid_support/init.dart | 4 ++-- lib/veilid_support/processor.dart | 6 +++--- lib/veilid_support/tools.dart | 17 ++------------- macos/Podfile | 2 +- macos/Podfile.lock | 30 ++++++++++++++------------ macos/Runner.xcodeproj/project.pbxproj | 9 ++++---- 8 files changed, 35 insertions(+), 41 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 8ba4ae6..43e9908 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,6 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { + ndkVersion '25.1.8937393' ndkVersion '25.1.8937393' compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion diff --git a/flutter_config.sh b/flutter_config.sh index 14309b0..ccbe990 100755 --- a/flutter_config.sh +++ b/flutter_config.sh @@ -1,4 +1,7 @@ #!/bin/bash +# +# Run this if you regenerate and need to reconfigure platform specific make system project files +# SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source $SCRIPTDIR/_script_common @@ -7,8 +10,8 @@ sed -i '' 's/IPHONEOS_DEPLOYMENT_TARGET = [^;]*/IPHONEOS_DEPLOYMENT_TARGET = 12. sed -i '' "s/platform :ios, '[^']*'/platform :ios, '12.4'/g" $SCRIPTDIR/ios/Podfile # MacOS: Set deployment target -sed -i '' 's/MACOSX_DEPLOYMENT_TARGET = [^;]*/MACOSX_DEPLOYMENT_TARGET = 10.12.2/g' $SCRIPTDIR/macos/Runner.xcodeproj/project.pbxproj -sed -i '' "s/platform :osx, '[^']*'/platform :osx, '10.12.2'/g" $SCRIPTDIR/macos/Podfile +sed -i '' 's/MACOSX_DEPLOYMENT_TARGET = [^;]*/MACOSX_DEPLOYMENT_TARGET = 10.14.6/g' $SCRIPTDIR/macos/Runner.xcodeproj/project.pbxproj +sed -i '' "s/platform :osx, '[^']*'/platform :osx, '10.14.6'/g" $SCRIPTDIR/macos/Podfile # Android: Set NDK version if [[ "$TMPDIR" != "" ]]; then diff --git a/lib/veilid_support/init.dart b/lib/veilid_support/init.dart index 788829d..8884441 100644 --- a/lib/veilid_support/init.dart +++ b/lib/veilid_support/init.dart @@ -26,7 +26,7 @@ void _initVeilid() { logsInConsole: false), api: VeilidWASMConfigLoggingApi( enabled: true, level: VeilidConfigLogLevel.info))); - Veilid.instance.initializeVeilidCore(platformConfig.json); + Veilid.instance.initializeVeilidCore(platformConfig.toJson()); } else { var platformConfig = VeilidFFIConfig( logging: VeilidFFIConfigLogging( @@ -41,7 +41,7 @@ void _initVeilid() { serviceName: "VeilidChat"), api: VeilidFFIConfigLoggingApi( enabled: true, level: VeilidConfigLogLevel.info))); - Veilid.instance.initializeVeilidCore(platformConfig.json); + Veilid.instance.initializeVeilidCore(platformConfig.toJson()); } } diff --git a/lib/veilid_support/processor.dart b/lib/veilid_support/processor.dart index fd746cd..ddc9848 100644 --- a/lib/veilid_support/processor.dart +++ b/lib/veilid_support/processor.dart @@ -123,11 +123,11 @@ class Processor { } else if (update is VeilidUpdateNetwork) { await processUpdateNetwork(update); } else if (update is VeilidAppMessage) { - log.info("AppMessage: ${update.json}"); + log.info("AppMessage: ${update.toJson()}"); } else if (update is VeilidAppCall) { - log.info("AppCall: ${update.json}"); + log.info("AppCall: ${update.toJson()}"); } else { - log.trace("Update: ${update.json}"); + log.trace("Update: ${update.toJson()}"); } } } diff --git a/lib/veilid_support/tools.dart b/lib/veilid_support/tools.dart index ff898ab..3959330 100644 --- a/lib/veilid_support/tools.dart +++ b/lib/veilid_support/tools.dart @@ -1,16 +1,3 @@ -import 'package:veilid/base64url_no_pad.dart'; +import 'package:veilid/veilid_encoding.dart'; -bool isValidDHTKey(String key) { - if (key.length != 43) { - return false; - } - try { - var dec = base64UrlNoPadDecode(key); - if (dec.length != 32) { - return false; - } - } catch (e) { - return false; - } - return true; -} +//xxx \ No newline at end of file diff --git a/macos/Podfile b/macos/Podfile index 67b8543..7ed4260 100644 --- a/macos/Podfile +++ b/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.12.2' +platform :osx, '10.14.6' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/macos/Podfile.lock b/macos/Podfile.lock index fd8014f..3f6eb42 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -1,34 +1,36 @@ PODS: - FlutterMacOS (1.0.0) - - path_provider_macos (0.0.1): + - path_provider_foundation (0.0.1): + - Flutter - FlutterMacOS - - shared_preferences_macos (0.0.1): + - shared_preferences_foundation (0.0.1): + - Flutter - FlutterMacOS - veilid (0.0.1): - FlutterMacOS DEPENDENCIES: - FlutterMacOS (from `Flutter/ephemeral`) - - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - - shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`) + - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) + - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) - veilid (from `Flutter/ephemeral/.symlinks/plugins/veilid/macos`) EXTERNAL SOURCES: FlutterMacOS: :path: Flutter/ephemeral - path_provider_macos: - :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos - shared_preferences_macos: - :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos + path_provider_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin + shared_preferences_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin veilid: :path: Flutter/ephemeral/.symlinks/plugins/veilid/macos SPEC CHECKSUMS: - FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811 - path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 - shared_preferences_macos: 8b221d457159a85f478c0b9d2f19aeae9feff475 - veilid: ef97d3a2d5fda3b25a4017eae65c37afa8035203 + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 + path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + veilid: a54f57b7bcf0e4e072fe99272d76ca126b2026d0 -PODFILE CHECKSUM: 290b89638b803a41d96e2a2c02a9e1e635956f78 +PODFILE CHECKSUM: ff0a9a3ce75ee73f200ca7e2f47745698c917ef9 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 2814dea..5bf5bf8 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -261,6 +261,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -409,7 +410,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12.2; + MACOSX_DEPLOYMENT_TARGET = 10.14.6; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -494,7 +495,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12.2; + MACOSX_DEPLOYMENT_TARGET = 10.14.6; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -541,7 +542,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12.2; + MACOSX_DEPLOYMENT_TARGET = 10.14.6; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule;