liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

debug

Browse Source
This commit is contained in:
John Smith
2023-01-03 09:13:18 -05:00
parent f0d7c9baf3
commit efd5253752
11 changed files with 151 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
veilid-flutter/android/build.gradle
View File

@@ -6,13 +6,13 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:7.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
plugins {
id "org.mozilla.rust-android-gradle.rust-android" version "0.9.0"
id "org.mozilla.rust-android-gradle.rust-android" version "0.9.3"
}
group 'com.veilid.veilid'
@@ -63,7 +63,7 @@ android {
}
}
ndkVersion '22.0.7026061'
ndkVersion '25.1.8937393'
// Required to copy libc++_shared.so
externalNativeBuild {
@@ -85,7 +85,6 @@ cargo {
libname = "veilid_flutter"
targets = ["arm", "arm64", "x86", "x86_64"]
targetDirectory = "../../target"
prebuiltToolchains = true
pythonCommand = "python3"
profile = gradle.startParameter.taskNames.any{it.toLowerCase().contains("debug")} ? "debug" : "release"
}

2
veilid-flutter/example/android/app/build.gradle
View File

@@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion flutter.compileSdkVersion
ndkVersion '22.0.7026061'
ndkVersion '25.1.8937393'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8

4
veilid-flutter/ios/veilid.podspec
View File

@@ -23,7 +23,9 @@ Veilid Network Plugin
require 'json'
require 'pathname'
workspace_dir = File.dirname(JSON.parse(`cargo locate-project --workspace`)['root'])
script_dir = File.realpath(File.expand_path(__dir__))
workspace_dir = File.dirname(JSON.parse(`(cd #{script_dir}; cargo locate-project --workspace)`)['root'])
cargo_target_dir = File.join(workspace_dir, 'target')
s.xcconfig = {

13
veilid-flutter/lib/veilid.dart
View File

@@ -1875,13 +1875,24 @@ abstract class VeilidTableDB {
utf8.encoder.convert(jsonEncode(object, toEncodable: toEncodable)));
}
Future<void> storeStringJson(int col, String key, Object? object,
{Object? Function(Object? nonEncodable)? toEncodable}) {
return storeJson(col, utf8.encoder.convert(key),
utf8.encoder.convert(jsonEncode(object, toEncodable: toEncodable)));
}
Future<Object?> loadJson(int col, Uint8List key,
{Object? Function(Object? key, Object? value)? reviver}) async {
var s = await load(col, key);
if (s == null) {
return null;
}
return jsonDecode(utf8.decode(s, allowMalformed: false));
return jsonDecode(utf8.decode(s, allowMalformed: false), reviver: reviver);
}
Future<Object?> loadStringJson(int col, String key,
{Object? Function(Object? key, Object? value)? reviver}) {
return loadJson(col, utf8.encoder.convert(key), reviver: reviver);
}
}

4
veilid-flutter/macos/veilid.podspec
View File

@@ -23,7 +23,9 @@ Veilid Network Plugin
require 'json'
require 'pathname'
workspace_dir = File.dirname(JSON.parse(`cargo locate-project --workspace`)['root'])
script_dir = File.realpath(File.expand_path(__dir__))
workspace_dir = File.dirname(JSON.parse(`(cd #{script_dir}; cargo locate-project --workspace)`)['root'])
cargo_target_dir = File.join(workspace_dir, 'target')
s.script_phase = {