diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41cc7d81..599c4cf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.1.0
+
+* Build the Rust core with Flutter native assets instead of cargokit.
+ Requires Flutter 3.47.2 or later, `rustup` on the build machine, and
+ NDK 27 or later for Android.
+* Remove `NotSupportedPlatform`; `Tor.throwRustException` no longer takes
+ a bindings argument.
+* Fix `Tor.start` never detecting a failed `tor_start`.
+
## 0.0.1
* TODO: Describe initial release.
diff --git a/README.md b/README.md
index fb7cf4fb..be6d0ea4 100644
--- a/README.md
+++ b/README.md
@@ -12,30 +12,19 @@ SPDX-License-Identifier: GPL-3.0-or-later
### [Install rust](https://www.rust-lang.org/tools/install)
-Use `rustup`, not `homebrew`. Install toolchain 1.74.
+Use `rustup`, not `homebrew`. The toolchain and cross-compilation targets pinned in `rust/rust-toolchain.toml` are installed automatically on first build.
-### Install cargo ndk
+### Building
-```sh
-cargo install cargo-ndk
-```
-
-### Cargokit
-
-[Cargokit](https://github.com/irondash/cargokit) handles building, just `flutter run` it or run it in Android Studio or VS Code (untested).
-
-To update Cargokit in the future, use:
-```sh
-git subtree pull --prefix cargokit https://github.com/irondash/cargokit.git main --squash
-```
+The Rust library is built and bundled by Flutter's native assets support (see `hook/build.dart`), so just `flutter run` or build as usual. Requires Flutter 3.47.2 or later; Android builds need NDK 27 or later.
## Development
-To generate `tor_ffi_plugin.h` C bindings for Rust, `cbindgen --config cbindgen.toml --crate tor-ffi --output target/tor_ffi_plugin.h` or `cargo build` in `native/tor-ffi` to produce headers according to `build.rs`.
-To generate `tor_bindings_generated.dart` Dart bindings for C, `flutter pub run ffigen --config ffigen.yaml`. You will probably need to manually edit the `Tor` class to be `final`.
+To generate `tor_ffi_plugin.h` C bindings for Rust, `cargo build` in `rust` to produce headers according to `build.rs`.
+To generate `tor_ffi_plugin_bindings_generated.dart` Dart bindings for C, `dart run ffigen --config ffigen.yaml`.
## Example app
`flutter run` in `example` to run the example app
-See `example/lib/main.dart` for usage. Must run the build script for your platform first.
+See `example/lib/main.dart` for usage.
diff --git a/analysis_options.yaml b/analysis_options.yaml
index a5744c1c..e46654b9 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,3 +1,6 @@
+analyzer:
+ exclude:
+ - build/**
include: package:flutter_lints/flutter.yaml
# Additional information about this file can be found at
diff --git a/android/.gitignore b/android/.gitignore
deleted file mode 100644
index 161bdcda..00000000
--- a/android/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-.cxx
diff --git a/android/build.gradle b/android/build.gradle
deleted file mode 100644
index b12d70e0..00000000
--- a/android/build.gradle
+++ /dev/null
@@ -1,77 +0,0 @@
-// The Android Gradle Plugin builds the native code with the Android NDK.
-
-group 'com.cypherstack.tor_ffi_plugin'
-version '1.0'
-
-buildscript {
- ext.kotlin_version = '1.8.0'
- repositories {
- google()
- mavenCentral()
- }
-
- dependencies {
- classpath("com.android.tools.build:gradle:8.1.0")
- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
- }
-}
-
-allprojects {
- repositories {
- google()
- mavenCentral()
- }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-android {
- if (project.android.hasProperty("namespace")) {
- namespace 'com.cypherstack.tor_ffi_plugin'
- }
-
- compileSdk = 34
-
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
- }
-
- kotlinOptions {
- jvmTarget = JavaVersion.VERSION_1_8
- }
-
- sourceSets {
- main.java.srcDirs += "src/main/kotlin"
- test.java.srcDirs += "src/test/kotlin"
- }
-
- defaultConfig {
- minSdk = 21
- }
-
- dependencies {
- testImplementation("org.jetbrains.kotlin:kotlin-test")
- testImplementation("org.mockito:mockito-core:5.0.0")
- }
-
- testOptions {
- unitTests.all {
- useJUnitPlatform()
-
- testLogging {
- events "passed", "skipped", "failed", "standardOut", "standardError"
- outputs.upToDateWhen {false}
- showStandardStreams = true
- }
- }
- }
-}
-
-apply from: "../cargokit/gradle/plugin.gradle"
-
-cargokit {
- manifestDir = "../rust"
- libname = "tor_ffi_plugin"
-}
\ No newline at end of file
diff --git a/android/settings.gradle b/android/settings.gradle
deleted file mode 100644
index 92109959..00000000
--- a/android/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'tor_ffi_plugin'
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
deleted file mode 100644
index 99163d87..00000000
--- a/android/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/cargokit/.github/workflows/check_and_lint.yml b/cargokit/.github/workflows/check_and_lint.yml
deleted file mode 100644
index d8979f0e..00000000
--- a/cargokit/.github/workflows/check_and_lint.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-on:
- pull_request:
- push:
- branches:
- - main
-
-name: Check and Lint
-
-jobs:
- Flutter:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # 4.1.0
- - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # 2.16.0
- - name: Pub Get
- run: dart pub get --no-precompile
- working-directory: build_tool
- - name: Dart Format
- run: dart format . --output=none --set-exit-if-changed
- working-directory: build_tool
- - name: Analyze
- run: dart analyze
- working-directory: build_tool
- - name: Test
- run: flutter test
- working-directory: build_tool
diff --git a/cargokit/.github/workflows/test_example_plugin_build.yml b/cargokit/.github/workflows/test_example_plugin_build.yml
deleted file mode 100644
index fb975384..00000000
--- a/cargokit/.github/workflows/test_example_plugin_build.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-on:
- pull_request:
- push:
- branches:
- - main
-
-name: Test Example Plugin
-
-jobs:
- Build:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- os:
- - ubuntu-latest
- - macOS-latest
- - windows-latest
- build_mode:
- - debug
- - profile
- - release
- env:
- EXAMPLE_DIR: "a b/hello_rust_ffi_plugin/example"
- CARGOKIT_VERBOSE: 1
- steps:
- - name: Extract branch name
- shell: bash
- run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
- id: extract_branch
- - name: Setup Repository
- shell: bash
- run: |
- mkdir "a b" # Space is intentional
- cd "a b"
- git config --global user.email "you@example.com"
- git config --global user.name "Your Name"
- # "advanced" branch has extra iOS flavor and uses rust nightly for release builds
- git clone -b advanced https://github.com/irondash/hello_rust_ffi_plugin
- cd hello_rust_ffi_plugin
- git subtree pull --prefix cargokit https://github.com/${{ github.event.pull_request.head.repo.full_name || github.repository }} ${{ steps.extract_branch.outputs.branch }} --squash
- - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # 2.16.0
- with:
- channel: "stable"
- - name: Install GTK
- if: (matrix.os == 'ubuntu-latest')
- run: sudo apt-get update && sudo apt-get install libgtk-3-dev
- - name: Install ninja-build
- if: (matrix.os == 'ubuntu-latest')
- run: sudo apt-get update && sudo apt-get install ninja-build
- - name: Build Linux (${{ matrix.build_mode }})
- if: matrix.os == 'ubuntu-latest'
- shell: bash
- working-directory: ${{ env.EXAMPLE_DIR }}
- run: flutter build linux --${{ matrix.build_mode }} -v
- - name: Build macOS (${{ matrix.build_mode }})
- if: matrix.os == 'macos-latest'
- shell: bash
- working-directory: ${{ env.EXAMPLE_DIR }}
- run: flutter build macos --${{ matrix.build_mode }} -v
- - name: Build iOS (${{ matrix.build_mode }})
- if: matrix.os == 'macos-latest'
- shell: bash
- working-directory: ${{ env.EXAMPLE_DIR }}
- run: flutter build ios --${{ matrix.build_mode }} --no-codesign -v
- - name: Build iOS (${{ matrix.build_mode }}) - flavor1
- if: matrix.os == 'macos-latest'
- shell: bash
- working-directory: ${{ env.EXAMPLE_DIR }}
- run: flutter build ios --flavor flavor1 --${{ matrix.build_mode }} --no-codesign -v
- - name: Build Windows (${{ matrix.build_mode }})
- if: matrix.os == 'windows-latest'
- shell: bash
- working-directory: ${{ env.EXAMPLE_DIR }}
- run: flutter build windows --${{ matrix.build_mode }} -v
- - name: Build Android (${{ matrix.build_mode }})
- shell: bash
- working-directory: ${{ env.EXAMPLE_DIR }}
- run: |
- if [[ $(sysctl hw.optional.arm64) == *"hw.optional.arm64: 1"* ]]; then
- export JAVA_HOME=$JAVA_HOME_17_arm64
- else
- export JAVA_HOME=$JAVA_HOME_17_X64
- fi
- flutter build apk --${{ matrix.build_mode }} -v
-
diff --git a/cargokit/.gitignore b/cargokit/.gitignore
deleted file mode 100644
index cf7bb868..00000000
--- a/cargokit/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-target
-.dart_tool
-*.iml
-!pubspec.lock
diff --git a/cargokit/LICENSE b/cargokit/LICENSE
deleted file mode 100644
index 54a7d589..00000000
--- a/cargokit/LICENSE
+++ /dev/null
@@ -1,39 +0,0 @@
-Copyright 2022 Matej Knopp
-
-================================================================================
-
-MIT LICENSE
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-================================================================================
-
-APACHE LICENSE, VERSION 2.0
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
diff --git a/cargokit/README b/cargokit/README
deleted file mode 100644
index 8ae4a073..00000000
--- a/cargokit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Experimental repository to provide glue for seamlessly integrating cargo build
-with flutter plugins and packages.
-
-See https://matejknopp.com/post/flutter_plugin_in_rust_with_no_prebuilt_binaries/
-for a tutorial on how to use Cargokit.
-
-Example plugin available at https://github.com/irondash/hello_rust_ffi_plugin.
-
diff --git a/cargokit/build_pod.sh b/cargokit/build_pod.sh
deleted file mode 100755
index ed0e0d98..00000000
--- a/cargokit/build_pod.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-set -e
-
-BASEDIR=$(dirname "$0")
-
-# Workaround for https://github.com/dart-lang/pub/issues/4010
-BASEDIR=$(cd "$BASEDIR" ; pwd -P)
-
-# Remove XCode SDK from path. Otherwise this breaks tool compilation when building iOS project
-NEW_PATH=`echo $PATH | tr ":" "\n" | grep -v "Contents/Developer/" | tr "\n" ":"`
-
-export PATH=${NEW_PATH%?} # remove trailing :
-
-env
-
-# Platform name (macosx, iphoneos, iphonesimulator)
-export CARGOKIT_DARWIN_PLATFORM_NAME=$PLATFORM_NAME
-
-# Arctive architectures (arm64, armv7, x86_64), space separated.
-export CARGOKIT_DARWIN_ARCHS=$ARCHS
-
-# Current build configuration (Debug, Release)
-export CARGOKIT_CONFIGURATION=$CONFIGURATION
-
-# Path to directory containing Cargo.toml.
-export CARGOKIT_MANIFEST_DIR=$PODS_TARGET_SRCROOT/$1
-
-# Temporary directory for build artifacts.
-export CARGOKIT_TARGET_TEMP_DIR=$TARGET_TEMP_DIR
-
-# Output directory for final artifacts.
-export CARGOKIT_OUTPUT_DIR=$PODS_CONFIGURATION_BUILD_DIR/$PRODUCT_NAME
-
-# Directory to store built tool artifacts.
-export CARGOKIT_TOOL_TEMP_DIR=$TARGET_TEMP_DIR/build_tool
-
-# Directory inside root project. Not necessarily the top level directory of root project.
-export CARGOKIT_ROOT_PROJECT_DIR=$SRCROOT
-
-FLUTTER_EXPORT_BUILD_ENVIRONMENT=(
- "$PODS_ROOT/../Flutter/ephemeral/flutter_export_environment.sh" # macOS
- "$PODS_ROOT/../Flutter/flutter_export_environment.sh" # iOS
-)
-
-for path in "${FLUTTER_EXPORT_BUILD_ENVIRONMENT[@]}"
-do
- if [[ -f "$path" ]]; then
- source "$path"
- fi
-done
-
-sh "$BASEDIR/run_build_tool.sh" build-pod "$@"
-
-# Make a symlink from built framework to phony file, which will be used as input to
-# build script. This should force rebuild (podspec currently doesn't support alwaysOutOfDate
-# attribute on custom build phase)
-ln -fs "$OBJROOT/XCBuildData/build.db" "${BUILT_PRODUCTS_DIR}/cargokit_phony"
-ln -fs "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}" "${BUILT_PRODUCTS_DIR}/cargokit_phony_out"
diff --git a/cargokit/build_tool/README.md b/cargokit/build_tool/README.md
deleted file mode 100644
index 3816eca3..00000000
--- a/cargokit/build_tool/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-A sample command-line application with an entrypoint in `bin/`, library code
-in `lib/`, and example unit test in `test/`.
diff --git a/cargokit/build_tool/analysis_options.yaml b/cargokit/build_tool/analysis_options.yaml
deleted file mode 100644
index a1aad5b3..00000000
--- a/cargokit/build_tool/analysis_options.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file configures the static analysis results for your project (errors,
-# warnings, and lints).
-#
-# This enables the 'recommended' set of lints from `package:lints`.
-# This set helps identify many issues that may lead to problems when running
-# or consuming Dart code, and enforces writing Dart using a single, idiomatic
-# style and format.
-#
-# If you want a smaller set of lints you can change this to specify
-# 'package:lints/core.yaml'. These are just the most critical lints
-# (the recommended set includes the core lints).
-# The core lints are also what is used by pub.dev for scoring packages.
-
-include: package:lints/recommended.yaml
-
-# Uncomment the following section to specify additional rules.
-
-linter:
- rules:
- - prefer_relative_imports
- - directives_ordering
-
-# analyzer:
-# exclude:
-# - path/to/excluded/files/**
-
-# For more information about the core and recommended set of lints, see
-# https://dart.dev/go/core-lints
-
-# For additional information about configuring this file, see
-# https://dart.dev/guides/language/analysis-options
diff --git a/cargokit/build_tool/bin/build_tool.dart b/cargokit/build_tool/bin/build_tool.dart
deleted file mode 100644
index f27ec75c..00000000
--- a/cargokit/build_tool/bin/build_tool.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'package:build_tool/build_tool.dart' as build_tool;
-
-void main(List arguments) {
- build_tool.runMain(arguments);
-}
diff --git a/cargokit/build_tool/lib/build_tool.dart b/cargokit/build_tool/lib/build_tool.dart
deleted file mode 100644
index b329c01a..00000000
--- a/cargokit/build_tool/lib/build_tool.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'src/build_tool.dart' as build_tool;
-
-Future runMain(List args) async {
- return build_tool.runMain(args);
-}
diff --git a/cargokit/build_tool/lib/src/android_environment.dart b/cargokit/build_tool/lib/src/android_environment.dart
deleted file mode 100644
index 9342964b..00000000
--- a/cargokit/build_tool/lib/src/android_environment.dart
+++ /dev/null
@@ -1,192 +0,0 @@
-import 'dart:io';
-import 'dart:isolate';
-import 'dart:math' as math;
-
-import 'package:collection/collection.dart';
-import 'package:path/path.dart' as path;
-import 'package:version/version.dart';
-
-import 'target.dart';
-import 'util.dart';
-
-class AndroidEnvironment {
- AndroidEnvironment({
- required this.sdkPath,
- required this.ndkVersion,
- required this.minSdkVersion,
- required this.targetTempDir,
- required this.target,
- });
-
- static void clangLinkerWrapper(List args) {
- final clang = Platform.environment['_CARGOKIT_NDK_LINK_CLANG'];
- if (clang == null) {
- throw Exception(
- "cargo-ndk rustc linker: didn't find _CARGOKIT_NDK_LINK_CLANG env var");
- }
- final target = Platform.environment['_CARGOKIT_NDK_LINK_TARGET'];
- if (target == null) {
- throw Exception(
- "cargo-ndk rustc linker: didn't find _CARGOKIT_NDK_LINK_TARGET env var");
- }
-
- runCommand(clang, [
- target,
- ...args,
- ]);
- }
-
- /// Full path to Android SDK.
- final String sdkPath;
-
- /// Full version of Android NDK.
- final String ndkVersion;
-
- /// Minimum supported SDK version.
- final int minSdkVersion;
-
- /// Target directory for build artifacts.
- final String targetTempDir;
-
- /// Target being built.
- final Target target;
-
- bool ndkIsInstalled() {
- final ndkPath = path.join(sdkPath, 'ndk', ndkVersion);
- final ndkPackageXml = File(path.join(ndkPath, 'package.xml'));
- return ndkPackageXml.existsSync();
- }
-
- void installNdk({
- required String javaHome,
- }) {
- final sdkManagerExtension = Platform.isWindows ? '.bat' : '';
- final sdkManager = path.join(
- sdkPath,
- 'cmdline-tools',
- 'latest',
- 'bin',
- 'sdkmanager$sdkManagerExtension',
- );
-
- log.info('Installing NDK $ndkVersion');
- runCommand(sdkManager, [
- '--install',
- 'ndk;$ndkVersion',
- ], environment: {
- 'JAVA_HOME': javaHome,
- });
- }
-
- Future> buildEnvironment() async {
- final hostArch = Platform.isMacOS
- ? "darwin-x86_64"
- : (Platform.isLinux ? "linux-x86_64" : "windows-x86_64");
-
- final ndkPath = path.join(sdkPath, 'ndk', ndkVersion);
- final toolchainPath = path.join(
- ndkPath,
- 'toolchains',
- 'llvm',
- 'prebuilt',
- hostArch,
- 'bin',
- );
-
- final minSdkVersion =
- math.max(target.androidMinSdkVersion!, this.minSdkVersion);
-
- final exe = Platform.isWindows ? '.exe' : '';
-
- final arKey = 'AR_${target.rust}';
- final arValue = ['${target.rust}-ar', 'llvm-ar', 'llvm-ar.exe']
- .map((e) => path.join(toolchainPath, e))
- .firstWhereOrNull((element) => File(element).existsSync());
- if (arValue == null) {
- throw Exception('Failed to find ar for $target in $toolchainPath');
- }
-
- final targetArg = '--target=${target.rust}$minSdkVersion';
-
- final ccKey = 'CC_${target.rust}';
- final ccValue = path.join(toolchainPath, 'clang$exe');
- final cfFlagsKey = 'CFLAGS_${target.rust}';
- final cFlagsValue = targetArg;
-
- final cxxKey = 'CXX_${target.rust}';
- final cxxValue = path.join(toolchainPath, 'clang++$exe');
- final cxxFlagsKey = 'CXXFLAGS_${target.rust}';
- final cxxFlagsValue = targetArg;
-
- final linkerKey =
- 'cargo_target_${target.rust.replaceAll('-', '_')}_linker'.toUpperCase();
-
- final ranlibKey = 'RANLIB_${target.rust}';
- final ranlibValue = path.join(toolchainPath, 'llvm-ranlib$exe');
-
- final ndkVersionParsed = Version.parse(ndkVersion);
- final rustFlagsKey = 'CARGO_ENCODED_RUSTFLAGS';
- final rustFlagsValue = _libGccWorkaround(targetTempDir, ndkVersionParsed);
-
- final runRustTool =
- Platform.isWindows ? 'run_build_tool.cmd' : 'run_build_tool.sh';
-
- final packagePath = (await Isolate.resolvePackageUri(
- Uri.parse('package:build_tool/buildtool.dart')))!
- .toFilePath();
- final selfPath = path.canonicalize(path.join(
- packagePath,
- '..',
- '..',
- '..',
- runRustTool,
- ));
-
- // Make sure that run_build_tool is working properly even initially launched directly
- // through dart run.
- final toolTempDir =
- Platform.environment['CARGOKIT_TOOL_TEMP_DIR'] ?? targetTempDir;
-
- return {
- arKey: arValue,
- ccKey: ccValue,
- cfFlagsKey: cFlagsValue,
- cxxKey: cxxValue,
- cxxFlagsKey: cxxFlagsValue,
- ranlibKey: ranlibValue,
- rustFlagsKey: rustFlagsValue,
- linkerKey: selfPath,
- // Recognized by main() so we know when we're acting as a wrapper
- '_CARGOKIT_NDK_LINK_TARGET': targetArg,
- '_CARGOKIT_NDK_LINK_CLANG': ccValue,
- 'CARGOKIT_TOOL_TEMP_DIR': toolTempDir,
- };
- }
-
- // Workaround for libgcc missing in NDK23, inspired by cargo-ndk
- String _libGccWorkaround(String buildDir, Version ndkVersion) {
- final workaroundDir = path.join(
- buildDir,
- 'cargokit',
- 'libgcc_workaround',
- '${ndkVersion.major}',
- );
- Directory(workaroundDir).createSync(recursive: true);
- if (ndkVersion.major >= 23) {
- File(path.join(workaroundDir, 'libgcc.a'))
- .writeAsStringSync('INPUT(-lunwind)');
- } else {
- // Other way around, untested, forward libgcc.a from libunwind once Rust
- // gets updated for NDK23+.
- File(path.join(workaroundDir, 'libunwind.a'))
- .writeAsStringSync('INPUT(-lgcc)');
- }
-
- var rustFlags = Platform.environment['CARGO_ENCODED_RUSTFLAGS'] ?? '';
- if (rustFlags.isNotEmpty) {
- rustFlags = '$rustFlags\x1f';
- }
- rustFlags = '$rustFlags-L\x1f$workaroundDir';
- return rustFlags;
- }
-}
diff --git a/cargokit/build_tool/lib/src/artifacts_provider.dart b/cargokit/build_tool/lib/src/artifacts_provider.dart
deleted file mode 100644
index ef655a9e..00000000
--- a/cargokit/build_tool/lib/src/artifacts_provider.dart
+++ /dev/null
@@ -1,263 +0,0 @@
-import 'dart:io';
-
-import 'package:ed25519_edwards/ed25519_edwards.dart';
-import 'package:http/http.dart';
-import 'package:logging/logging.dart';
-import 'package:path/path.dart' as path;
-
-import 'builder.dart';
-import 'crate_hash.dart';
-import 'options.dart';
-import 'precompile_binaries.dart';
-import 'rustup.dart';
-import 'target.dart';
-
-class Artifact {
- /// File system location of the artifact.
- final String path;
-
- /// Actual file name that the artifact should have in destination folder.
- final String finalFileName;
-
- AritifactType get type {
- if (finalFileName.endsWith('.dll') ||
- finalFileName.endsWith('.dll.lib') ||
- finalFileName.endsWith('.pdb') ||
- finalFileName.endsWith('.so') ||
- finalFileName.endsWith('.dylib')) {
- return AritifactType.dylib;
- } else if (finalFileName.endsWith('.lib') || finalFileName.endsWith('.a')) {
- return AritifactType.staticlib;
- } else {
- throw Exception('Unknown artifact type for $finalFileName');
- }
- }
-
- Artifact({
- required this.path,
- required this.finalFileName,
- });
-}
-
-final _log = Logger('artifacts_provider');
-
-class ArtifactProvider {
- ArtifactProvider({
- required this.environment,
- required this.userOptions,
- });
-
- final BuildEnvironment environment;
- final CargokitUserOptions userOptions;
-
- Future>> getArtifacts(List targets) async {
- final result = await _getPrecompiledArtifacts(targets);
-
- final pendingTargets = List.of(targets);
- pendingTargets.removeWhere((element) => result.containsKey(element));
-
- if (pendingTargets.isEmpty) {
- return result;
- }
-
- final rustup = Rustup();
- for (final target in targets) {
- final builder = RustBuilder(target: target, environment: environment);
- builder.prepare(rustup);
- _log.info('Building ${environment.crateInfo.packageName} for $target');
- final targetDir = await builder.build();
- // For local build accept both static and dynamic libraries.
- final artifactNames = {
- ...getArtifactNames(
- target: target,
- libraryName: environment.crateInfo.packageName,
- aritifactType: AritifactType.dylib,
- remote: false,
- ),
- ...getArtifactNames(
- target: target,
- libraryName: environment.crateInfo.packageName,
- aritifactType: AritifactType.staticlib,
- remote: false,
- )
- };
- final artifacts = artifactNames
- .map((artifactName) => Artifact(
- path: path.join(targetDir, artifactName),
- finalFileName: artifactName,
- ))
- .where((element) => File(element.path).existsSync())
- .toList();
- result[target] = artifacts;
- }
- return result;
- }
-
- Future>> _getPrecompiledArtifacts(
- List targets) async {
- if (userOptions.usePrecompiledBinaries == false) {
- _log.info('Precompiled binaries are disabled');
- return {};
- }
- if (environment.crateOptions.precompiledBinaries == null) {
- _log.fine('Precompiled binaries not enabled for this crate');
- return {};
- }
-
- final start = Stopwatch()..start();
- final crateHash = CrateHash.compute(environment.manifestDir,
- tempStorage: environment.targetTempDir);
- _log.fine(
- 'Computed crate hash $crateHash in ${start.elapsedMilliseconds}ms');
-
- final downloadedArtifactsDir =
- path.join(environment.targetTempDir, 'precompiled', crateHash);
- Directory(downloadedArtifactsDir).createSync(recursive: true);
-
- final res = >{};
-
- for (final target in targets) {
- final requiredArtifacts = getArtifactNames(
- target: target,
- libraryName: environment.crateInfo.packageName,
- remote: true,
- );
- final artifactsForTarget = [];
-
- for (final artifact in requiredArtifacts) {
- final fileName = PrecompileBinaries.fileName(target, artifact);
- final downloadedPath = path.join(downloadedArtifactsDir, fileName);
- if (!File(downloadedPath).existsSync()) {
- final signatureFileName =
- PrecompileBinaries.signatureFileName(target, artifact);
- await _tryDownloadArtifacts(
- crateHash: crateHash,
- fileName: fileName,
- signatureFileName: signatureFileName,
- finalPath: downloadedPath,
- );
- }
- if (File(downloadedPath).existsSync()) {
- artifactsForTarget.add(Artifact(
- path: downloadedPath,
- finalFileName: artifact,
- ));
- } else {
- break;
- }
- }
-
- // Only provide complete set of artifacts.
- if (artifactsForTarget.length == requiredArtifacts.length) {
- _log.fine('Found precompiled artifacts for $target');
- res[target] = artifactsForTarget;
- }
- }
-
- return res;
- }
-
- static Future _get(Uri url, {Map? headers}) async {
- int attempt = 0;
- const maxAttempts = 10;
- while (true) {
- try {
- return await get(url, headers: headers);
- } on SocketException catch (e) {
- // Try to detect reset by peer error and retry.
- if (attempt++ < maxAttempts &&
- (e.osError?.errorCode == 54 || e.osError?.errorCode == 10054)) {
- _log.severe(
- 'Failed to download $url: $e, attempt $attempt of $maxAttempts, will retry...');
- await Future.delayed(Duration(seconds: 1));
- continue;
- } else {
- rethrow;
- }
- }
- }
- }
-
- Future _tryDownloadArtifacts({
- required String crateHash,
- required String fileName,
- required String signatureFileName,
- required String finalPath,
- }) async {
- final precompiledBinaries = environment.crateOptions.precompiledBinaries!;
- final prefix = precompiledBinaries.uriPrefix;
- final url = Uri.parse('$prefix$crateHash/$fileName');
- final signatureUrl = Uri.parse('$prefix$crateHash/$signatureFileName');
- _log.fine('Downloading signature from $signatureUrl');
- final signature = await _get(signatureUrl);
- if (signature.statusCode == 404) {
- _log.warning(
- 'Precompiled binaries not available for crate hash $crateHash ($fileName)');
- return;
- }
- if (signature.statusCode != 200) {
- _log.severe(
- 'Failed to download signature $signatureUrl: status ${signature.statusCode}');
- return;
- }
- _log.fine('Downloading binary from $url');
- final res = await _get(url);
- if (res.statusCode != 200) {
- _log.severe('Failed to download binary $url: status ${res.statusCode}');
- return;
- }
- if (verify(
- precompiledBinaries.publicKey, res.bodyBytes, signature.bodyBytes)) {
- File(finalPath).writeAsBytesSync(res.bodyBytes);
- } else {
- _log.shout('Signature verification failed! Ignoring binary.');
- }
- }
-}
-
-enum AritifactType {
- staticlib,
- dylib,
-}
-
-AritifactType artifactTypeForTarget(Target target) {
- if (target.darwinPlatform != null) {
- return AritifactType.staticlib;
- } else {
- return AritifactType.dylib;
- }
-}
-
-List getArtifactNames({
- required Target target,
- required String libraryName,
- required bool remote,
- AritifactType? aritifactType,
-}) {
- aritifactType ??= artifactTypeForTarget(target);
- if (target.darwinArch != null) {
- if (aritifactType == AritifactType.staticlib) {
- return ['lib$libraryName.a'];
- } else {
- return ['lib$libraryName.dylib'];
- }
- } else if (target.rust.contains('-windows-')) {
- if (aritifactType == AritifactType.staticlib) {
- return ['$libraryName.lib'];
- } else {
- return [
- '$libraryName.dll',
- '$libraryName.dll.lib',
- if (!remote) '$libraryName.pdb'
- ];
- }
- } else if (target.rust.contains('-linux-')) {
- if (aritifactType == AritifactType.staticlib) {
- return ['lib$libraryName.a'];
- } else {
- return ['lib$libraryName.so'];
- }
- } else {
- throw Exception("Unsupported target: ${target.rust}");
- }
-}
diff --git a/cargokit/build_tool/lib/src/build_cmake.dart b/cargokit/build_tool/lib/src/build_cmake.dart
deleted file mode 100644
index 9154371e..00000000
--- a/cargokit/build_tool/lib/src/build_cmake.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'dart:io';
-
-import 'package:path/path.dart' as path;
-
-import 'artifacts_provider.dart';
-import 'builder.dart';
-import 'environment.dart';
-import 'options.dart';
-import 'target.dart';
-
-class BuildCMake {
- final CargokitUserOptions userOptions;
-
- BuildCMake({required this.userOptions});
-
- Future build() async {
- final targetPlatform = Environment.targetPlatform;
- final target = Target.forFlutterName(Environment.targetPlatform);
- if (target == null) {
- throw Exception("Unknown target platform: $targetPlatform");
- }
-
- final environment = BuildEnvironment.fromEnvironment(isAndroid: false);
- final provider =
- ArtifactProvider(environment: environment, userOptions: userOptions);
- final artifacts = await provider.getArtifacts([target]);
-
- final libs = artifacts[target]!;
-
- for (final lib in libs) {
- if (lib.type == AritifactType.dylib) {
- File(lib.path)
- .copySync(path.join(Environment.outputDir, lib.finalFileName));
- }
- }
- }
-}
diff --git a/cargokit/build_tool/lib/src/build_gradle.dart b/cargokit/build_tool/lib/src/build_gradle.dart
deleted file mode 100644
index 469c8b2d..00000000
--- a/cargokit/build_tool/lib/src/build_gradle.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-import 'dart:io';
-
-import 'package:logging/logging.dart';
-import 'package:path/path.dart' as path;
-
-import 'artifacts_provider.dart';
-import 'builder.dart';
-import 'environment.dart';
-import 'options.dart';
-import 'target.dart';
-
-final log = Logger('build_gradle');
-
-class BuildGradle {
- BuildGradle({required this.userOptions});
-
- final CargokitUserOptions userOptions;
-
- Future build() async {
- final targets = Environment.targetPlatforms.map((arch) {
- final target = Target.forFlutterName(arch);
- if (target == null) {
- throw Exception(
- "Unknown darwin target or platform: $arch, ${Environment.darwinPlatformName}");
- }
- return target;
- }).toList();
-
- final environment = BuildEnvironment.fromEnvironment(isAndroid: true);
- final provider =
- ArtifactProvider(environment: environment, userOptions: userOptions);
- final artifacts = await provider.getArtifacts(targets);
-
- for (final target in targets) {
- final libs = artifacts[target]!;
- final outputDir = path.join(Environment.outputDir, target.android!);
- Directory(outputDir).createSync(recursive: true);
-
- for (final lib in libs) {
- if (lib.type == AritifactType.dylib) {
- File(lib.path).copySync(path.join(outputDir, lib.finalFileName));
- }
- }
- }
- }
-}
diff --git a/cargokit/build_tool/lib/src/build_pod.dart b/cargokit/build_tool/lib/src/build_pod.dart
deleted file mode 100644
index f01401e1..00000000
--- a/cargokit/build_tool/lib/src/build_pod.dart
+++ /dev/null
@@ -1,86 +0,0 @@
-import 'dart:io';
-
-import 'package:path/path.dart' as path;
-
-import 'artifacts_provider.dart';
-import 'builder.dart';
-import 'environment.dart';
-import 'options.dart';
-import 'target.dart';
-import 'util.dart';
-
-class BuildPod {
- BuildPod({required this.userOptions});
-
- final CargokitUserOptions userOptions;
-
- Future build() async {
- final targets = Environment.darwinArchs.map((arch) {
- final target = Target.forDarwin(
- platformName: Environment.darwinPlatformName, darwinAarch: arch);
- if (target == null) {
- throw Exception(
- "Unknown darwin target or platform: $arch, ${Environment.darwinPlatformName}");
- }
- return target;
- }).toList();
-
- final environment = BuildEnvironment.fromEnvironment(isAndroid: false);
- final provider =
- ArtifactProvider(environment: environment, userOptions: userOptions);
- final artifacts = await provider.getArtifacts(targets);
-
- void performLipo(String targetFile, Iterable sourceFiles) {
- runCommand("lipo", [
- '-create',
- ...sourceFiles,
- '-output',
- targetFile,
- ]);
- }
-
- final outputDir = Environment.outputDir;
-
- Directory(outputDir).createSync(recursive: true);
-
- final staticLibs = artifacts.values
- .expand((element) => element)
- .where((element) => element.type == AritifactType.staticlib)
- .toList();
- final dynamicLibs = artifacts.values
- .expand((element) => element)
- .where((element) => element.type == AritifactType.dylib)
- .toList();
-
- final libName = environment.crateInfo.packageName;
-
- // If there is static lib, use it and link it with pod
- if (staticLibs.isNotEmpty) {
- final finalTargetFile = path.join(outputDir, "lib$libName.a");
- performLipo(finalTargetFile, staticLibs.map((e) => e.path));
- } else {
- // Otherwise try to replace bundle dylib with our dylib
- final bundlePaths = [
- '$libName.framework/Versions/A/$libName',
- '$libName.framework/$libName',
- ];
-
- for (final bundlePath in bundlePaths) {
- final targetFile = path.join(outputDir, bundlePath);
- if (File(targetFile).existsSync()) {
- performLipo(targetFile, dynamicLibs.map((e) => e.path));
-
- // Replace absolute id with @rpath one so that it works properly
- // when moved to Frameworks.
- runCommand("install_name_tool", [
- '-id',
- '@rpath/$bundlePath',
- targetFile,
- ]);
- return;
- }
- }
- throw Exception('Unable to find bundle for dynamic library');
- }
- }
-}
diff --git a/cargokit/build_tool/lib/src/build_tool.dart b/cargokit/build_tool/lib/src/build_tool.dart
deleted file mode 100644
index 6415f234..00000000
--- a/cargokit/build_tool/lib/src/build_tool.dart
+++ /dev/null
@@ -1,273 +0,0 @@
-import 'dart:io';
-
-import 'package:args/command_runner.dart';
-import 'package:ed25519_edwards/ed25519_edwards.dart';
-import 'package:github/github.dart';
-import 'package:hex/hex.dart';
-import 'package:logging/logging.dart';
-
-import 'android_environment.dart';
-import 'build_cmake.dart';
-import 'build_gradle.dart';
-import 'build_pod.dart';
-import 'logging.dart';
-import 'options.dart';
-import 'precompile_binaries.dart';
-import 'target.dart';
-import 'util.dart';
-import 'verify_binaries.dart';
-
-final log = Logger('build_tool');
-
-abstract class BuildCommand extends Command {
- Future runBuildCommand(CargokitUserOptions options);
-
- @override
- Future run() async {
- final options = CargokitUserOptions.load();
-
- if (options.verboseLogging ||
- Platform.environment['CARGOKIT_VERBOSE'] == '1') {
- enableVerboseLogging();
- }
-
- await runBuildCommand(options);
- }
-}
-
-class BuildPodCommand extends BuildCommand {
- @override
- final name = 'build-pod';
-
- @override
- final description = 'Build cocoa pod library';
-
- @override
- Future runBuildCommand(CargokitUserOptions options) async {
- final build = BuildPod(userOptions: options);
- await build.build();
- }
-}
-
-class BuildGradleCommand extends BuildCommand {
- @override
- final name = 'build-gradle';
-
- @override
- final description = 'Build android library';
-
- @override
- Future runBuildCommand(CargokitUserOptions options) async {
- final build = BuildGradle(userOptions: options);
- await build.build();
- }
-}
-
-class BuildCMakeCommand extends BuildCommand {
- @override
- final name = 'build-cmake';
-
- @override
- final description = 'Build CMake library';
-
- @override
- Future runBuildCommand(CargokitUserOptions options) async {
- final build = BuildCMake(userOptions: options);
- await build.build();
- }
-}
-
-class GenKeyCommand extends Command {
- @override
- final name = 'gen-key';
-
- @override
- final description = 'Generate key pair for signing precompiled binaries';
-
- @override
- void run() {
- final kp = generateKey();
- final private = HEX.encode(kp.privateKey.bytes);
- final public = HEX.encode(kp.publicKey.bytes);
- print("Private Key: $private");
- print("Public Key: $public");
- }
-}
-
-class PrecompileBinariesCommand extends Command {
- PrecompileBinariesCommand() {
- argParser
- ..addOption(
- 'repository',
- mandatory: true,
- help: 'Github repository slug in format owner/name',
- )
- ..addOption(
- 'manifest-dir',
- mandatory: true,
- help: 'Directory containing Cargo.toml',
- )
- ..addMultiOption('target',
- help: 'Rust target triple of artifact to build.\n'
- 'Can be specified multiple times or omitted in which case\n'
- 'all targets for current platform will be built.')
- ..addOption(
- 'android-sdk-location',
- help: 'Location of Android SDK (if available)',
- )
- ..addOption(
- 'android-ndk-version',
- help: 'Android NDK version (if available)',
- )
- ..addOption(
- 'android-min-sdk-version',
- help: 'Android minimum rquired version (if available)',
- )
- ..addOption(
- 'temp-dir',
- help: 'Directory to store temporary build artifacts',
- )
- ..addOption(
- 'glibc-version',
- help: 'GLIBC version to use for linux builds',
- )
- ..addFlag(
- "verbose",
- abbr: "v",
- defaultsTo: false,
- help: "Enable verbose logging",
- );
- }
-
- @override
- final name = 'precompile-binaries';
-
- @override
- final description = 'Prebuild and upload binaries\n'
- 'Private key must be passed through PRIVATE_KEY environment variable. '
- 'Use gen_key through generate priave key.\n'
- 'Github token must be passed as GITHUB_TOKEN environment variable.\n';
-
- @override
- Future run() async {
- final verbose = argResults!['verbose'] as bool;
- if (verbose) {
- enableVerboseLogging();
- }
-
- final privateKeyString = Platform.environment['PRIVATE_KEY'];
- if (privateKeyString == null) {
- throw ArgumentError('Missing PRIVATE_KEY environment variable');
- }
- final githubToken = Platform.environment['GITHUB_TOKEN'];
- if (githubToken == null) {
- throw ArgumentError('Missing GITHUB_TOKEN environment variable');
- }
- final privateKey = HEX.decode(privateKeyString);
- if (privateKey.length != 64) {
- throw ArgumentError('Private key must be 64 bytes long');
- }
- final manifestDir = argResults!['manifest-dir'] as String;
- if (!Directory(manifestDir).existsSync()) {
- throw ArgumentError('Manifest directory does not exist: $manifestDir');
- }
- String? androidMinSdkVersionString =
- argResults!['android-min-sdk-version'] as String?;
- int? androidMinSdkVersion;
- if (androidMinSdkVersionString != null) {
- androidMinSdkVersion = int.tryParse(androidMinSdkVersionString);
- if (androidMinSdkVersion == null) {
- throw ArgumentError(
- 'Invalid android-min-sdk-version: $androidMinSdkVersionString');
- }
- }
- final targetStrigns = argResults!['target'] as List;
- final targets = targetStrigns.map((target) {
- final res = Target.forRustTriple(target);
- if (res == null) {
- throw ArgumentError('Invalid target: $target');
- }
- return res;
- }).toList(growable: false);
- final precompileBinaries = PrecompileBinaries(
- privateKey: PrivateKey(privateKey),
- githubToken: githubToken,
- manifestDir: manifestDir,
- repositorySlug: RepositorySlug.full(argResults!['repository'] as String),
- targets: targets,
- androidSdkLocation: argResults!['android-sdk-location'] as String?,
- androidNdkVersion: argResults!['android-ndk-version'] as String?,
- androidMinSdkVersion: androidMinSdkVersion,
- tempDir: argResults!['temp-dir'] as String?,
- glibcVersion: argResults!['glibc-version'] as String?,
- );
-
- await precompileBinaries.run();
- }
-}
-
-class VerifyBinariesCommand extends Command {
- VerifyBinariesCommand() {
- argParser.addOption(
- 'manifest-dir',
- mandatory: true,
- help: 'Directory containing Cargo.toml',
- );
- }
-
- @override
- final name = "verify-binaries";
-
- @override
- final description = 'Verifies published binaries\n'
- 'Checks whether there is a binary published for each targets\n'
- 'and checks the signature.';
-
- @override
- Future run() async {
- final manifestDir = argResults!['manifest-dir'] as String;
- final verifyBinaries = VerifyBinaries(
- manifestDir: manifestDir,
- );
- await verifyBinaries.run();
- }
-}
-
-Future runMain(List args) async {
- try {
- // Init logging before options are loaded
- initLogging();
-
- if (Platform.environment['_CARGOKIT_NDK_LINK_TARGET'] != null) {
- return AndroidEnvironment.clangLinkerWrapper(args);
- }
-
- final runner = CommandRunner('build_tool', 'Cargokit built_tool')
- ..addCommand(BuildPodCommand())
- ..addCommand(BuildGradleCommand())
- ..addCommand(BuildCMakeCommand())
- ..addCommand(GenKeyCommand())
- ..addCommand(PrecompileBinariesCommand())
- ..addCommand(VerifyBinariesCommand());
-
- await runner.run(args);
- } on ArgumentError catch (e) {
- stderr.writeln(e.toString());
- exit(1);
- } catch (e, s) {
- log.severe(kDoubleSeparator);
- log.severe('Cargokit BuildTool failed with error:');
- log.severe(kSeparator);
- log.severe(e);
- // This tells user to install Rust, there's no need to pollute the log with
- // stack trace.
- if (e is! RustupNotFoundException) {
- log.severe(kSeparator);
- log.severe(s);
- log.severe(kSeparator);
- log.severe('BuildTool arguments: $args');
- }
- log.severe(kDoubleSeparator);
- exit(1);
- }
-}
diff --git a/cargokit/build_tool/lib/src/builder.dart b/cargokit/build_tool/lib/src/builder.dart
deleted file mode 100644
index 894a9ecb..00000000
--- a/cargokit/build_tool/lib/src/builder.dart
+++ /dev/null
@@ -1,206 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:logging/logging.dart';
-import 'package:path/path.dart' as path;
-
-import 'android_environment.dart';
-import 'cargo.dart';
-import 'environment.dart';
-import 'options.dart';
-import 'rustup.dart';
-import 'target.dart';
-import 'util.dart';
-
-final _log = Logger('builder');
-
-enum BuildConfiguration {
- debug,
- release,
- profile,
-}
-
-extension on BuildConfiguration {
- bool get isDebug => this == BuildConfiguration.debug;
- String get rustName => switch (this) {
- BuildConfiguration.debug => 'debug',
- BuildConfiguration.release => 'release',
- BuildConfiguration.profile => 'release',
- };
-}
-
-class BuildException implements Exception {
- final String message;
-
- BuildException(this.message);
-
- @override
- String toString() {
- return 'BuildException: $message';
- }
-}
-
-class BuildEnvironment {
- final BuildConfiguration configuration;
- final CargokitCrateOptions crateOptions;
- final String targetTempDir;
- final String manifestDir;
- final CrateInfo crateInfo;
-
- final bool isAndroid;
- final String? androidSdkPath;
- final String? androidNdkVersion;
- final int? androidMinSdkVersion;
- final String? javaHome;
-
- final String? glibcVersion;
-
- BuildEnvironment({
- required this.configuration,
- required this.crateOptions,
- required this.targetTempDir,
- required this.manifestDir,
- required this.crateInfo,
- required this.isAndroid,
- this.androidSdkPath,
- this.androidNdkVersion,
- this.androidMinSdkVersion,
- this.javaHome,
- this.glibcVersion,
- });
-
- static BuildConfiguration parseBuildConfiguration(String value) {
- // XCode configuration adds the flavor to configuration name.
- final firstSegment = value.split('-').first;
- final buildConfiguration = BuildConfiguration.values.firstWhereOrNull(
- (e) => e.name == firstSegment,
- );
- if (buildConfiguration == null) {
- _log.warning('Unknown build configuraiton $value, will assume release');
- return BuildConfiguration.release;
- }
- return buildConfiguration;
- }
-
- static BuildEnvironment fromEnvironment({
- required bool isAndroid,
- }) {
- final buildConfiguration =
- parseBuildConfiguration(Environment.configuration);
- final manifestDir = Environment.manifestDir;
- final crateOptions = CargokitCrateOptions.load(
- manifestDir: manifestDir,
- );
- final crateInfo = CrateInfo.load(manifestDir);
- return BuildEnvironment(
- configuration: buildConfiguration,
- crateOptions: crateOptions,
- targetTempDir: Environment.targetTempDir,
- manifestDir: manifestDir,
- crateInfo: crateInfo,
- isAndroid: isAndroid,
- androidSdkPath: isAndroid ? Environment.sdkPath : null,
- androidNdkVersion: isAndroid ? Environment.ndkVersion : null,
- androidMinSdkVersion:
- isAndroid ? int.parse(Environment.minSdkVersion) : null,
- javaHome: isAndroid ? Environment.javaHome : null,
- );
- }
-}
-
-class RustBuilder {
- final Target target;
- final BuildEnvironment environment;
-
- RustBuilder({
- required this.target,
- required this.environment,
- });
-
- void prepare(
- Rustup rustup,
- ) {
- final toolchain = _toolchain;
- if (rustup.installedTargets(toolchain) == null) {
- rustup.installToolchain(toolchain);
- }
- if (toolchain == 'nightly') {
- rustup.installRustSrcForNightly();
- }
- if (!rustup.installedTargets(toolchain)!.contains(target.rust)) {
- rustup.installTarget(target.rust, toolchain: toolchain);
- }
- if (environment.glibcVersion != null) {
- rustup.installZigBuild(toolchain);
- }
- }
-
- CargoBuildOptions? get _buildOptions =>
- environment.crateOptions.cargo[environment.configuration];
-
- String get _toolchain => _buildOptions?.toolchain.name ?? 'stable';
-
- /// Returns the path of directory containing build artifacts.
- Future build() async {
- final extraArgs = _buildOptions?.flags ?? [];
- final manifestPath = path.join(environment.manifestDir, 'Cargo.toml');
- runCommand(
- 'rustup',
- [
- 'run',
- _toolchain,
- 'cargo',
- (target.android == null && environment.glibcVersion != null)
- ? 'zigbuild'
- : 'build',
- ...extraArgs,
- '--manifest-path',
- manifestPath,
- '-p',
- environment.crateInfo.packageName,
- if (!environment.configuration.isDebug) '--release',
- '--target',
- target.rust +
- ((target.android == null && environment.glibcVersion != null)
- ? '.${environment.glibcVersion!}'
- : ""),
- '--target-dir',
- environment.targetTempDir,
- ],
- environment: await _buildEnvironment(),
- );
- return path.join(
- environment.targetTempDir,
- target.rust,
- environment.configuration.rustName,
- );
- }
-
- Future> _buildEnvironment() async {
- if (target.android == null) {
- return {};
- } else {
- final sdkPath = environment.androidSdkPath;
- final ndkVersion = environment.androidNdkVersion;
- final minSdkVersion = environment.androidMinSdkVersion;
- if (sdkPath == null) {
- throw BuildException('androidSdkPath is not set');
- }
- if (ndkVersion == null) {
- throw BuildException('androidNdkVersion is not set');
- }
- if (minSdkVersion == null) {
- throw BuildException('androidMinSdkVersion is not set');
- }
- final env = AndroidEnvironment(
- sdkPath: sdkPath,
- ndkVersion: ndkVersion,
- minSdkVersion: minSdkVersion,
- targetTempDir: environment.targetTempDir,
- target: target,
- );
- if (!env.ndkIsInstalled() && environment.javaHome != null) {
- env.installNdk(javaHome: environment.javaHome!);
- }
- return env.buildEnvironment();
- }
- }
-}
diff --git a/cargokit/build_tool/lib/src/cargo.dart b/cargokit/build_tool/lib/src/cargo.dart
deleted file mode 100644
index 0d4483ff..00000000
--- a/cargokit/build_tool/lib/src/cargo.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'dart:io';
-
-import 'package:path/path.dart' as path;
-import 'package:toml/toml.dart';
-
-class ManifestException {
- ManifestException(this.message, {required this.fileName});
-
- final String? fileName;
- final String message;
-
- @override
- String toString() {
- if (fileName != null) {
- return 'Failed to parse package manifest at $fileName: $message';
- } else {
- return 'Failed to parse package manifest: $message';
- }
- }
-}
-
-class CrateInfo {
- CrateInfo({required this.packageName});
-
- final String packageName;
-
- static CrateInfo parseManifest(String manifest, {final String? fileName}) {
- final toml = TomlDocument.parse(manifest);
- final package = toml.toMap()['package'];
- if (package == null) {
- throw ManifestException('Missing package section', fileName: fileName);
- }
- final name = package['name'];
- if (name == null) {
- throw ManifestException('Missing package name', fileName: fileName);
- }
- return CrateInfo(packageName: name);
- }
-
- static CrateInfo load(String manifestDir) {
- final manifestFile = File(path.join(manifestDir, 'Cargo.toml'));
- final manifest = manifestFile.readAsStringSync();
- return parseManifest(manifest, fileName: manifestFile.path);
- }
-}
diff --git a/cargokit/build_tool/lib/src/crate_hash.dart b/cargokit/build_tool/lib/src/crate_hash.dart
deleted file mode 100644
index e58c37ff..00000000
--- a/cargokit/build_tool/lib/src/crate_hash.dart
+++ /dev/null
@@ -1,121 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-import 'dart:typed_data';
-
-import 'package:collection/collection.dart';
-import 'package:convert/convert.dart';
-import 'package:crypto/crypto.dart';
-import 'package:path/path.dart' as path;
-
-class CrateHash {
- /// Computes a hash uniquely identifying crate content. This takes into account
- /// content all all .rs files inside the src directory, as well as Cargo.toml,
- /// Cargo.lock, build.rs and cargokit.yaml.
- ///
- /// If [tempStorage] is provided, computed hash is stored in a file in that directory
- /// and reused on subsequent calls if the crate content hasn't changed.
- static String compute(String manifestDir, {String? tempStorage}) {
- return CrateHash._(
- manifestDir: manifestDir,
- tempStorage: tempStorage,
- )._compute();
- }
-
- CrateHash._({
- required this.manifestDir,
- required this.tempStorage,
- });
-
- String _compute() {
- final files = getFiles();
- final tempStorage = this.tempStorage;
- if (tempStorage != null) {
- final quickHash = _computeQuickHash(files);
- final quickHashFolder = Directory(path.join(tempStorage, 'crate_hash'));
- quickHashFolder.createSync(recursive: true);
- final quickHashFile = File(path.join(quickHashFolder.path, quickHash));
- if (quickHashFile.existsSync()) {
- return quickHashFile.readAsStringSync();
- }
- final hash = _computeHash(files);
- quickHashFile.writeAsStringSync(hash);
- return hash;
- } else {
- return _computeHash(files);
- }
- }
-
- /// Computes a quick hash based on files stat (without reading contents). This
- /// is used to cache the real hash, which is slower to compute since it involves
- /// reading every single file.
- String _computeQuickHash(List files) {
- final output = AccumulatorSink();
- final input = sha256.startChunkedConversion(output);
-
- final data = ByteData(8);
- for (final file in files) {
- input.add(utf8.encode(file.path));
- final stat = file.statSync();
- data.setUint64(0, stat.size);
- input.add(data.buffer.asUint8List());
- data.setUint64(0, stat.modified.millisecondsSinceEpoch);
- input.add(data.buffer.asUint8List());
- }
-
- input.close();
- return base64Url.encode(output.events.single.bytes);
- }
-
- String _computeHash(List files) {
- final output = AccumulatorSink();
- final input = sha256.startChunkedConversion(output);
-
- void addTextFile(File file) {
- // text Files are hashed by lines in case we're dealing with github checkout
- // that auto-converts line endings.
- final splitter = LineSplitter();
- if (file.existsSync()) {
- final data = file.readAsStringSync();
- final lines = splitter.convert(data);
- for (final line in lines) {
- input.add(utf8.encode(line));
- }
- }
- }
-
- for (final file in files) {
- addTextFile(file);
- }
-
- input.close();
- final res = output.events.single;
-
- // Truncate to 128bits.
- final hash = res.bytes.sublist(0, 16);
- return hex.encode(hash);
- }
-
- List getFiles() {
- final src = Directory(path.join(manifestDir, 'src'));
- final files = src
- .listSync(recursive: true, followLinks: false)
- .whereType()
- .toList();
- files.sortBy((element) => element.path);
- void addFile(String relative) {
- final file = File(path.join(manifestDir, relative));
- if (file.existsSync()) {
- files.add(file);
- }
- }
-
- addFile('Cargo.toml');
- addFile('Cargo.lock');
- addFile('build.rs');
- addFile('cargokit.yaml');
- return files;
- }
-
- final String manifestDir;
- final String? tempStorage;
-}
diff --git a/cargokit/build_tool/lib/src/environment.dart b/cargokit/build_tool/lib/src/environment.dart
deleted file mode 100644
index 1d267edb..00000000
--- a/cargokit/build_tool/lib/src/environment.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-import 'dart:io';
-
-extension on String {
- String resolveSymlink() => File(this).resolveSymbolicLinksSync();
-}
-
-class Environment {
- /// Current build configuration (debug or release).
- static String get configuration =>
- _getEnv("CARGOKIT_CONFIGURATION").toLowerCase();
-
- static bool get isDebug => configuration == 'debug';
- static bool get isRelease => configuration == 'release';
-
- /// Temporary directory where Rust build artifacts are placed.
- static String get targetTempDir => _getEnv("CARGOKIT_TARGET_TEMP_DIR");
-
- /// Final output directory where the build artifacts are placed.
- static String get outputDir => _getEnvPath('CARGOKIT_OUTPUT_DIR');
-
- /// Path to the crate manifest (containing Cargo.toml).
- static String get manifestDir => _getEnvPath('CARGOKIT_MANIFEST_DIR');
-
- /// Directory inside root project. Not necessarily root folder. Symlinks are
- /// not resolved on purpose.
- static String get rootProjectDir => _getEnv('CARGOKIT_ROOT_PROJECT_DIR');
-
- // Pod
-
- /// Platform name (macosx, iphoneos, iphonesimulator).
- static String get darwinPlatformName =>
- _getEnv("CARGOKIT_DARWIN_PLATFORM_NAME");
-
- /// List of architectures to build for (arm64, armv7, x86_64).
- static List get darwinArchs =>
- _getEnv("CARGOKIT_DARWIN_ARCHS").split(' ');
-
- // Gradle
- static String get minSdkVersion => _getEnv("CARGOKIT_MIN_SDK_VERSION");
- static String get ndkVersion => _getEnv("CARGOKIT_NDK_VERSION");
- static String get sdkPath => _getEnvPath("CARGOKIT_SDK_DIR");
- static String get javaHome => _getEnvPath("CARGOKIT_JAVA_HOME");
- static List get targetPlatforms =>
- _getEnv("CARGOKIT_TARGET_PLATFORMS").split(',');
-
- // CMAKE
- static String get targetPlatform => _getEnv("CARGOKIT_TARGET_PLATFORM");
-
- static String _getEnv(String key) {
- final res = Platform.environment[key];
- if (res == null) {
- throw Exception("Missing environment variable $key");
- }
- return res;
- }
-
- static String _getEnvPath(String key) {
- final res = _getEnv(key);
- if (Directory(res).existsSync()) {
- return res.resolveSymlink();
- } else {
- return res;
- }
- }
-}
diff --git a/cargokit/build_tool/lib/src/logging.dart b/cargokit/build_tool/lib/src/logging.dart
deleted file mode 100644
index 06392b99..00000000
--- a/cargokit/build_tool/lib/src/logging.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-import 'dart:io';
-
-import 'package:logging/logging.dart';
-
-const String kSeparator = "--";
-const String kDoubleSeparator = "==";
-
-bool _lastMessageWasSeparator = false;
-
-void _log(LogRecord rec) {
- final prefix = '${rec.level.name}: ';
- final out = rec.level == Level.SEVERE ? stderr : stdout;
- if (rec.message == kSeparator) {
- if (!_lastMessageWasSeparator) {
- out.write(prefix);
- out.writeln('-' * 80);
- _lastMessageWasSeparator = true;
- }
- return;
- } else if (rec.message == kDoubleSeparator) {
- out.write(prefix);
- out.writeln('=' * 80);
- _lastMessageWasSeparator = true;
- return;
- }
- out.write(prefix);
- out.writeln(rec.message);
- _lastMessageWasSeparator = false;
-}
-
-void initLogging() {
- Logger.root.level = Level.INFO;
- Logger.root.onRecord.listen((LogRecord rec) {
- final lines = rec.message.split('\n');
- for (final line in lines) {
- if (line.isNotEmpty || lines.length == 1 || line != lines.last) {
- _log(LogRecord(
- rec.level,
- line,
- rec.loggerName,
- ));
- }
- }
- });
-}
-
-void enableVerboseLogging() {
- Logger.root.level = Level.ALL;
-}
diff --git a/cargokit/build_tool/lib/src/options.dart b/cargokit/build_tool/lib/src/options.dart
deleted file mode 100644
index 7937dcac..00000000
--- a/cargokit/build_tool/lib/src/options.dart
+++ /dev/null
@@ -1,306 +0,0 @@
-import 'dart:io';
-
-import 'package:collection/collection.dart';
-import 'package:ed25519_edwards/ed25519_edwards.dart';
-import 'package:hex/hex.dart';
-import 'package:logging/logging.dart';
-import 'package:path/path.dart' as path;
-import 'package:source_span/source_span.dart';
-import 'package:yaml/yaml.dart';
-
-import 'builder.dart';
-import 'environment.dart';
-import 'rustup.dart';
-
-final _log = Logger('options');
-
-/// A class for exceptions that have source span information attached.
-class SourceSpanException implements Exception {
- // This is a getter so that subclasses can override it.
- /// A message describing the exception.
- String get message => _message;
- final String _message;
-
- // This is a getter so that subclasses can override it.
- /// The span associated with this exception.
- ///
- /// This may be `null` if the source location can't be determined.
- SourceSpan? get span => _span;
- final SourceSpan? _span;
-
- SourceSpanException(this._message, this._span);
-
- /// Returns a string representation of `this`.
- ///
- /// [color] may either be a [String], a [bool], or `null`. If it's a string,
- /// it indicates an ANSI terminal color escape that should be used to
- /// highlight the span's text. If it's `true`, it indicates that the text
- /// should be highlighted using the default color. If it's `false` or `null`,
- /// it indicates that the text shouldn't be highlighted.
- @override
- String toString({Object? color}) {
- if (span == null) return message;
- return 'Error on ${span!.message(message, color: color)}';
- }
-}
-
-enum Toolchain {
- stable,
- beta,
- nightly,
-}
-
-class CargoBuildOptions {
- final Toolchain toolchain;
- final List flags;
-
- CargoBuildOptions({
- required this.toolchain,
- required this.flags,
- });
-
- static Toolchain _toolchainFromNode(YamlNode node) {
- if (node case YamlScalar(value: String name)) {
- final toolchain =
- Toolchain.values.firstWhereOrNull((element) => element.name == name);
- if (toolchain != null) {
- return toolchain;
- }
- }
- throw SourceSpanException(
- 'Unknown toolchain. Must be one of ${Toolchain.values.map((e) => e.name)}.',
- node.span);
- }
-
- static CargoBuildOptions parse(YamlNode node) {
- if (node is! YamlMap) {
- throw SourceSpanException('Cargo options must be a map', node.span);
- }
- Toolchain toolchain = Toolchain.stable;
- List flags = [];
- for (final MapEntry(:key, :value) in node.nodes.entries) {
- if (key case YamlScalar(value: 'toolchain')) {
- toolchain = _toolchainFromNode(value);
- } else if (key case YamlScalar(value: 'extra_flags')) {
- if (value case YamlList(nodes: List list)) {
- if (list.every((element) {
- if (element case YamlScalar(value: String _)) {
- return true;
- }
- return false;
- })) {
- flags = list.map((e) => e.value as String).toList();
- continue;
- }
- }
- throw SourceSpanException(
- 'Extra flags must be a list of strings', value.span);
- } else {
- throw SourceSpanException(
- 'Unknown cargo option type. Must be "toolchain" or "extra_flags".',
- key.span);
- }
- }
- return CargoBuildOptions(toolchain: toolchain, flags: flags);
- }
-}
-
-extension on YamlMap {
- /// Map that extracts keys so that we can do map case check on them.
- Map get valueMap =>
- nodes.map((key, value) => MapEntry(key.value, value));
-}
-
-class PrecompiledBinaries {
- final String uriPrefix;
- final PublicKey publicKey;
-
- PrecompiledBinaries({
- required this.uriPrefix,
- required this.publicKey,
- });
-
- static PublicKey _publicKeyFromHex(String key, SourceSpan? span) {
- final bytes = HEX.decode(key);
- if (bytes.length != 32) {
- throw SourceSpanException(
- 'Invalid public key. Must be 32 bytes long.', span);
- }
- return PublicKey(bytes);
- }
-
- static PrecompiledBinaries parse(YamlNode node) {
- if (node case YamlMap(valueMap: Map map)) {
- if (map
- case {
- 'url_prefix': YamlNode urlPrefixNode,
- 'public_key': YamlNode publicKeyNode,
- }) {
- final urlPrefix = switch (urlPrefixNode) {
- YamlScalar(value: String urlPrefix) => urlPrefix,
- _ => throw SourceSpanException(
- 'Invalid URL prefix value.', urlPrefixNode.span),
- };
- final publicKey = switch (publicKeyNode) {
- YamlScalar(value: String publicKey) =>
- _publicKeyFromHex(publicKey, publicKeyNode.span),
- _ => throw SourceSpanException(
- 'Invalid public key value.', publicKeyNode.span),
- };
- return PrecompiledBinaries(
- uriPrefix: urlPrefix,
- publicKey: publicKey,
- );
- }
- }
- throw SourceSpanException(
- 'Invalid precompiled binaries value. '
- 'Expected Map with "url_prefix" and "public_key".',
- node.span);
- }
-}
-
-/// Cargokit options specified for Rust crate.
-class CargokitCrateOptions {
- CargokitCrateOptions({
- this.cargo = const {},
- this.precompiledBinaries,
- });
-
- final Map cargo;
- final PrecompiledBinaries? precompiledBinaries;
-
- static CargokitCrateOptions parse(YamlNode node) {
- if (node is! YamlMap) {
- throw SourceSpanException('Cargokit options must be a map', node.span);
- }
- final options = {};
- PrecompiledBinaries? precompiledBinaries;
-
- for (final entry in node.nodes.entries) {
- if (entry
- case MapEntry(
- key: YamlScalar(value: 'cargo'),
- value: YamlNode node,
- )) {
- if (node is! YamlMap) {
- throw SourceSpanException('Cargo options must be a map', node.span);
- }
- for (final MapEntry(:YamlNode key, :value) in node.nodes.entries) {
- if (key case YamlScalar(value: String name)) {
- final configuration = BuildConfiguration.values
- .firstWhereOrNull((element) => element.name == name);
- if (configuration != null) {
- options[configuration] = CargoBuildOptions.parse(value);
- continue;
- }
- }
- throw SourceSpanException(
- 'Unknown build configuration. Must be one of ${BuildConfiguration.values.map((e) => e.name)}.',
- key.span);
- }
- } else if (entry.key case YamlScalar(value: 'precompiled_binaries')) {
- precompiledBinaries = PrecompiledBinaries.parse(entry.value);
- } else {
- throw SourceSpanException(
- 'Unknown cargokit option type. Must be "cargo" or "precompiled_binaries".',
- entry.key.span);
- }
- }
- return CargokitCrateOptions(
- cargo: options,
- precompiledBinaries: precompiledBinaries,
- );
- }
-
- static CargokitCrateOptions load({
- required String manifestDir,
- }) {
- final uri = Uri.file(path.join(manifestDir, "cargokit.yaml"));
- final file = File.fromUri(uri);
- if (file.existsSync()) {
- final contents = loadYamlNode(file.readAsStringSync(), sourceUrl: uri);
- return parse(contents);
- } else {
- return CargokitCrateOptions();
- }
- }
-}
-
-class CargokitUserOptions {
- // When Rustup is installed always build locally unless user opts into
- // using precompiled binaries.
- static bool defaultUsePrecompiledBinaries() {
- return Rustup.executablePath() == null;
- }
-
- CargokitUserOptions({
- required this.usePrecompiledBinaries,
- required this.verboseLogging,
- });
-
- CargokitUserOptions._()
- : usePrecompiledBinaries = defaultUsePrecompiledBinaries(),
- verboseLogging = false;
-
- static CargokitUserOptions parse(YamlNode node) {
- if (node is! YamlMap) {
- throw SourceSpanException('Cargokit options must be a map', node.span);
- }
- bool usePrecompiledBinaries = defaultUsePrecompiledBinaries();
- bool verboseLogging = false;
-
- for (final entry in node.nodes.entries) {
- if (entry.key case YamlScalar(value: 'use_precompiled_binaries')) {
- if (entry.value case YamlScalar(value: bool value)) {
- usePrecompiledBinaries = value;
- continue;
- }
- throw SourceSpanException(
- 'Invalid value for "use_precompiled_binaries". Must be a boolean.',
- entry.value.span);
- } else if (entry.key case YamlScalar(value: 'verbose_logging')) {
- if (entry.value case YamlScalar(value: bool value)) {
- verboseLogging = value;
- continue;
- }
- throw SourceSpanException(
- 'Invalid value for "verbose_logging". Must be a boolean.',
- entry.value.span);
- } else {
- throw SourceSpanException(
- 'Unknown cargokit option type. Must be "use_precompiled_binaries" or "verbose_logging".',
- entry.key.span);
- }
- }
- return CargokitUserOptions(
- usePrecompiledBinaries: usePrecompiledBinaries,
- verboseLogging: verboseLogging,
- );
- }
-
- static CargokitUserOptions load() {
- String fileName = "cargokit_options.yaml";
- var userProjectDir = Directory(Environment.rootProjectDir);
-
- while (userProjectDir.parent.path != userProjectDir.path) {
- final configFile = File(path.join(userProjectDir.path, fileName));
- if (configFile.existsSync()) {
- final contents = loadYamlNode(
- configFile.readAsStringSync(),
- sourceUrl: configFile.uri,
- );
- final res = parse(contents);
- if (res.verboseLogging) {
- _log.info('Found user options file at ${configFile.path}');
- }
- return res;
- }
- userProjectDir = userProjectDir.parent;
- }
- return CargokitUserOptions._();
- }
-
- final bool usePrecompiledBinaries;
- final bool verboseLogging;
-}
diff --git a/cargokit/build_tool/lib/src/precompile_binaries.dart b/cargokit/build_tool/lib/src/precompile_binaries.dart
deleted file mode 100644
index 201874bc..00000000
--- a/cargokit/build_tool/lib/src/precompile_binaries.dart
+++ /dev/null
@@ -1,202 +0,0 @@
-import 'dart:io';
-
-import 'package:ed25519_edwards/ed25519_edwards.dart';
-import 'package:github/github.dart';
-import 'package:logging/logging.dart';
-import 'package:path/path.dart' as path;
-
-import 'artifacts_provider.dart';
-import 'builder.dart';
-import 'cargo.dart';
-import 'crate_hash.dart';
-import 'options.dart';
-import 'rustup.dart';
-import 'target.dart';
-
-final _log = Logger('precompile_binaries');
-
-class PrecompileBinaries {
- PrecompileBinaries({
- required this.privateKey,
- required this.githubToken,
- required this.repositorySlug,
- required this.manifestDir,
- required this.targets,
- this.androidSdkLocation,
- this.androidNdkVersion,
- this.androidMinSdkVersion,
- this.tempDir,
- this.glibcVersion,
- });
-
- final PrivateKey privateKey;
- final String githubToken;
- final RepositorySlug repositorySlug;
- final String manifestDir;
- final List targets;
- final String? androidSdkLocation;
- final String? androidNdkVersion;
- final int? androidMinSdkVersion;
- final String? tempDir;
- final String? glibcVersion;
-
- static String fileName(Target target, String name) {
- return '${target.rust}_$name';
- }
-
- static String signatureFileName(Target target, String name) {
- return '${target.rust}_$name.sig';
- }
-
- Future run() async {
- final crateInfo = CrateInfo.load(manifestDir);
-
- final targets = List.of(this.targets);
- if (targets.isEmpty) {
- targets.addAll([
- ...Target.buildableTargets(),
- if (androidSdkLocation != null) ...Target.androidTargets(),
- ]);
- }
-
- _log.info('Precompiling binaries for $targets');
-
- final hash = CrateHash.compute(manifestDir);
- _log.info('Computed crate hash: $hash');
-
- final String tagName = 'precompiled_$hash';
-
- final github = GitHub(auth: Authentication.withToken(githubToken));
- final repo = github.repositories;
- final release = await _getOrCreateRelease(
- repo: repo,
- tagName: tagName,
- packageName: crateInfo.packageName,
- hash: hash,
- );
-
- final tempDir = this.tempDir != null
- ? Directory(this.tempDir!)
- : Directory.systemTemp.createTempSync('precompiled_');
-
- tempDir.createSync(recursive: true);
-
- final crateOptions = CargokitCrateOptions.load(
- manifestDir: manifestDir,
- );
-
- final buildEnvironment = BuildEnvironment(
- configuration: BuildConfiguration.release,
- crateOptions: crateOptions,
- targetTempDir: tempDir.path,
- manifestDir: manifestDir,
- crateInfo: crateInfo,
- isAndroid: androidSdkLocation != null,
- androidSdkPath: androidSdkLocation,
- androidNdkVersion: androidNdkVersion,
- androidMinSdkVersion: androidMinSdkVersion,
- glibcVersion: glibcVersion,
- );
-
- final rustup = Rustup();
-
- for (final target in targets) {
- final artifactNames = getArtifactNames(
- target: target,
- libraryName: crateInfo.packageName,
- remote: true,
- );
-
- if (artifactNames.every((name) {
- final fileName = PrecompileBinaries.fileName(target, name);
- return (release.assets ?? []).any((e) => e.name == fileName);
- })) {
- _log.info("All artifacts for $target already exist - skipping");
- continue;
- }
-
- _log.info('Building for $target');
-
- final builder =
- RustBuilder(target: target, environment: buildEnvironment);
- builder.prepare(rustup);
- final res = await builder.build();
-
- final assets = [];
- for (final name in artifactNames) {
- final file = File(path.join(res, name));
- if (!file.existsSync()) {
- throw Exception('Missing artifact: ${file.path}');
- }
-
- final data = file.readAsBytesSync();
- final create = CreateReleaseAsset(
- name: PrecompileBinaries.fileName(target, name),
- contentType: "application/octet-stream",
- assetData: data,
- );
- final signature = sign(privateKey, data);
- final signatureCreate = CreateReleaseAsset(
- name: signatureFileName(target, name),
- contentType: "application/octet-stream",
- assetData: signature,
- );
- bool verified = verify(public(privateKey), data, signature);
- if (!verified) {
- throw Exception('Signature verification failed');
- }
- assets.add(create);
- assets.add(signatureCreate);
- }
- _log.info('Uploading assets: ${assets.map((e) => e.name)}');
- for (final asset in assets) {
- // This seems to be failing on CI so do it one by one
- int retryCount = 0;
- while (true) {
- try {
- await repo.uploadReleaseAssets(release, [asset]);
- break;
- } on Exception catch (e) {
- if (retryCount == 10) {
- rethrow;
- }
- ++retryCount;
- _log.shout(
- 'Upload failed (attempt $retryCount, will retry): ${e.toString()}');
- await Future.delayed(Duration(seconds: 2));
- }
- }
- }
- }
-
- _log.info('Cleaning up');
- tempDir.deleteSync(recursive: true);
- }
-
- Future _getOrCreateRelease({
- required RepositoriesService repo,
- required String tagName,
- required String packageName,
- required String hash,
- }) async {
- Release release;
- try {
- _log.info('Fetching release $tagName');
- release = await repo.getReleaseByTagName(repositorySlug, tagName);
- } on ReleaseNotFound {
- _log.info('Release not found - creating release $tagName');
- release = await repo.createRelease(
- repositorySlug,
- CreateRelease.from(
- tagName: tagName,
- name: 'Precompiled binaries ${hash.substring(0, 8)}',
- targetCommitish: null,
- isDraft: false,
- isPrerelease: false,
- body: 'Precompiled binaries for crate $packageName, '
- 'crate hash $hash.',
- ));
- }
- return release;
- }
-}
diff --git a/cargokit/build_tool/lib/src/rustup.dart b/cargokit/build_tool/lib/src/rustup.dart
deleted file mode 100644
index 715b6d05..00000000
--- a/cargokit/build_tool/lib/src/rustup.dart
+++ /dev/null
@@ -1,146 +0,0 @@
-import 'dart:io';
-
-import 'package:collection/collection.dart';
-import 'package:path/path.dart' as path;
-
-import 'util.dart';
-
-class _Toolchain {
- _Toolchain(
- this.name,
- this.targets,
- );
-
- final String name;
- final List targets;
-}
-
-class Rustup {
- List? installedTargets(String toolchain) {
- final targets = _installedTargets(toolchain);
- return targets != null ? List.unmodifiable(targets) : null;
- }
-
- void installToolchain(String toolchain) {
- log.info("Installing Rust toolchain: $toolchain");
- runCommand("rustup", ['toolchain', 'install', toolchain]);
- _installedToolchains
- .add(_Toolchain(toolchain, _getInstalledTargets(toolchain)));
- }
-
- void installTarget(
- String target, {
- required String toolchain,
- }) {
- log.info("Installing Rust target: $target");
- runCommand("rustup", ['target', 'add', '--toolchain', toolchain, target]);
- _installedTargets(toolchain)?.add(target);
- }
-
- bool _didInstallZigBuild = false;
-
- void installZigBuild(String toolchain) {
- if (_didInstallZigBuild) {
- return;
- }
-
- log.info("Installing Zig build");
- runCommand("rustup", [
- 'run',
- toolchain,
- 'cargo',
- 'install',
- '--locked',
- 'cargo-zigbuild',
- ]);
- _didInstallZigBuild = true;
- }
-
- final List<_Toolchain> _installedToolchains;
-
- Rustup() : _installedToolchains = _getInstalledToolchains();
-
- List? _installedTargets(String toolchain) => _installedToolchains
- .firstWhereOrNull(
- (e) => e.name == toolchain || e.name.startsWith('$toolchain-'))
- ?.targets;
-
- static List<_Toolchain> _getInstalledToolchains() {
- String extractToolchainName(String line) {
- // ignore (default) after toolchain name
- final parts = line.split(' ');
- return parts[0];
- }
-
- final res = runCommand("rustup", ['toolchain', 'list']);
-
- // To list all non-custom toolchains, we need to filter out lines that
- // don't start with "stable", "beta", or "nightly".
- Pattern nonCustom = RegExp(r"^(stable|beta|nightly)");
- final lines = res.stdout
- .toString()
- .split('\n')
- .where((e) => e.isNotEmpty && e.startsWith(nonCustom))
- .map(extractToolchainName)
- .toList(growable: true);
-
- return lines
- .map(
- (name) => _Toolchain(
- name,
- _getInstalledTargets(name),
- ),
- )
- .toList(growable: true);
- }
-
- static List _getInstalledTargets(String toolchain) {
- final res = runCommand("rustup", [
- 'target',
- 'list',
- '--toolchain',
- toolchain,
- '--installed',
- ]);
- final lines = res.stdout
- .toString()
- .split('\n')
- .where((e) => e.isNotEmpty)
- .toList(growable: true);
- return lines;
- }
-
- bool _didInstallRustSrcForNightly = false;
-
- void installRustSrcForNightly() {
- if (_didInstallRustSrcForNightly) {
- return;
- }
- // Useful for -Z build-std
- runCommand(
- "rustup",
- ['component', 'add', 'rust-src', '--toolchain', 'nightly'],
- );
- _didInstallRustSrcForNightly = true;
- }
-
- static String? executablePath() {
- final envPath = Platform.environment['PATH'];
- final envPathSeparator = Platform.isWindows ? ';' : ':';
- final home = Platform.isWindows
- ? Platform.environment['USERPROFILE']
- : Platform.environment['HOME'];
- final paths = [
- if (home != null) path.join(home, '.cargo', 'bin'),
- if (envPath != null) ...envPath.split(envPathSeparator),
- ];
- for (final p in paths) {
- final rustup = Platform.isWindows ? 'rustup.exe' : 'rustup';
- final rustupPath = path.join(p, rustup);
- if (File(rustupPath).existsSync()) {
- return rustupPath;
- }
- }
- return null;
- }
-}
diff --git a/cargokit/build_tool/lib/src/target.dart b/cargokit/build_tool/lib/src/target.dart
deleted file mode 100644
index a5c25fce..00000000
--- a/cargokit/build_tool/lib/src/target.dart
+++ /dev/null
@@ -1,144 +0,0 @@
-import 'dart:io';
-
-import 'package:collection/collection.dart';
-
-import 'util.dart';
-
-class Target {
- Target({
- required this.rust,
- this.flutter,
- this.android,
- this.androidMinSdkVersion,
- this.darwinPlatform,
- this.darwinArch,
- });
-
- static final all = [
- Target(
- rust: 'armv7-linux-androideabi',
- flutter: 'android-arm',
- android: 'armeabi-v7a',
- androidMinSdkVersion: 16,
- ),
- Target(
- rust: 'aarch64-linux-android',
- flutter: 'android-arm64',
- android: 'arm64-v8a',
- androidMinSdkVersion: 21,
- ),
- Target(
- rust: 'i686-linux-android',
- flutter: 'android-x86',
- android: 'x86',
- androidMinSdkVersion: 16,
- ),
- Target(
- rust: 'x86_64-linux-android',
- flutter: 'android-x64',
- android: 'x86_64',
- androidMinSdkVersion: 21,
- ),
- Target(
- rust: 'x86_64-pc-windows-msvc',
- flutter: 'windows-x64',
- ),
- Target(
- rust: 'aarch64-pc-windows-msvc',
- flutter: 'windows-arm64',
- ),
- Target(
- rust: 'x86_64-unknown-linux-gnu',
- flutter: 'linux-x64',
- ),
- Target(
- rust: 'aarch64-unknown-linux-gnu',
- flutter: 'linux-arm64',
- ),
- Target(rust: 'riscv64gc-unknown-linux-gnu', flutter: 'linux-riscv64'),
- Target(
- rust: 'x86_64-apple-darwin',
- darwinPlatform: 'macosx',
- darwinArch: 'x86_64',
- ),
- Target(
- rust: 'aarch64-apple-darwin',
- darwinPlatform: 'macosx',
- darwinArch: 'arm64',
- ),
- Target(
- rust: 'aarch64-apple-ios',
- darwinPlatform: 'iphoneos',
- darwinArch: 'arm64',
- ),
- Target(
- rust: 'aarch64-apple-ios-sim',
- darwinPlatform: 'iphonesimulator',
- darwinArch: 'arm64',
- ),
- Target(
- rust: 'x86_64-apple-ios',
- darwinPlatform: 'iphonesimulator',
- darwinArch: 'x86_64',
- ),
- ];
-
- static Target? forFlutterName(String flutterName) {
- return all.firstWhereOrNull((element) => element.flutter == flutterName);
- }
-
- static Target? forDarwin({
- required String platformName,
- required String darwinAarch,
- }) {
- return all.firstWhereOrNull((element) => //
- element.darwinPlatform == platformName &&
- element.darwinArch == darwinAarch);
- }
-
- static Target? forRustTriple(String triple) {
- return all.firstWhereOrNull((element) => element.rust == triple);
- }
-
- static List androidTargets() {
- return all
- .where((element) => element.android != null)
- .toList(growable: false);
- }
-
- /// Returns buildable targets on current host platform ignoring Android targets.
- static List buildableTargets() {
- if (Platform.isLinux) {
- // Right now we don't support cross-compiling on Linux. So we just return
- // the host target.
- final arch = (runCommand('arch', []).stdout as String).trim();
- if (arch == 'aarch64') {
- return [Target.forRustTriple('aarch64-unknown-linux-gnu')!];
- } else if (arch == 'riscv64') {
- return [Target.forRustTriple('riscv64gc-unknown-linux-gnu')!];
- } else {
- return [Target.forRustTriple('x86_64-unknown-linux-gnu')!];
- }
- }
- return all.where((target) {
- if (Platform.isWindows) {
- return target.rust.contains('-windows-');
- } else if (Platform.isMacOS) {
- return target.darwinPlatform != null;
- }
- return false;
- }).toList(growable: false);
- }
-
- @override
- String toString() {
- return rust;
- }
-
- final String? flutter;
- final String rust;
- final String? android;
- final int? androidMinSdkVersion;
- final String? darwinPlatform;
- final String? darwinArch;
-}
diff --git a/cargokit/build_tool/lib/src/util.dart b/cargokit/build_tool/lib/src/util.dart
deleted file mode 100644
index d8e30196..00000000
--- a/cargokit/build_tool/lib/src/util.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:logging/logging.dart';
-import 'package:path/path.dart' as path;
-
-import 'logging.dart';
-import 'rustup.dart';
-
-final log = Logger("process");
-
-class CommandFailedException implements Exception {
- final String executable;
- final List arguments;
- final ProcessResult result;
-
- CommandFailedException({
- required this.executable,
- required this.arguments,
- required this.result,
- });
-
- @override
- String toString() {
- final stdout = result.stdout.toString().trim();
- final stderr = result.stderr.toString().trim();
- return [
- "External Command: $executable ${arguments.map((e) => '"$e"').join(' ')}",
- "Returned Exit Code: ${result.exitCode}",
- kSeparator,
- "STDOUT:",
- if (stdout.isNotEmpty) stdout,
- kSeparator,
- "STDERR:",
- if (stderr.isNotEmpty) stderr,
- ].join('\n');
- }
-}
-
-class TestRunCommandArgs {
- final String executable;
- final List arguments;
- final String? workingDirectory;
- final Map? environment;
- final bool includeParentEnvironment;
- final bool runInShell;
- final Encoding? stdoutEncoding;
- final Encoding? stderrEncoding;
-
- TestRunCommandArgs({
- required this.executable,
- required this.arguments,
- this.workingDirectory,
- this.environment,
- this.includeParentEnvironment = true,
- this.runInShell = false,
- this.stdoutEncoding,
- this.stderrEncoding,
- });
-}
-
-class TestRunCommandResult {
- TestRunCommandResult({
- this.pid = 1,
- this.exitCode = 0,
- this.stdout = '',
- this.stderr = '',
- });
-
- final int pid;
- final int exitCode;
- final String stdout;
- final String stderr;
-}
-
-TestRunCommandResult Function(TestRunCommandArgs args)? testRunCommandOverride;
-
-ProcessResult runCommand(
- String executable,
- List arguments, {
- String? workingDirectory,
- Map? environment,
- bool includeParentEnvironment = true,
- bool runInShell = false,
- Encoding? stdoutEncoding = systemEncoding,
- Encoding? stderrEncoding = systemEncoding,
-}) {
- if (testRunCommandOverride != null) {
- final result = testRunCommandOverride!(TestRunCommandArgs(
- executable: executable,
- arguments: arguments,
- workingDirectory: workingDirectory,
- environment: environment,
- includeParentEnvironment: includeParentEnvironment,
- runInShell: runInShell,
- stdoutEncoding: stdoutEncoding,
- stderrEncoding: stderrEncoding,
- ));
- return ProcessResult(
- result.pid,
- result.exitCode,
- result.stdout,
- result.stderr,
- );
- }
- log.finer('Running command $executable ${arguments.join(' ')}');
- final res = Process.runSync(
- _resolveExecutable(executable),
- arguments,
- workingDirectory: workingDirectory,
- environment: environment,
- includeParentEnvironment: includeParentEnvironment,
- runInShell: runInShell,
- stderrEncoding: stderrEncoding,
- stdoutEncoding: stdoutEncoding,
- );
- if (res.exitCode != 0) {
- throw CommandFailedException(
- executable: executable,
- arguments: arguments,
- result: res,
- );
- } else {
- return res;
- }
-}
-
-class RustupNotFoundException implements Exception {
- @override
- String toString() {
- return [
- ' ',
- 'rustup not found in PATH.',
- ' ',
- 'Maybe you need to install Rust? It only takes a minute:',
- ' ',
- if (Platform.isWindows) 'https://www.rust-lang.org/tools/install',
- if (hasHomebrewRustInPath()) ...[
- '\$ brew unlink rust # Unlink homebrew Rust from PATH',
- ],
- if (!Platform.isWindows)
- "\$ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh",
- ' ',
- ].join('\n');
- }
-
- static bool hasHomebrewRustInPath() {
- if (!Platform.isMacOS) {
- return false;
- }
- final envPath = Platform.environment['PATH'] ?? '';
- final paths = envPath.split(':');
- return paths.any((p) {
- return p.contains('homebrew') && File(path.join(p, 'rustc')).existsSync();
- });
- }
-}
-
-String _resolveExecutable(String executable) {
- if (executable == 'rustup') {
- final resolved = Rustup.executablePath();
- if (resolved != null) {
- return resolved;
- }
- throw RustupNotFoundException();
- } else {
- return executable;
- }
-}
diff --git a/cargokit/build_tool/lib/src/verify_binaries.dart b/cargokit/build_tool/lib/src/verify_binaries.dart
deleted file mode 100644
index 0094c644..00000000
--- a/cargokit/build_tool/lib/src/verify_binaries.dart
+++ /dev/null
@@ -1,81 +0,0 @@
-import 'dart:io';
-
-import 'package:ed25519_edwards/ed25519_edwards.dart';
-import 'package:http/http.dart';
-
-import 'artifacts_provider.dart';
-import 'cargo.dart';
-import 'crate_hash.dart';
-import 'options.dart';
-import 'precompile_binaries.dart';
-import 'target.dart';
-
-class VerifyBinaries {
- VerifyBinaries({
- required this.manifestDir,
- });
-
- final String manifestDir;
-
- Future run() async {
- final crateInfo = CrateInfo.load(manifestDir);
-
- final config = CargokitCrateOptions.load(manifestDir: manifestDir);
- final precompiledBinaries = config.precompiledBinaries;
- if (precompiledBinaries == null) {
- stdout.writeln('Crate does not support precompiled binaries.');
- } else {
- final crateHash = CrateHash.compute(manifestDir);
- stdout.writeln('Crate hash: $crateHash');
-
- for (final target in Target.all) {
- final message = 'Checking ${target.rust}...';
- stdout.write(message.padRight(40));
- stdout.flush();
-
- final artifacts = getArtifactNames(
- target: target,
- libraryName: crateInfo.packageName,
- remote: true,
- );
-
- final prefix = precompiledBinaries.uriPrefix;
-
- bool ok = true;
-
- for (final artifact in artifacts) {
- final fileName = PrecompileBinaries.fileName(target, artifact);
- final signatureFileName =
- PrecompileBinaries.signatureFileName(target, artifact);
-
- final url = Uri.parse('$prefix$crateHash/$fileName');
- final signatureUrl =
- Uri.parse('$prefix$crateHash/$signatureFileName');
-
- final signature = await get(signatureUrl);
- if (signature.statusCode != 200) {
- stdout.writeln('MISSING');
- ok = false;
- break;
- }
- final asset = await get(url);
- if (asset.statusCode != 200) {
- stdout.writeln('MISSING');
- ok = false;
- break;
- }
-
- if (!verify(precompiledBinaries.publicKey, asset.bodyBytes,
- signature.bodyBytes)) {
- stdout.writeln('INVALID SIGNATURE');
- ok = false;
- }
- }
-
- if (ok) {
- stdout.writeln('OK');
- }
- }
- }
- }
-}
diff --git a/cargokit/build_tool/pubspec.lock b/cargokit/build_tool/pubspec.lock
deleted file mode 100644
index 343bdd36..00000000
--- a/cargokit/build_tool/pubspec.lock
+++ /dev/null
@@ -1,453 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
- _fe_analyzer_shared:
- dependency: transitive
- description:
- name: _fe_analyzer_shared
- sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
- url: "https://pub.dev"
- source: hosted
- version: "64.0.0"
- adaptive_number:
- dependency: transitive
- description:
- name: adaptive_number
- sha256: "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77"
- url: "https://pub.dev"
- source: hosted
- version: "1.0.0"
- analyzer:
- dependency: transitive
- description:
- name: analyzer
- sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
- url: "https://pub.dev"
- source: hosted
- version: "6.2.0"
- args:
- dependency: "direct main"
- description:
- name: args
- sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
- url: "https://pub.dev"
- source: hosted
- version: "2.4.2"
- async:
- dependency: transitive
- description:
- name: async
- sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
- url: "https://pub.dev"
- source: hosted
- version: "2.11.0"
- boolean_selector:
- dependency: transitive
- description:
- name: boolean_selector
- sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
- url: "https://pub.dev"
- source: hosted
- version: "2.1.1"
- collection:
- dependency: "direct main"
- description:
- name: collection
- sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
- url: "https://pub.dev"
- source: hosted
- version: "1.18.0"
- convert:
- dependency: "direct main"
- description:
- name: convert
- sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
- url: "https://pub.dev"
- source: hosted
- version: "3.1.1"
- coverage:
- dependency: transitive
- description:
- name: coverage
- sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
- url: "https://pub.dev"
- source: hosted
- version: "1.6.3"
- crypto:
- dependency: "direct main"
- description:
- name: crypto
- sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
- url: "https://pub.dev"
- source: hosted
- version: "3.0.3"
- ed25519_edwards:
- dependency: "direct main"
- description:
- name: ed25519_edwards
- sha256: "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd"
- url: "https://pub.dev"
- source: hosted
- version: "0.3.1"
- file:
- dependency: transitive
- description:
- name: file
- sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
- url: "https://pub.dev"
- source: hosted
- version: "6.1.4"
- fixnum:
- dependency: transitive
- description:
- name: fixnum
- sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
- url: "https://pub.dev"
- source: hosted
- version: "1.1.0"
- frontend_server_client:
- dependency: transitive
- description:
- name: frontend_server_client
- sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
- url: "https://pub.dev"
- source: hosted
- version: "3.2.0"
- github:
- dependency: "direct main"
- description:
- name: github
- sha256: "9966bc13bf612342e916b0a343e95e5f046c88f602a14476440e9b75d2295411"
- url: "https://pub.dev"
- source: hosted
- version: "9.17.0"
- glob:
- dependency: transitive
- description:
- name: glob
- sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
- url: "https://pub.dev"
- source: hosted
- version: "2.1.2"
- hex:
- dependency: "direct main"
- description:
- name: hex
- sha256: "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a"
- url: "https://pub.dev"
- source: hosted
- version: "0.2.0"
- http:
- dependency: "direct main"
- description:
- name: http
- sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
- url: "https://pub.dev"
- source: hosted
- version: "1.1.0"
- http_multi_server:
- dependency: transitive
- description:
- name: http_multi_server
- sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
- url: "https://pub.dev"
- source: hosted
- version: "3.2.1"
- http_parser:
- dependency: transitive
- description:
- name: http_parser
- sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
- url: "https://pub.dev"
- source: hosted
- version: "4.0.2"
- io:
- dependency: transitive
- description:
- name: io
- sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
- url: "https://pub.dev"
- source: hosted
- version: "1.0.4"
- js:
- dependency: transitive
- description:
- name: js
- sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
- url: "https://pub.dev"
- source: hosted
- version: "0.6.7"
- json_annotation:
- dependency: transitive
- description:
- name: json_annotation
- sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
- url: "https://pub.dev"
- source: hosted
- version: "4.8.1"
- lints:
- dependency: "direct dev"
- description:
- name: lints
- sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
- url: "https://pub.dev"
- source: hosted
- version: "2.1.1"
- logging:
- dependency: "direct main"
- description:
- name: logging
- sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
- url: "https://pub.dev"
- source: hosted
- version: "1.2.0"
- matcher:
- dependency: transitive
- description:
- name: matcher
- sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
- url: "https://pub.dev"
- source: hosted
- version: "0.12.16"
- meta:
- dependency: transitive
- description:
- name: meta
- sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
- url: "https://pub.dev"
- source: hosted
- version: "1.9.1"
- mime:
- dependency: transitive
- description:
- name: mime
- sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
- url: "https://pub.dev"
- source: hosted
- version: "1.0.4"
- node_preamble:
- dependency: transitive
- description:
- name: node_preamble
- sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
- url: "https://pub.dev"
- source: hosted
- version: "2.0.2"
- package_config:
- dependency: transitive
- description:
- name: package_config
- sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
- url: "https://pub.dev"
- source: hosted
- version: "2.1.0"
- path:
- dependency: "direct main"
- description:
- name: path
- sha256: "2ad4cddff7f5cc0e2d13069f2a3f7a73ca18f66abd6f5ecf215219cdb3638edb"
- url: "https://pub.dev"
- source: hosted
- version: "1.8.0"
- petitparser:
- dependency: transitive
- description:
- name: petitparser
- sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
- url: "https://pub.dev"
- source: hosted
- version: "5.4.0"
- pool:
- dependency: transitive
- description:
- name: pool
- sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
- url: "https://pub.dev"
- source: hosted
- version: "1.5.1"
- pub_semver:
- dependency: transitive
- description:
- name: pub_semver
- sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
- url: "https://pub.dev"
- source: hosted
- version: "2.1.4"
- shelf:
- dependency: transitive
- description:
- name: shelf
- sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
- url: "https://pub.dev"
- source: hosted
- version: "1.4.1"
- shelf_packages_handler:
- dependency: transitive
- description:
- name: shelf_packages_handler
- sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
- url: "https://pub.dev"
- source: hosted
- version: "3.0.2"
- shelf_static:
- dependency: transitive
- description:
- name: shelf_static
- sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e
- url: "https://pub.dev"
- source: hosted
- version: "1.1.2"
- shelf_web_socket:
- dependency: transitive
- description:
- name: shelf_web_socket
- sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
- url: "https://pub.dev"
- source: hosted
- version: "1.0.4"
- source_map_stack_trace:
- dependency: transitive
- description:
- name: source_map_stack_trace
- sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae"
- url: "https://pub.dev"
- source: hosted
- version: "2.1.1"
- source_maps:
- dependency: transitive
- description:
- name: source_maps
- sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
- url: "https://pub.dev"
- source: hosted
- version: "0.10.12"
- source_span:
- dependency: "direct main"
- description:
- name: source_span
- sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
- url: "https://pub.dev"
- source: hosted
- version: "1.10.0"
- stack_trace:
- dependency: transitive
- description:
- name: stack_trace
- sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
- url: "https://pub.dev"
- source: hosted
- version: "1.11.1"
- stream_channel:
- dependency: transitive
- description:
- name: stream_channel
- sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
- url: "https://pub.dev"
- source: hosted
- version: "2.1.2"
- string_scanner:
- dependency: transitive
- description:
- name: string_scanner
- sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
- url: "https://pub.dev"
- source: hosted
- version: "1.2.0"
- term_glyph:
- dependency: transitive
- description:
- name: term_glyph
- sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
- url: "https://pub.dev"
- source: hosted
- version: "1.2.1"
- test:
- dependency: "direct dev"
- description:
- name: test
- sha256: "9b0dd8e36af4a5b1569029949d50a52cb2a2a2fdaa20cebb96e6603b9ae241f9"
- url: "https://pub.dev"
- source: hosted
- version: "1.24.6"
- test_api:
- dependency: transitive
- description:
- name: test_api
- sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
- url: "https://pub.dev"
- source: hosted
- version: "0.6.1"
- test_core:
- dependency: transitive
- description:
- name: test_core
- sha256: "4bef837e56375537055fdbbbf6dd458b1859881f4c7e6da936158f77d61ab265"
- url: "https://pub.dev"
- source: hosted
- version: "0.5.6"
- toml:
- dependency: "direct main"
- description:
- name: toml
- sha256: "157c5dca5160fced243f3ce984117f729c788bb5e475504f3dbcda881accee44"
- url: "https://pub.dev"
- source: hosted
- version: "0.14.0"
- typed_data:
- dependency: transitive
- description:
- name: typed_data
- sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
- url: "https://pub.dev"
- source: hosted
- version: "1.3.2"
- version:
- dependency: "direct main"
- description:
- name: version
- sha256: "2307e23a45b43f96469eeab946208ed63293e8afca9c28cd8b5241ff31c55f55"
- url: "https://pub.dev"
- source: hosted
- version: "3.0.0"
- vm_service:
- dependency: transitive
- description:
- name: vm_service
- sha256: "0fae432c85c4ea880b33b497d32824b97795b04cdaa74d270219572a1f50268d"
- url: "https://pub.dev"
- source: hosted
- version: "11.9.0"
- watcher:
- dependency: transitive
- description:
- name: watcher
- sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
- url: "https://pub.dev"
- source: hosted
- version: "1.1.0"
- web_socket_channel:
- dependency: transitive
- description:
- name: web_socket_channel
- sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
- url: "https://pub.dev"
- source: hosted
- version: "2.4.0"
- webkit_inspection_protocol:
- dependency: transitive
- description:
- name: webkit_inspection_protocol
- sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d"
- url: "https://pub.dev"
- source: hosted
- version: "1.2.0"
- yaml:
- dependency: "direct main"
- description:
- name: yaml
- sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
- url: "https://pub.dev"
- source: hosted
- version: "3.1.2"
-sdks:
- dart: ">=3.0.0 <4.0.0"
diff --git a/cargokit/build_tool/pubspec.yaml b/cargokit/build_tool/pubspec.yaml
deleted file mode 100644
index e01aa0ae..00000000
--- a/cargokit/build_tool/pubspec.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: build_tool
-description: Cargokit build_tool. Facilitates the build of Rust crate during Flutter application build.
-publish_to: none
-version: 1.0.0
-
-environment:
- sdk: ">=3.0.0 <4.0.0"
-
-# Add regular dependencies here.
-dependencies:
- # these are pinned on purpose because the bundle_tool_runner doesn't have
- # pubspec.lock. See run_build_tool.sh
- logging: 1.2.0
- path: 1.8.0
- version: 3.0.0
- collection: 1.18.0
- ed25519_edwards: 0.3.1
- hex: 0.2.0
- yaml: 3.1.2
- source_span: 1.10.0
- github: 9.17.0
- args: 2.4.2
- crypto: 3.0.3
- convert: 3.1.1
- http: 1.1.0
- toml: 0.14.0
-
-dev_dependencies:
- lints: ^2.1.0
- test: ^1.24.0
diff --git a/cargokit/build_tool/test/builder_test.dart b/cargokit/build_tool/test/builder_test.dart
deleted file mode 100644
index e92852e5..00000000
--- a/cargokit/build_tool/test/builder_test.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:build_tool/src/builder.dart';
-import 'package:test/test.dart';
-
-void main() {
- test('parseBuildConfiguration', () {
- var b = BuildEnvironment.parseBuildConfiguration('debug');
- expect(b, BuildConfiguration.debug);
-
- b = BuildEnvironment.parseBuildConfiguration('profile');
- expect(b, BuildConfiguration.profile);
-
- b = BuildEnvironment.parseBuildConfiguration('release');
- expect(b, BuildConfiguration.release);
-
- b = BuildEnvironment.parseBuildConfiguration('debug-dev');
- expect(b, BuildConfiguration.debug);
-
- b = BuildEnvironment.parseBuildConfiguration('profile');
- expect(b, BuildConfiguration.profile);
-
- b = BuildEnvironment.parseBuildConfiguration('profile-prod');
- expect(b, BuildConfiguration.profile);
-
- // fallback to release
- b = BuildEnvironment.parseBuildConfiguration('unknown');
- expect(b, BuildConfiguration.release);
- });
-}
diff --git a/cargokit/build_tool/test/cargo_test.dart b/cargokit/build_tool/test/cargo_test.dart
deleted file mode 100644
index 00afe29f..00000000
--- a/cargokit/build_tool/test/cargo_test.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:build_tool/src/cargo.dart';
-import 'package:test/test.dart';
-
-final _cargoToml = """
-[workspace]
-
-[profile.release]
-lto = true
-panic = "abort"
-opt-level = "z"
-# strip = "symbols"
-
-[package]
-name = "super_native_extensions"
-version = "0.1.0"
-edition = "2021"
-resolver = "2"
-
-[lib]
-crate-type = ["cdylib", "staticlib"]
-""";
-
-void main() {
- test('parseCargoToml', () {
- final info = CrateInfo.parseManifest(_cargoToml);
- expect(info.packageName, 'super_native_extensions');
- });
-}
diff --git a/cargokit/build_tool/test/options_test.dart b/cargokit/build_tool/test/options_test.dart
deleted file mode 100644
index 25a85b6a..00000000
--- a/cargokit/build_tool/test/options_test.dart
+++ /dev/null
@@ -1,75 +0,0 @@
-import 'package:build_tool/src/builder.dart';
-import 'package:build_tool/src/options.dart';
-import 'package:hex/hex.dart';
-import 'package:test/test.dart';
-import 'package:yaml/yaml.dart';
-
-void main() {
- test('parseCargoBuildOptions', () {
- final yaml = """
-toolchain: nightly
-extra_flags:
- - -Z
- # Comment here
- - build-std=panic_abort,std
-""";
- final node = loadYamlNode(yaml);
- final options = CargoBuildOptions.parse(node);
- expect(options.toolchain, Toolchain.nightly);
- expect(options.flags, ['-Z', 'build-std=panic_abort,std']);
- });
-
- test('parsePrecompiledBinaries', () {
- final yaml = """
-url_prefix: https://url-prefix
-public_key: a4c3433798eb2c36edf2b94dbb4dd899d57496ca373a8982d8a792410b7f6445
-""";
- final precompiledBinaries = PrecompiledBinaries.parse(loadYamlNode(yaml));
- final key = HEX.decode(
- 'a4c3433798eb2c36edf2b94dbb4dd899d57496ca373a8982d8a792410b7f6445');
- expect(precompiledBinaries.uriPrefix, 'https://url-prefix');
- expect(precompiledBinaries.publicKey.bytes, key);
- });
-
- test('parseCargokitOptions', () {
- const yaml = '''
-cargo:
- # For smalles binaries rebuilt the standard library with panic=abort
- debug:
- toolchain: nightly
- extra_flags:
- - -Z
- # Comment here
- - build-std=panic_abort,std
- release:
- toolchain: beta
-
-precompiled_binaries:
- url_prefix: https://url-prefix
- public_key: a4c3433798eb2c36edf2b94dbb4dd899d57496ca373a8982d8a792410b7f6445
-''';
- final options = CargokitCrateOptions.parse(loadYamlNode(yaml));
- expect(options.precompiledBinaries?.uriPrefix, 'https://url-prefix');
- final key = HEX.decode(
- 'a4c3433798eb2c36edf2b94dbb4dd899d57496ca373a8982d8a792410b7f6445');
- expect(options.precompiledBinaries?.publicKey.bytes, key);
-
- final debugOptions = options.cargo[BuildConfiguration.debug]!;
- expect(debugOptions.toolchain, Toolchain.nightly);
- expect(debugOptions.flags, ['-Z', 'build-std=panic_abort,std']);
-
- final releaseOptions = options.cargo[BuildConfiguration.release]!;
- expect(releaseOptions.toolchain, Toolchain.beta);
- expect(releaseOptions.flags, []);
- });
-
- test('parseCargokitUserOptions', () {
- const yaml = '''
-use_precompiled_binaries: false
-verbose_logging: true
-''';
- final options = CargokitUserOptions.parse(loadYamlNode(yaml));
- expect(options.usePrecompiledBinaries, false);
- expect(options.verboseLogging, true);
- });
-}
diff --git a/cargokit/build_tool/test/rustup_test.dart b/cargokit/build_tool/test/rustup_test.dart
deleted file mode 100644
index af95303c..00000000
--- a/cargokit/build_tool/test/rustup_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-import 'package:build_tool/src/rustup.dart';
-import 'package:build_tool/src/util.dart';
-import 'package:test/test.dart';
-
-void main() {
- test('rustup with no toolchains', () {
- bool didListToolchains = false;
- bool didInstallStable = false;
- bool didListTargets = false;
- testRunCommandOverride = (args) {
- expect(args.executable, 'rustup');
- switch (args.arguments) {
- case ['toolchain', 'list']:
- didListToolchains = true;
- return TestRunCommandResult(stdout: 'no installed toolchains\n');
- case ['toolchain', 'install', 'stable']:
- didInstallStable = true;
- return TestRunCommandResult();
- case ['target', 'list', '--toolchain', 'stable', '--installed']:
- didListTargets = true;
- return TestRunCommandResult(
- stdout: 'x86_64-unknown-linux-gnu\nx86_64-apple-darwin\n');
- default:
- throw Exception('Unexpected call: ${args.arguments}');
- }
- };
- final rustup = Rustup();
- rustup.installToolchain('stable');
- expect(didInstallStable, true);
- expect(didListToolchains, true);
- expect(didListTargets, true);
- expect(rustup.installedTargets('stable'), [
- 'x86_64-unknown-linux-gnu',
- 'x86_64-apple-darwin',
- ]);
- testRunCommandOverride = null;
- });
-
- test('rustup with esp toolchain', () {
- final targetsQueried = [];
- testRunCommandOverride = (args) {
- expect(args.executable, 'rustup');
- switch (args.arguments) {
- case ['toolchain', 'list']:
- return TestRunCommandResult(
- stdout: 'stable-aarch64-apple-darwin (default)\n'
- 'nightly-aarch64-apple-darwin\n'
- 'esp\n');
- case ['target', 'list', '--toolchain', String toolchain, '--installed']:
- targetsQueried.add(toolchain);
- return TestRunCommandResult(stdout: '$toolchain:target\n');
- default:
- throw Exception('Unexpected call: ${args.arguments}');
- }
- };
- final rustup = Rustup();
- expect(targetsQueried, [
- 'stable-aarch64-apple-darwin',
- 'nightly-aarch64-apple-darwin',
- ]);
- expect(rustup.installedTargets('stable'),
- ['stable-aarch64-apple-darwin:target']);
- expect(rustup.installedTargets('nightly'),
- ['nightly-aarch64-apple-darwin:target']);
- });
-}
diff --git a/cargokit/cmake/cargokit.cmake b/cargokit/cmake/cargokit.cmake
deleted file mode 100644
index ddd05df9..00000000
--- a/cargokit/cmake/cargokit.cmake
+++ /dev/null
@@ -1,99 +0,0 @@
-SET(cargokit_cmake_root "${CMAKE_CURRENT_LIST_DIR}/..")
-
-# Workaround for https://github.com/dart-lang/pub/issues/4010
-get_filename_component(cargokit_cmake_root "${cargokit_cmake_root}" REALPATH)
-
-if(WIN32)
- # REALPATH does not properly resolve symlinks on windows :-/
- execute_process(COMMAND powershell -ExecutionPolicy Bypass -File "${CMAKE_CURRENT_LIST_DIR}/resolve_symlinks.ps1" "${cargokit_cmake_root}" OUTPUT_VARIABLE cargokit_cmake_root OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-
-# Arguments
-# - target: CMAKE target to which rust library is linked
-# - manifest_dir: relative path from current folder to directory containing cargo manifest
-# - lib_name: cargo package name
-# - any_symbol_name: name of any exported symbol from the library.
-# used on windows to force linking with library.
-function(apply_cargokit target manifest_dir lib_name any_symbol_name)
-
- set(CARGOKIT_LIB_NAME "${lib_name}")
- set(CARGOKIT_LIB_FULL_NAME "${CMAKE_SHARED_MODULE_PREFIX}${CARGOKIT_LIB_NAME}${CMAKE_SHARED_MODULE_SUFFIX}")
- if (CMAKE_CONFIGURATION_TYPES)
- set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$")
- set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/$/${CARGOKIT_LIB_FULL_NAME}")
- else()
- set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
- set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/${CARGOKIT_LIB_FULL_NAME}")
- endif()
- set(CARGOKIT_TEMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/cargokit_build")
-
- if (FLUTTER_TARGET_PLATFORM)
- set(CARGOKIT_TARGET_PLATFORM "${FLUTTER_TARGET_PLATFORM}")
- else()
- set(CARGOKIT_TARGET_PLATFORM "windows-x64")
- endif()
-
- set(CARGOKIT_ENV
- "CARGOKIT_CMAKE=${CMAKE_COMMAND}"
- "CARGOKIT_CONFIGURATION=$"
- "CARGOKIT_MANIFEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${manifest_dir}"
- "CARGOKIT_TARGET_TEMP_DIR=${CARGOKIT_TEMP_DIR}"
- "CARGOKIT_OUTPUT_DIR=${CARGOKIT_OUTPUT_DIR}"
- "CARGOKIT_TARGET_PLATFORM=${CARGOKIT_TARGET_PLATFORM}"
- "CARGOKIT_TOOL_TEMP_DIR=${CARGOKIT_TEMP_DIR}/tool"
- "CARGOKIT_ROOT_PROJECT_DIR=${CMAKE_SOURCE_DIR}"
- )
-
- if (WIN32)
- set(SCRIPT_EXTENSION ".cmd")
- set(IMPORT_LIB_EXTENSION ".lib")
- else()
- set(SCRIPT_EXTENSION ".sh")
- set(IMPORT_LIB_EXTENSION "")
- execute_process(COMMAND chmod +x "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}")
- endif()
-
- # Using generators in custom command is only supported in CMake 3.20+
- if (CMAKE_CONFIGURATION_TYPES AND ${CMAKE_VERSION} VERSION_LESS "3.20.0")
- foreach(CONFIG IN LISTS CMAKE_CONFIGURATION_TYPES)
- add_custom_command(
- OUTPUT
- "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG}/${CARGOKIT_LIB_FULL_NAME}"
- "${CMAKE_CURRENT_BINARY_DIR}/_phony_"
- COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV}
- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake
- VERBATIM
- )
- endforeach()
- else()
- add_custom_command(
- OUTPUT
- ${OUTPUT_LIB}
- "${CMAKE_CURRENT_BINARY_DIR}/_phony_"
- COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV}
- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake
- VERBATIM
- )
- endif()
-
-
- set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/_phony_" PROPERTIES SYMBOLIC TRUE)
-
- if (TARGET ${target})
- # If we have actual cmake target provided create target and make existing
- # target depend on it
- add_custom_target("${target}_cargokit" DEPENDS ${OUTPUT_LIB})
- add_dependencies("${target}" "${target}_cargokit")
- target_link_libraries("${target}" PRIVATE "${OUTPUT_LIB}${IMPORT_LIB_EXTENSION}")
- if(WIN32)
- target_link_options(${target} PRIVATE "/INCLUDE:${any_symbol_name}")
- endif()
- else()
- # Otherwise (FFI) just use ALL to force building always
- add_custom_target("${target}_cargokit" ALL DEPENDS ${OUTPUT_LIB})
- endif()
-
- # Allow adding the output library to plugin bundled libraries
- set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE)
-
-endfunction()
diff --git a/cargokit/cmake/resolve_symlinks.ps1 b/cargokit/cmake/resolve_symlinks.ps1
deleted file mode 100644
index 2ac593a1..00000000
--- a/cargokit/cmake/resolve_symlinks.ps1
+++ /dev/null
@@ -1,34 +0,0 @@
-function Resolve-Symlinks {
- [CmdletBinding()]
- [OutputType([string])]
- param(
- [Parameter(Position = 0, Mandatory, ValueFromPipeline, ValueFromPipelineByPropertyName)]
- [string] $Path
- )
-
- [string] $separator = '/'
- [string[]] $parts = $Path.Split($separator)
-
- [string] $realPath = ''
- foreach ($part in $parts) {
- if ($realPath -and !$realPath.EndsWith($separator)) {
- $realPath += $separator
- }
-
- $realPath += $part.Replace('\', '/')
-
- # The slash is important when using Get-Item on Drive letters in pwsh.
- if (-not($realPath.Contains($separator)) -and $realPath.EndsWith(':')) {
- $realPath += '/'
- }
-
- $item = Get-Item $realPath
- if ($item.LinkTarget) {
- $realPath = $item.LinkTarget.Replace('\', '/')
- }
- }
- $realPath
-}
-
-$path = Resolve-Symlinks -Path $args[0]
-Write-Host $path
diff --git a/cargokit/docs/architecture.md b/cargokit/docs/architecture.md
deleted file mode 100644
index d9bcf4e2..00000000
--- a/cargokit/docs/architecture.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Cargokit Architecture
-
-Note: This is mostly relevant for plugins authors that want to see a bit under the hood rather then just following a tutorial.
-
-In ideal conditions the end-developer using the plugin should not even be aware of Cargokit existence.
-
-## Integration
-
-Cargokit is meant to be included in Flutter plugin (or application) that contains the Rust crate to be built during the Flutter build process.
-
-Cargokit can be either incuded as git submodule or git subtree (required for plugins - as pub does not support submodules for git dependencies).
-
-For a step by step tutorial on integrating Cargokit with a Flutter plugin see https://matejknopp.com/post/flutter_plugin_in_rust_with_no_prebuilt_binaries/.
-
-## build_tool
-
-Build tool is the core of cargokit. It is a Dart command line package that facilitates the build of Rust crate. It is invoked during the Flutter build process to build (or download) Rust artifacts, but it can be also used as a standalone tool.
-
-It handles the following commands:
-
-### build-cmake
-
-This is invoked from `cargokit.cmake` and it is used to build the Rust crate into a dynamic library on Linux and Windows (which use CMake as build system).
-
-The command takes no additional arguments, everything is controlled during environment variables set by `cargokit.cmake`.
-
-### build-gradle
-
-This is invoked from `plugin.gradle` and it is used to build the Rust crate into a dynamic library on Android. The command takes no additional arguments, everything is controlled during environment variables set by `plugin.gradle`.
-
-The build_tool installs NDK if needed, configures the Rust environment for cross compilation and then invokes `cargo build` with appropriate arguments and environment variables.
-
-The build-tool also acts a linker driver.
-
-### build-pod
-
-This is invoked from plugin's podspec `script_phase` through `build_pod.sh`. Bundle tool will build the Rust crate into a static library that gets linked into the plugin Framework. In this case must have `:execution_position` set to `:before_compile`.
-
-Cargokit will build binaries for all active architectures from XCode build and lipo them togherer.
-
-When using Cargokit to integrate Rust code with an application (not a plugin) you can also configure the `Cargo.toml` to just build a dynamic library. When Cargokit finds that the crate only built a dylib and no static lib, it will attempt to replace the Cocoapod framework binary with the dylib. In this case the script `:execution_position` must be set to `:after_compile`. This is *not* recommended for plugins and it's quite experimental.
-
-### gen-key, precompile-binaries, verify-binaries
-
-These are used as when providing precompiled binaries for Plugin. See [precompiled_binaries.md](precompiled_binaries.md) for more information.
-
-## Launching the build_tool during build.
-
-During Flutter build, the build tool can not be launched directly using `dart run`. Rather it is launched through `run_build_tool.sh` and `run_build_tool.cmd`. Because the `build_tool` is shipped as part of plugin, we generally don't want to write into the plugin directory during build, which would happen if the `build_tool` was simply invoked through `dart run` (For example the `.dart_tool/package_config.json` file would get written inside the `build_tool` directory).
-
-Instead the `run_build_tool` script creates a minimal Dart command line package in the build directory and references the `build_tool` as package. That way the `.dart_tool/package_config.json` file is created in the temporary build folder and not in the plugin itself. The script also precompiles the Dart code to speed up subsequent invocations.
-
-## Configuring Cargokit
-
-### Configuration for the Rust crate
-
-Cargokit can be configured through a `cargokit.yaml` file, which can be used to control the build of the Rust package and is placed into the Rust crate next to `Cargo.toml`.
-
-Here is an example `cargokit.yaml` with comments:
-```yaml
-cargo:
- debug: # Configuration of cargo execution during debug builds
- toolchain: stable # default
- release: # Configuration of cargo execution for release builds
- toolchain: nightly # rustup will be invoked with nightly toolchain
- extra_flags: # extra arguments passed to cargo build
- - -Z
- - build-std=panic_abort,std
-
-# If crate ships with precompiled binaries, they can be configured here.
-precompiled_binaries:
- # Uri prefix used when downloading precompiled binaries.
- url_prefix: https://github.com/superlistapp/super_native_extensions/releases/download/precompiled_
-
- # Public key for verifying downloaded precompiled binaries.
- public_key: 3a257ef1c7d72d84225ac4658d24812ada50a7a7a8a2138c2a91353389fdc514
-```
-
-### Configuration for the application consuming the plugin
-
-A `cargokit_options.yaml` file can also be placed by developer using plugin to the root of the application package. In which case the file can be used to specify following options:
-
-```yaml
-# Enables verbose logging of Cargokit during build
-verbose_logging: true
-
-# Opts out of using precompiled binaries. If crate has configured
-# and deployed precompiled binaries, these will be by default used whenever Rustup
-# is not installed. With `use_precompiled_binaries` set to false, the build will
-# instead be aborted prompting user to install Rustup.
-use_precompiled_binaries: false
-```
-
-## Detecting Rustup
-
-When the plugin doesn't come with precompiled libraries (or user opt-out), `build_tool` will need to invoke Rustup during build to ensure that required Rust targets and toolchain are installed for current build and to build the Rust crate.
-
-Cargokit will attempt to detect Rustup in the default Rustup installation location (`~/.cargo/rustup`) as well as in PATH. This is done so that if user install Rustup but doesn't properly configure PATH, Cargokit will still work.
-
-If `build_tool` doesn't find Rustup, it will about the build with a message showing instructions to install Rustup specific to current platform.
-
-On macOS it will also detect a homebrew Rust installation in PATH and will prompt user to call `brew unlink rust` first to remove homebrew Rust installation from PATH, because it may interfere with Rustup.
-
-Homebrew Rust installation can not be used by Cargokit, because it can only build for host platform. Cargokit needs to be able to cross compile the Rust crate for iOS and Android and thus needs full Rustup installation.
diff --git a/cargokit/docs/precompiled_binaries.md b/cargokit/docs/precompiled_binaries.md
deleted file mode 100644
index 2026e867..00000000
--- a/cargokit/docs/precompiled_binaries.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Precompiled Binaries
-
-Because Cargokit builds the Rust crate during Flutter build, it is inherently
-dependend on the Rust toolchain being installed on the developer's machine.
-
-To decrease the friction, it is possible for Cargokit to use precompiled binaries instead.
-
-This is how the process of using precompiled binaries looks from the perspective of the build on developer machine:
-
-1. Cargokit checks if there is `cargokit_options.yaml` file in the root folder of target application. If there is one, it will be checked for `use_precompiled_binaries` options to see if user opted out of using precompiled binaries. In which case Cargokit will insist on building from source. Cargokit will also build from source if the configuration file is absent, but user has Rustup installed.
-
-2. Cargokit checks if there is `cargokit.yaml` file placed in the Rust crate. If there is one, it will be checked for `precompiled_binaries` section to see if crate supports precompiled binaries. The configuration section must contain a public key and URL prefix.
-
-3. Cargokit computes a `crate-hash`. This is a SHA256 hash value computed from all Rust files inside crate, `Cargo.toml`, `Cargo.lock` and `cargokit.yaml`. This uniquely identifies the crate and it is used to find the correct precompiled binaries.
-
-4. Cargokit will attempt to download the precompiled binaries for target platform and `crate_hash` combination and a signature file for each downloaded binary. If download succeeds, the binary content will be verified against the signature and public key included in `cargokit.yaml` (which is part of Rust crate and thus part of published Flutter package).
-
-5. If the verification succeeds, the precompiled binaries will be used. Otherwise the binary will be discarded and Cargokit will insist on building from source.
-
-## Providing precompiled binaries
-
-Note that this assumes that precompiled binaries will be generated during github actions and deployed as github releases.
-
-### Use `build_tool` to generate a key-pair:
-
-```
-dart run build_tool gen-key
-```
-
-This will print the private key and public key. Store the private key securely. It needs to be provided as a secret to github action.
-
-The public key should be included in `cargokit.yaml` file in the Rust crate.
-
-### Provide a `cargokit.yaml` file in the Rust crate
-
-The file must be placed alongside Cargo.toml.
-
-```yaml
-precompiled_binaries:
- # Uri prefix used when downloading precompiled binaries.
- url_prefix: https://github.com///releases/download/precompiled_
-
- # Public key for verifying downloaded precompiled binaries.
- public_key:
-```
-
-### Configure a github action to build and upload precompiled binaries.
-
-The github action should be run at every commit to main branch (and possibly other branches).
-
-The action needs two secrets - private key for signing binaries and GitHub token for uploading binaries as releases. Here is example action that precompiles and uploads binaries for all supported targets.
-
-```yaml
-on:
- push:
- branches: [ main ]
-
-name: Precompile Binaries
-
-jobs:
- Precompile:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- os:
- - ubuntu-latest
- - macOS-latest
- - windows-latest
- steps:
- - uses: actions/checkout@v2
- - uses: dart-lang/setup-dart@v1
- - name: Install GTK
- if: (matrix.os == 'ubuntu-latest')
- run: sudo apt-get update && sudo apt-get install libgtk-3-dev
- - name: Precompile
- if: (matrix.os == 'macOS-latest') || (matrix.os == 'windows-latest')
- run: dart run build_tool precompile-binaries -v --manifest-dir=../../rust --repository=superlistapp/super_native_extensions
- working-directory: super_native_extensions/cargokit/build_tool
- env:
- GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
- PRIVATE_KEY: ${{ secrets.RELEASE_PRIVATE_KEY }}
- - name: Precompile (with Android)
- if: (matrix.os == 'ubuntu-latest')
- run: dart run build_tool precompile-binaries -v --manifest-dir=../../rust --repository=superlistapp/super_native_extensions --android-sdk-location=/usr/local/lib/android/sdk --android-ndk-version=24.0.8215888 --android-min-sdk-version=23
- working-directory: super_native_extensions/cargokit/build_tool
- env:
- GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
- PRIVATE_KEY: ${{ secrets.RELEASE_PRIVATE_KEY }}
-```
-
-By default the `built_tool precompile-binaries` commands build and uploads the binaries for all targets buildable from current host. This can be overriden using the `--target ` argument.
-
-Android binaries will be built when `--android-sdk-location` and `--android-ndk-version` arguments are provided.
-
diff --git a/cargokit/gradle/plugin.gradle b/cargokit/gradle/plugin.gradle
deleted file mode 100644
index fdf94c43..00000000
--- a/cargokit/gradle/plugin.gradle
+++ /dev/null
@@ -1,176 +0,0 @@
-import java.nio.file.Paths
-import org.apache.tools.ant.taskdefs.condition.Os
-
-CargoKitPlugin.file = buildscript.sourceFile
-
-apply plugin: CargoKitPlugin
-
-class CargoKitExtension {
- String manifestDir; // Relative path to folder containing Cargo.toml
- String libname; // Library name within Cargo.toml. Must be a cdylib
-}
-
-abstract class CargoKitBuildTask extends DefaultTask {
-
- @Input
- String buildMode
-
- @Input
- String buildDir
-
- @Input
- String outputDir
-
- @Input
- String ndkVersion
-
- @Input
- String sdkDirectory
-
- @Input
- int compileSdkVersion;
-
- @Input
- int minSdkVersion;
-
- @Input
- String pluginFile
-
- @Input
- List targetPlatforms
-
- @TaskAction
- def build() {
- if (project.cargokit.manifestDir == null) {
- throw new GradleException("Property 'manifestDir' must be set on cargokit extension");
- }
-
- if (project.cargokit.libname == null) {
- throw new GradleException("Property 'libname' must be set on cargokit extension");
- }
-
- def executableName = Os.isFamily(Os.FAMILY_WINDOWS) ? "run_build_tool.cmd" : "run_build_tool.sh"
- def path = Paths.get(new File(pluginFile).parent, "..", executableName);
-
- def manifestDir = Paths.get(project.buildscript.sourceFile.parent, project.cargokit.manifestDir)
-
- def rootProjectDir = project.rootProject.projectDir
-
- if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
- project.exec {
- commandLine 'chmod', '+x', path
- }
- }
-
- project.exec {
- executable path
- args "build-gradle"
- environment "CARGOKIT_ROOT_PROJECT_DIR", rootProjectDir
- environment "CARGOKIT_TOOL_TEMP_DIR", "${buildDir}/build_tool"
- environment "CARGOKIT_MANIFEST_DIR", manifestDir
- environment "CARGOKIT_CONFIGURATION", buildMode
- environment "CARGOKIT_TARGET_TEMP_DIR", buildDir
- environment "CARGOKIT_OUTPUT_DIR", outputDir
- environment "CARGOKIT_NDK_VERSION", ndkVersion
- environment "CARGOKIT_SDK_DIR", sdkDirectory
- environment "CARGOKIT_COMPILE_SDK_VERSION", compileSdkVersion
- environment "CARGOKIT_MIN_SDK_VERSION", minSdkVersion
- environment "CARGOKIT_TARGET_PLATFORMS", targetPlatforms.join(",")
- environment "CARGOKIT_JAVA_HOME", System.properties['java.home']
- }
- }
-}
-
-class CargoKitPlugin implements Plugin {
-
- static String file;
-
- private Plugin findFlutterPlugin(Project rootProject) {
- _findFlutterPlugin(rootProject.childProjects)
- }
-
- private Plugin _findFlutterPlugin(Map projects) {
- for (project in projects) {
- for (plugin in project.value.getPlugins()) {
- if (plugin.class.name == "com.flutter.gradle.FlutterPlugin") {
- return plugin;
- }
- }
- def plugin = _findFlutterPlugin(project.value.childProjects);
- if (plugin != null) {
- return plugin;
- }
- }
- return null;
- }
-
- @Override
- void apply(Project project) {
- def plugin = findFlutterPlugin(project.rootProject);
-
- project.extensions.create("cargokit", CargoKitExtension)
-
- if (plugin == null) {
- print("Flutter plugin not found, CargoKit plugin will not be applied.")
- return;
- }
-
- def cargoBuildDir = "${project.buildDir}/build"
-
- // Determine if the project is an application or library
- def isApplication = plugin.project.plugins.hasPlugin('com.android.application')
- def variants = isApplication ? plugin.project.android.applicationVariants : plugin.project.android.libraryVariants
-
- variants.all { variant ->
-
- final buildType = variant.buildType.name
-
- def cargoOutputDir = "${project.buildDir}/jniLibs/${buildType}";
- def jniLibs = project.android.sourceSets.maybeCreate(buildType).jniLibs;
- jniLibs.srcDir(new File(cargoOutputDir))
-
- def platforms = com.flutter.gradle.FlutterPluginUtils.getTargetPlatforms(project).collect()
-
- // Same thing addFlutterDependencies does in flutter.gradle
- if (buildType == "debug") {
- platforms.add("android-x86")
- platforms.add("android-x64")
- }
-
- // The task name depends on plugin properties, which are not available
- // at this point
- project.getGradle().afterProject {
- def taskName = "cargokitCargoBuild${project.cargokit.libname.capitalize()}${buildType.capitalize()}";
-
- if (project.tasks.findByName(taskName)) {
- return
- }
-
- if (plugin.project.android.ndkVersion == null) {
- throw new GradleException("Please set 'android.ndkVersion' in 'app/build.gradle'.")
- }
-
- def task = project.tasks.create(taskName, CargoKitBuildTask.class) {
- buildMode = variant.buildType.name
- buildDir = cargoBuildDir
- outputDir = cargoOutputDir
- ndkVersion = plugin.project.android.ndkVersion
- sdkDirectory = plugin.project.android.sdkDirectory
- minSdkVersion = plugin.project.android.defaultConfig.minSdkVersion.apiLevel as int
- compileSdkVersion = plugin.project.android.compileSdkVersion.substring(8) as int
- targetPlatforms = platforms
- pluginFile = CargoKitPlugin.file
- }
- def onTask = { newTask ->
- if (newTask.name == "merge${buildType.capitalize()}NativeLibs") {
- newTask.dependsOn task
- // Fix gradle 7.4.2 not picking up JNI library changes
- newTask.outputs.upToDateWhen { false }
- }
- }
- project.tasks.each onTask
- project.tasks.whenTaskAdded onTask
- }
- }
- }
-}
diff --git a/cargokit/run_build_tool.cmd b/cargokit/run_build_tool.cmd
deleted file mode 100644
index c45d0aa8..00000000
--- a/cargokit/run_build_tool.cmd
+++ /dev/null
@@ -1,91 +0,0 @@
-@echo off
-setlocal
-
-setlocal ENABLEDELAYEDEXPANSION
-
-SET BASEDIR=%~dp0
-
-if not exist "%CARGOKIT_TOOL_TEMP_DIR%" (
- mkdir "%CARGOKIT_TOOL_TEMP_DIR%"
-)
-cd /D "%CARGOKIT_TOOL_TEMP_DIR%"
-
-SET BUILD_TOOL_PKG_DIR=%BASEDIR%build_tool
-SET DART=%FLUTTER_ROOT%\bin\cache\dart-sdk\bin\dart
-
-set BUILD_TOOL_PKG_DIR_POSIX=%BUILD_TOOL_PKG_DIR:\=/%
-
-(
- echo name: build_tool_runner
- echo version: 1.0.0
- echo publish_to: none
- echo.
- echo environment:
- echo sdk: '^>=3.0.0 ^<4.0.0'
- echo.
- echo dependencies:
- echo build_tool:
- echo path: %BUILD_TOOL_PKG_DIR_POSIX%
-) >pubspec.yaml
-
-if not exist bin (
- mkdir bin
-)
-
-(
- echo import 'package:build_tool/build_tool.dart' as build_tool;
- echo void main^(List^ args^) ^{
- echo build_tool.runMain^(args^);
- echo ^}
-) >bin\build_tool_runner.dart
-
-SET PRECOMPILED=bin\build_tool_runner.dill
-
-REM To detect changes in package we compare output of DIR /s (recursive)
-set PREV_PACKAGE_INFO=.dart_tool\package_info.prev
-set CUR_PACKAGE_INFO=.dart_tool\package_info.cur
-
-DIR "%BUILD_TOOL_PKG_DIR%" /s > "%CUR_PACKAGE_INFO%_orig"
-
-REM Last line in dir output is free space on harddrive. That is bound to
-REM change between invocation so we need to remove it
-(
- Set "Line="
- For /F "UseBackQ Delims=" %%A In ("%CUR_PACKAGE_INFO%_orig") Do (
- SetLocal EnableDelayedExpansion
- If Defined Line Echo !Line!
- EndLocal
- Set "Line=%%A")
-) >"%CUR_PACKAGE_INFO%"
-DEL "%CUR_PACKAGE_INFO%_orig"
-
-REM Compare current directory listing with previous
-FC /B "%CUR_PACKAGE_INFO%" "%PREV_PACKAGE_INFO%" > nul 2>&1
-
-If %ERRORLEVEL% neq 0 (
- REM Changed - copy current to previous and remove precompiled kernel
- if exist "%PREV_PACKAGE_INFO%" (
- DEL "%PREV_PACKAGE_INFO%"
- )
- MOVE /Y "%CUR_PACKAGE_INFO%" "%PREV_PACKAGE_INFO%"
- if exist "%PRECOMPILED%" (
- DEL "%PRECOMPILED%"
- )
-)
-
-REM There is no CUR_PACKAGE_INFO it was renamed in previous step to %PREV_PACKAGE_INFO%
-REM which means we need to do pub get and precompile
-if not exist "%PRECOMPILED%" (
- echo Running pub get in "%cd%"
- "%DART%" pub get --no-precompile
- "%DART%" compile kernel bin/build_tool_runner.dart
-)
-
-"%DART%" "%PRECOMPILED%" %*
-
-REM 253 means invalid snapshot version.
-If %ERRORLEVEL% equ 253 (
- "%DART%" pub get --no-precompile
- "%DART%" compile kernel bin/build_tool_runner.dart
- "%DART%" "%PRECOMPILED%" %*
-)
diff --git a/cargokit/run_build_tool.sh b/cargokit/run_build_tool.sh
deleted file mode 100755
index 24b0ed89..00000000
--- a/cargokit/run_build_tool.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-BASEDIR=$(dirname "$0")
-
-mkdir -p "$CARGOKIT_TOOL_TEMP_DIR"
-
-cd "$CARGOKIT_TOOL_TEMP_DIR"
-
-# Write a very simple bin package in temp folder that depends on build_tool package
-# from Cargokit. This is done to ensure that we don't pollute Cargokit folder
-# with .dart_tool contents.
-
-BUILD_TOOL_PKG_DIR="$BASEDIR/build_tool"
-
-if [[ -z $FLUTTER_ROOT ]]; then # not defined
- DART=dart
-else
- DART="$FLUTTER_ROOT/bin/cache/dart-sdk/bin/dart"
-fi
-
-cat << EOF > "pubspec.yaml"
-name: build_tool_runner
-version: 1.0.0
-publish_to: none
-
-environment:
- sdk: '>=3.0.0 <4.0.0'
-
-dependencies:
- build_tool:
- path: "$BUILD_TOOL_PKG_DIR"
-EOF
-
-mkdir -p "bin"
-
-cat << EOF > "bin/build_tool_runner.dart"
-import 'package:build_tool/build_tool.dart' as build_tool;
-void main(List args) {
- build_tool.runMain(args);
-}
-EOF
-
-# Create alias for `shasum` if it does not exist and `sha1sum` exists
-if ! [ -x "$(command -v shasum)" ] && [ -x "$(command -v sha1sum)" ]; then
- shopt -s expand_aliases
- alias shasum="sha1sum"
-fi
-
-# Dart run will not cache any package that has a path dependency, which
-# is the case for our build_tool_runner. So instead we precompile the package
-# ourselves.
-# To invalidate the cached kernel we use the hash of ls -LR of the build_tool
-# package directory. This should be good enough, as the build_tool package
-# itself is not meant to have any path dependencies.
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
- PACKAGE_HASH=$(ls -lTR "$BUILD_TOOL_PKG_DIR" | shasum)
-else
- PACKAGE_HASH=$(ls -lR --full-time "$BUILD_TOOL_PKG_DIR" | shasum)
-fi
-
-PACKAGE_HASH_FILE=".package_hash"
-
-if [ -f "$PACKAGE_HASH_FILE" ]; then
- EXISTING_HASH=$(cat "$PACKAGE_HASH_FILE")
- if [ "$PACKAGE_HASH" != "$EXISTING_HASH" ]; then
- rm "$PACKAGE_HASH_FILE"
- fi
-fi
-
-# Run pub get if needed.
-if [ ! -f "$PACKAGE_HASH_FILE" ]; then
- "$DART" pub get --no-precompile
- "$DART" compile kernel bin/build_tool_runner.dart
- echo "$PACKAGE_HASH" > "$PACKAGE_HASH_FILE"
-fi
-
-# Rebuild the tool if it was deleted by Android Studio
-if [ ! -f "bin/build_tool_runner.dill" ]; then
- "$DART" compile kernel bin/build_tool_runner.dart
-fi
-
-set +e
-
-"$DART" bin/build_tool_runner.dill "$@"
-
-exit_code=$?
-
-# 253 means invalid snapshot version.
-if [ $exit_code == 253 ]; then
- "$DART" pub get --no-precompile
- "$DART" compile kernel bin/build_tool_runner.dart
- "$DART" bin/build_tool_runner.dill "$@"
- exit_code=$?
-fi
-
-exit $exit_code
diff --git a/example/.gitignore b/example/.gitignore
index 24476c5d..6c319542 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -5,9 +5,11 @@
*.swp
.DS_Store
.atom/
+.build/
.buildlog/
.history
.svn/
+.swiftpm/
migrate_working_dir/
# IntelliJ related
diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml
index 61b6c4de..641939dc 100644
--- a/example/analysis_options.yaml
+++ b/example/analysis_options.yaml
@@ -7,6 +7,14 @@
# The following line activates a set of recommended lints for Flutter apps,
# packages, and plugins designed to encourage good coding practices.
+analyzer:
+ exclude:
+ - build/**
+ - android/**
+ - ios/**
+ - windows/**
+ - macos/**
+ - linux/**
include: package:flutter_lints/flutter.yaml
linter:
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 7d61b73e..b521b8b6 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -1,27 +1,22 @@
plugins {
id "com.android.application"
- id "kotlin-android"
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id "dev.flutter.flutter-gradle-plugin"
}
android {
- namespace "com.cypherstack.tor_ffi_plugin_example"
+ namespace = "com.cypherstack.tor_ffi_plugin_example"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion
compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
- }
-
- kotlinOptions {
- jvmTarget = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.cypherstack.tor_ffi_plugin_example"
+ applicationId = "com.cypherstack.tor_ffi_plugin_example"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
@@ -39,8 +34,13 @@ android {
}
}
+kotlin {
+ compilerOptions {
+ jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+ }
+}
+
flutter {
source = "../.."
}
-
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 25971708..967988f5 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1,3 +1,5 @@
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
-android.enableJetifier=true
+# These compatibility flags are required by Flutter 3.44 with AGP 9.
+android.newDsl=false
+android.builtInKotlin=false
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index bd814c76..a20f2c46 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
index b9e43bd3..d92e8276 100644
--- a/example/android/settings.gradle
+++ b/example/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
- id "com.android.application" version "8.1.0" apply false
- id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+ id "com.android.application" version "9.1.0" apply false
+ id "org.jetbrains.kotlin.android" version "2.4.0" apply false
}
include ":app"
diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
index 9625e105..391a902b 100644
--- a/example/ios/Flutter/AppFrameworkInfo.plist
+++ b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -20,7 +20,5 @@
????
CFBundleVersion
1.0
- MinimumOSVersion
- 11.0
diff --git a/example/ios/Podfile b/example/ios/Podfile
index fdcc671e..a419e423 100644
--- a/example/ios/Podfile
+++ b/example/ios/Podfile
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '15.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 4165bc16..01bee8ce 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1,29 +1,16 @@
PODS:
- Flutter (1.0.0)
- - path_provider_foundation (0.0.1):
- - Flutter
- - FlutterMacOS
- - tor_ffi_plugin (0.0.1):
- - Flutter
DEPENDENCIES:
- Flutter (from `Flutter`)
- - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- - tor_ffi_plugin (from `.symlinks/plugins/tor_ffi_plugin/ios`)
EXTERNAL SOURCES:
Flutter:
:path: Flutter
- path_provider_foundation:
- :path: ".symlinks/plugins/path_provider_foundation/darwin"
- tor_ffi_plugin:
- :path: ".symlinks/plugins/tor_ffi_plugin/ios"
SPEC CHECKSUMS:
- Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
- path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
- tor_ffi_plugin: 8f2da3b937b748b5f3b830b5a30ce25e6d8f6030
+ Flutter: 71a624a5bc0c04062bf19101d501e466baf2fb47
-PODFILE CHECKSUM: 70d9d25280d0dd177a5f637cdb0f0b0b12c6a189
+PODFILE CHECKSUM: 0e525152e3ec397947996fbf92d176f885bd8b2a
-COCOAPODS: 1.11.3
+COCOAPODS: 1.16.2
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index 30404307..61203990 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -198,7 +198,6 @@
97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
- 721A7ED4958ACCAC9A40D94E /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@@ -215,7 +214,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 1300;
+ LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
331C8080294A63A400263BE5 = {
@@ -307,23 +306,6 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
};
- 721A7ED4958ACCAC9A40D94E /* [CP] Embed Pods Frameworks */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
- );
- name = "[CP] Embed Pods Frameworks";
- outputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
- showEnvVarsInLog = 0;
- };
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
@@ -452,7 +434,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -579,7 +561,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -628,7 +610,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index e42adcb3..e3773d42 100644
--- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
diff --git a/example/ios/Runner/AppDelegate.swift b/example/ios/Runner/AppDelegate.swift
index 70693e4a..c30b367e 100644
--- a/example/ios/Runner/AppDelegate.swift
+++ b/example/ios/Runner/AppDelegate.swift
@@ -1,13 +1,16 @@
-import UIKit
import Flutter
+import UIKit
-@UIApplicationMain
-@objc class AppDelegate: FlutterAppDelegate {
+@main
+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
override func application(
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
- GeneratedPluginRegistrant.register(with: self)
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}
+
+ func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
+ GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+ }
}
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
index 06710de3..dbc66dd3 100644
--- a/example/ios/Runner/Info.plist
+++ b/example/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
+ CADisableMinimumFrameDurationOnPhone
+
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleDisplayName
@@ -24,6 +26,36 @@
$(FLUTTER_BUILD_NUMBER)
LSRequiresIPhoneOS
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+
+ NSLocalNetworkUsageDescription
+ Required to connect to Tor and proxy network traffic.
+ UIApplicationSceneManifest
+
+ UIApplicationSupportsMultipleScenes
+
+ UISceneConfigurations
+
+ UIWindowSceneSessionRoleApplication
+
+
+ UISceneClassName
+ UIWindowScene
+ UISceneConfigurationName
+ flutter
+ UISceneDelegateClassName
+ FlutterSceneDelegate
+ UISceneStoryboardFile
+ Main
+
+
+
+
+ UIApplicationSupportsIndirectInputEvents
+
UILaunchStoryboardName
LaunchScreen
UIMainStoryboardFile
@@ -43,9 +75,5 @@
UIViewControllerBasedStatusBarAppearance
- CADisableMinimumFrameDurationOnPhone
-
- UIApplicationSupportsIndirectInputEvents
-
diff --git a/example/linux/CMakeLists.txt b/example/linux/CMakeLists.txt
index 7dcf40dc..8a2254d8 100644
--- a/example/linux/CMakeLists.txt
+++ b/example/linux/CMakeLists.txt
@@ -123,6 +123,12 @@ foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
COMPONENT Runtime)
endforeach(bundled_library)
+# Copy the native assets provided by the build.dart from all packages.
+set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/")
+install(DIRECTORY "${NATIVE_ASSETS_DIR}"
+ DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+ COMPONENT Runtime)
+
# Fully re-copy the assets directory on each build to avoid having stale files
# from a previous install.
set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake
index 52b84f48..be1ee3e5 100644
--- a/example/linux/flutter/generated_plugins.cmake
+++ b/example/linux/flutter/generated_plugins.cmake
@@ -6,7 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
- tor_ffi_plugin
+ jni
)
set(PLUGIN_BUNDLED_LIBRARIES)
diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift
index e777c67d..cccf817a 100644
--- a/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,8 +5,6 @@
import FlutterMacOS
import Foundation
-import path_provider_foundation
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
- PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
}
diff --git a/example/macos/Podfile b/example/macos/Podfile
index c795730d..b15254e3 100644
--- a/example/macos/Podfile
+++ b/example/macos/Podfile
@@ -1,4 +1,4 @@
-platform :osx, '10.14'
+platform :osx, '12.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock
index 8048264a..815d6862 100644
--- a/example/macos/Podfile.lock
+++ b/example/macos/Podfile.lock
@@ -1,28 +1,16 @@
PODS:
- FlutterMacOS (1.0.0)
- - path_provider_foundation (0.0.1):
- - Flutter
- - FlutterMacOS
- - tor_ffi_plugin (0.0.1)
DEPENDENCIES:
- FlutterMacOS (from `Flutter/ephemeral`)
- - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
- - tor_ffi_plugin (from `Flutter/ephemeral/.symlinks/plugins/tor_ffi_plugin/macos`)
EXTERNAL SOURCES:
FlutterMacOS:
:path: Flutter/ephemeral
- path_provider_foundation:
- :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
- tor_ffi_plugin:
- :path: Flutter/ephemeral/.symlinks/plugins/tor_ffi_plugin/macos
SPEC CHECKSUMS:
- FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
- path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
- tor_ffi_plugin: 2566c1ed174688cca560fa0c64b7a799c66f07cb
+ FlutterMacOS: c232990155153907050900a2e175c7773903ba4e
-PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
+PODFILE CHECKSUM: f0c21717cb7ee9112f915044c74bfceb5b12e02a
-COCOAPODS: 1.11.3
+COCOAPODS: 1.16.2
diff --git a/example/macos/Runner.xcodeproj/project.pbxproj b/example/macos/Runner.xcodeproj/project.pbxproj
index 6d230287..800a7e85 100644
--- a/example/macos/Runner.xcodeproj/project.pbxproj
+++ b/example/macos/Runner.xcodeproj/project.pbxproj
@@ -239,7 +239,6 @@
33CC10EB2044A3C60003C045 /* Resources */,
33CC110E2044A8840003C045 /* Bundle Framework */,
3399D490228B24CF009A79C7 /* ShellScript */,
- 5855DED4BE22CD482DFE24FF /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@@ -258,7 +257,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
- LastUpgradeCheck = 1300;
+ LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
331C80D4294CF70F00263BE5 = {
@@ -403,23 +402,6 @@
shellPath = /bin/sh;
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
};
- 5855DED4BE22CD482DFE24FF /* [CP] Embed Pods Frameworks */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
- );
- name = "[CP] Embed Pods Frameworks";
- outputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
- showEnvVarsInLog = 0;
- };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -552,7 +534,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.14;
+ MACOSX_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
@@ -633,7 +615,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.14;
+ MACOSX_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@@ -680,7 +662,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.14;
+ MACOSX_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
diff --git a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 58178c26..f4231ce4 100644
--- a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
diff --git a/example/macos/Runner/AppDelegate.swift b/example/macos/Runner/AppDelegate.swift
index d53ef643..b3c17614 100644
--- a/example/macos/Runner/AppDelegate.swift
+++ b/example/macos/Runner/AppDelegate.swift
@@ -1,9 +1,13 @@
import Cocoa
import FlutterMacOS
-@NSApplicationMain
+@main
class AppDelegate: FlutterAppDelegate {
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
return true
}
+
+ override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+ return true
+ }
}
diff --git a/example/pubspec.lock b/example/pubspec.lock
index e6c03409..79337fd2 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -1,14 +1,22 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
+ args:
+ dependency: transitive
+ description:
+ name: args
+ sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.7.0"
async:
dependency: transitive
description:
name: async
- sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+ sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37
url: "https://pub.dev"
source: hosted
- version: "2.12.0"
+ version: "2.13.1"
boolean_selector:
dependency: transitive
description:
@@ -21,18 +29,26 @@ packages:
dependency: transitive
description:
name: characters
- sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+ sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
url: "https://pub.dev"
source: hosted
- version: "1.4.0"
+ version: "1.4.1"
clock:
dependency: transitive
description:
name: clock
- sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+ sha256: e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e
url: "https://pub.dev"
source: hosted
- version: "1.1.2"
+ version: "1.1.3"
+ code_assets:
+ dependency: transitive
+ description:
+ name: code_assets
+ sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.2.1"
collection:
dependency: transitive
description:
@@ -41,30 +57,38 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.19.1"
+ crypto:
+ dependency: transitive
+ description:
+ name: crypto
+ sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.7"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
- sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
+ sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd"
url: "https://pub.dev"
source: hosted
- version: "1.0.8"
+ version: "1.0.9"
fake_async:
dependency: transitive
description:
name: fake_async
- sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+ sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
url: "https://pub.dev"
source: hosted
- version: "1.3.2"
+ version: "1.3.3"
ffi:
dependency: transitive
description:
name: ffi
- sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
+ sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
url: "https://pub.dev"
source: hosted
- version: "2.1.3"
+ version: "2.2.0"
flutter:
dependency: "direct main"
description: flutter
@@ -74,71 +98,135 @@ packages:
dependency: "direct dev"
description:
name: flutter_lints
- sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+ sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1"
url: "https://pub.dev"
source: hosted
- version: "4.0.0"
+ version: "6.0.0"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
+ hooks:
+ dependency: transitive
+ description:
+ name: hooks
+ sha256: eaac480a35ec0814146c2c48d96aaa829e0e44a7662c88ae84c9edf4bc35651f
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.2.0"
+ jni:
+ dependency: transitive
+ description:
+ name: jni
+ sha256: f038e58b4dc2c9037f50e233175086337e0b305e356d28211bf55f21c504cbd3
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.3"
+ jni_flutter:
+ dependency: transitive
+ description:
+ name: jni_flutter
+ sha256: b2310cdd4c18c65c081ab141a41efa94aa26c65431803703ece51996f174f351
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.3"
+ jni_util:
+ dependency: transitive
+ description:
+ name: jni_util
+ sha256: "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
- sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+ sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev"
source: hosted
- version: "10.0.8"
+ version: "11.0.2"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
- sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+ sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
url: "https://pub.dev"
source: hosted
- version: "3.0.9"
+ version: "3.0.10"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
- sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+ sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
url: "https://pub.dev"
source: hosted
- version: "3.0.1"
+ version: "3.0.2"
lints:
dependency: transitive
description:
name: lints
- sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+ sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df"
url: "https://pub.dev"
source: hosted
- version: "4.0.0"
+ version: "6.1.0"
+ logging:
+ dependency: transitive
+ description:
+ name: logging
+ sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.3.0"
matcher:
dependency: transitive
description:
name: matcher
- sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+ sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd"
url: "https://pub.dev"
source: hosted
- version: "0.12.17"
+ version: "0.12.20"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
- sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+ sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
url: "https://pub.dev"
source: hosted
- version: "0.11.1"
+ version: "0.13.0"
meta:
dependency: transitive
description:
name: meta
- sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+ sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.19.0"
+ native_toolchain_rust:
+ dependency: transitive
+ description:
+ name: native_toolchain_rust
+ sha256: "8469a0e32a47a5c84b7fd300de9fd0e8082aac76c37922986324f5082a58350d"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.6"
+ objective_c:
+ dependency: transitive
+ description:
+ name: objective_c
+ sha256: b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e
+ url: "https://pub.dev"
+ source: hosted
+ version: "9.5.0"
+ package_config:
+ dependency: transitive
+ description:
+ name: package_config
+ sha256: ffcf4cf3d6c0b74ac43708d9f56625506e8a68aa935abe9d267a7330f320eb5d
url: "https://pub.dev"
source: hosted
- version: "1.16.0"
+ version: "3.0.0"
path:
dependency: transitive
description:
@@ -151,42 +239,42 @@ packages:
dependency: "direct main"
description:
name: path_provider
- sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+ sha256: a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825
url: "https://pub.dev"
source: hosted
- version: "2.1.4"
+ version: "2.1.6"
path_provider_android:
dependency: transitive
description:
name: path_provider_android
- sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7"
+ sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd"
url: "https://pub.dev"
source: hosted
- version: "2.2.10"
+ version: "2.3.1"
path_provider_foundation:
dependency: transitive
description:
name: path_provider_foundation
- sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+ sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
url: "https://pub.dev"
source: hosted
- version: "2.4.0"
+ version: "2.6.0"
path_provider_linux:
dependency: transitive
description:
name: path_provider_linux
- sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+ sha256: "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16"
url: "https://pub.dev"
source: hosted
- version: "2.2.1"
+ version: "2.2.2"
path_provider_platform_interface:
dependency: transitive
description:
name: path_provider_platform_interface
- sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+ sha256: "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda"
url: "https://pub.dev"
source: hosted
- version: "2.1.2"
+ version: "2.1.3"
path_provider_windows:
dependency: transitive
description:
@@ -195,14 +283,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.3.0"
+ petitparser:
+ dependency: transitive
+ description:
+ name: petitparser
+ sha256: "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675"
+ url: "https://pub.dev"
+ source: hosted
+ version: "7.0.2"
platform:
dependency: transitive
description:
name: platform
- sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+ sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
url: "https://pub.dev"
source: hosted
- version: "3.1.5"
+ version: "3.1.6"
plugin_platform_interface:
dependency: transitive
description:
@@ -211,6 +307,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.8"
+ pub_semver:
+ dependency: transitive
+ description:
+ name: pub_semver
+ sha256: "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.2.1"
+ record_use:
+ dependency: transitive
+ description:
+ name: record_use
+ sha256: "1cb8564af8d43b464294411db9217f5ec04891c6f22ee2c32d73ae05e88a6bd2"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.1.1"
sky_engine:
dependency: transitive
description: flutter
@@ -228,26 +340,26 @@ packages:
dependency: "direct main"
description:
name: socks_socket
- sha256: f308ec9181498ba532848752b4063b5e21ea5ae227d834a3088fae360eacbdd2
+ sha256: "127e919f67de316850d3f1e811ca339c4b85b31e52d1af3838cb5469cb5397f7"
url: "https://pub.dev"
source: hosted
- version: "1.1.0"
+ version: "1.3.0"
source_span:
dependency: transitive
description:
name: source_span
- sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+ sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
url: "https://pub.dev"
source: hosted
- version: "1.10.1"
+ version: "1.10.2"
stack_trace:
dependency: transitive
description:
name: stack_trace
- sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+ sha256: "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490"
url: "https://pub.dev"
source: hosted
- version: "1.12.1"
+ version: "1.12.2"
stream_channel:
dependency: transitive
description:
@@ -276,41 +388,73 @@ packages:
dependency: transitive
description:
name: test_api
- sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+ sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.7.12"
+ toml:
+ dependency: transitive
+ description:
+ name: toml
+ sha256: "35a35f782228656a2af31e8c73d1353cc4ef3d683fd68af1111b44631879c05e"
url: "https://pub.dev"
source: hosted
- version: "0.7.4"
+ version: "0.18.0"
tor_ffi_plugin:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
- version: "0.0.1"
+ version: "0.1.0"
+ typed_data:
+ dependency: transitive
+ description:
+ name: typed_data
+ sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.4.0"
vector_math:
dependency: transitive
description:
name: vector_math
- sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+ sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47
url: "https://pub.dev"
source: hosted
- version: "2.1.4"
+ version: "2.4.2"
vm_service:
dependency: transitive
description:
name: vm_service
- sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+ sha256: "5f37239c4851efcef929cea7824e76df7f2f0970aef85d66bbc430afa40e72f0"
+ url: "https://pub.dev"
+ source: hosted
+ version: "15.3.0"
+ web:
+ dependency: transitive
+ description:
+ name: web
+ sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
url: "https://pub.dev"
source: hosted
- version: "14.3.1"
+ version: "1.1.1"
xdg_directories:
dependency: transitive
description:
name: xdg_directories
- sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+ sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.1.0"
+ yaml:
+ dependency: transitive
+ description:
+ name: yaml
+ sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea
url: "https://pub.dev"
source: hosted
- version: "1.0.4"
+ version: "3.1.4"
sdks:
- dart: ">=3.7.0-0 <4.0.0"
- flutter: ">=3.24.3"
+ dart: ">=3.13.0 <4.0.0"
+ flutter: ">=3.47.2"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 0eca85e3..b575db77 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1
environment:
- sdk: '>=3.0.0 <4.0.0'
+ sdk: '>=3.13.0 <4.0.0'
# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
@@ -43,7 +43,7 @@ dependencies:
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.2
socks5_proxy: 1.0.3+dev.3
- path_provider: ^2.1.1
+ path_provider: ^2.1.6
socks_socket: ^1.1.0
dev_dependencies:
@@ -55,7 +55,7 @@ dev_dependencies:
# activated in the `analysis_options.yaml` file located at the root of your
# package. See that file for information about deactivating specific lint
# rules and activating additional ones.
- flutter_lints: ^4.0.0
+ flutter_lints: ^6.0.0
# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
diff --git a/example/windows/CMakeLists.txt b/example/windows/CMakeLists.txt
index b58ca1e3..91c8ad41 100644
--- a/example/windows/CMakeLists.txt
+++ b/example/windows/CMakeLists.txt
@@ -87,6 +87,12 @@ if(PLUGIN_BUNDLED_LIBRARIES)
COMPONENT Runtime)
endif()
+# Copy the native assets provided by the build.dart from all packages.
+set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/")
+install(DIRECTORY "${NATIVE_ASSETS_DIR}"
+ DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+ COMPONENT Runtime)
+
# Fully re-copy the assets directory on each build to avoid having stale files
# from a previous install.
set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
diff --git a/example/windows/flutter/generated_plugins.cmake b/example/windows/flutter/generated_plugins.cmake
index 46a2ee5c..3ad69c61 100644
--- a/example/windows/flutter/generated_plugins.cmake
+++ b/example/windows/flutter/generated_plugins.cmake
@@ -6,7 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
- tor_ffi_plugin
+ jni
)
set(PLUGIN_BUNDLED_LIBRARIES)
diff --git a/ffigen.yaml b/ffigen.yaml
index 96a1fe20..10f45ae8 100644
--- a/ffigen.yaml
+++ b/ffigen.yaml
@@ -1,10 +1,12 @@
-# Run with `flutter pub run ffigen --config ffigen.yaml`.
+# Run with `dart run ffigen --config ffigen.yaml`.
name: TorFfiPluginBindings
description: |
Bindings for `src/tor_ffi_plugin.h`.
- Regenerate bindings with `flutter pub run ffigen --config ffigen.yaml`.
+ Regenerate bindings with `dart run ffigen --config ffigen.yaml`.
output: 'lib/tor_ffi_plugin_bindings_generated.dart'
+ffi-native:
+ asset-id: 'package:tor_ffi_plugin/tor_ffi_plugin_bindings_generated.dart'
headers:
entry-points:
- 'rust/target/tor_ffi_plugin.h'
diff --git a/hook/build.dart b/hook/build.dart
new file mode 100644
index 00000000..94af70e7
--- /dev/null
+++ b/hook/build.dart
@@ -0,0 +1,16 @@
+import 'package:hooks/hooks.dart';
+import 'package:native_toolchain_rust/native_toolchain_rust.dart';
+
+void main(List args) async {
+ await build(args, (input, output) async {
+ output.dependencies.addAll([
+ input.packageRoot.resolve('rust/Cargo.toml'),
+ input.packageRoot.resolve('rust/Cargo.lock'),
+ input.packageRoot.resolve('rust/rust-toolchain.toml'),
+ ]);
+
+ await const RustBuilder(
+ assetName: 'tor_ffi_plugin_bindings_generated.dart',
+ ).run(input: input, output: output);
+ });
+}
diff --git a/ios/Classes/tor_ffi_plugin.c b/ios/Classes/tor_ffi_plugin.c
deleted file mode 100644
index 09168e87..00000000
--- a/ios/Classes/tor_ffi_plugin.c
+++ /dev/null
@@ -1,2 +0,0 @@
-// Relative import to be able to reuse the C sources.
-// See the comment in ../{projectName}}.podspec for more information.
diff --git a/ios/tor_ffi_plugin.podspec b/ios/tor_ffi_plugin.podspec
deleted file mode 100644
index 0e183257..00000000
--- a/ios/tor_ffi_plugin.podspec
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
-# Run `pod lib lint tor_ffi_plugin.podspec` to validate before publishing.
-#
-Pod::Spec.new do |s|
- s.name = 'tor_ffi_plugin'
- s.version = '0.0.1'
- s.summary = 'A new Flutter FFI plugin project.'
- s.description = <<-DESC
-A new Flutter FFI plugin project.
- DESC
- s.homepage = 'http://example.com'
- s.license = { :file => '../LICENSE' }
- s.author = { 'Your Company' => 'email@example.com' }
-
- s.source = { :path => '.' }
- s.source_files = 'Classes/**/*'
- s.dependency 'Flutter'
- s.platform = :ios, '15.0'
-
- s.script_phase = {
- :name => 'Build Rust library',
- # First argument is relative path to the `rust` folder, second is name of rust library
- :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../rust tor_ffi_plugin',
- :execution_position => :before_compile,
- :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
- # Let XCode know that the static library referenced in -force_load below is
- # created by this build step.
- :output_files => ["${BUILT_PRODUCTS_DIR}/libtor_ffi_plugin.a"],
- }
- s.pod_target_xcconfig = {
- 'DEFINES_MODULE' => 'YES',
- # Flutter.framework does not contain a i386 slice.
- 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386',
- 'EXCLUDED_ARCHS' => 'armv7',
- 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/libtor_ffi_plugin.a',
- }
- s.user_target_xcconfig = {
- 'EXCLUDED_ARCHS' => 'armv7',
- }
-end
diff --git a/lib/tor_ffi_plugin.dart b/lib/tor_ffi_plugin.dart
index 41beb402..0c19105c 100644
--- a/lib/tor_ffi_plugin.dart
+++ b/lib/tor_ffi_plugin.dart
@@ -9,20 +9,8 @@ import 'dart:isolate';
import 'dart:math';
import 'package:ffi/ffi.dart';
-import 'package:flutter/foundation.dart';
-import 'package:tor_ffi_plugin/tor_ffi_plugin_bindings_generated.dart';
-
-DynamicLibrary _load(name) {
- if (Platform.isAndroid || Platform.isLinux) {
- return DynamicLibrary.open('lib$name.so');
- } else if (Platform.isIOS || Platform.isMacOS) {
- return DynamicLibrary.open('$name.framework/$name');
- } else if (Platform.isWindows) {
- return DynamicLibrary.open('$name.dll');
- } else {
- throw NotSupportedPlatform('${Platform.operatingSystem} is not supported!');
- }
-}
+import 'package:tor_ffi_plugin/tor_ffi_plugin_bindings_generated.dart'
+ as bindings;
class CouldntBootstrapDirectory implements Exception {
String? rustError;
@@ -30,10 +18,6 @@ class CouldntBootstrapDirectory implements Exception {
CouldntBootstrapDirectory({this.rustError});
}
-class NotSupportedPlatform implements Exception {
- NotSupportedPlatform(String s);
-}
-
enum TorStatus {
on,
starting,
@@ -42,19 +26,11 @@ enum TorStatus {
class Tor {
/// Private constructor for the Tor class.
- Tor._() {
- _lib = _load(_libName);
- if (kDebugMode) {
- print("Native tor library loaded!");
- }
- }
+ Tor._();
/// Singleton instance of the Tor class.
static final Tor instance = Tor._();
- static const String _libName = "tor_ffi_plugin";
- static late DynamicLibrary _lib;
-
/// Status of the tor proxy service
TorStatus get status => _status;
TorStatus _status = TorStatus.off;
@@ -110,22 +86,18 @@ class Tor {
// Start the Tor service in an isolate.
final tor = await Isolate.run(() async {
- // Load the Tor library.
- var lib = TorFfiPluginBindings(_load(_libName));
-
// Start the Tor service.
- final ptr = lib.tor_start(
+ final tor = bindings.tor_start(
newPort,
stateDir.path.toNativeUtf8() as Pointer,
cacheDir.path.toNativeUtf8() as Pointer);
// Throw an exception if the Tor service fails to start.
- if (ptr == nullptr) {
- throwRustException(lib);
+ if (tor.client == nullptr) {
+ throwRustException();
}
- // Return the pointer.
- return ptr;
+ return tor;
});
// Set the client pointer and started flag.
@@ -155,15 +127,12 @@ class Tor {
///
/// Returns void.
void _bootstrap() {
- // Load the Tor library.
- final lib = TorFfiPluginBindings(_lib);
-
// Bootstrap the Tor service.
- _bootstrapped = lib.tor_client_bootstrap(_clientPtr);
+ _bootstrapped = bindings.tor_client_bootstrap(_clientPtr);
// Throw an exception if the Tor service fails to bootstrap.
if (!_bootstrapped) {
- throwRustException(lib);
+ throwRustException();
}
}
@@ -174,8 +143,7 @@ class Tor {
/// Stop the proxy.
stop() async {
- final lib = TorFfiPluginBindings(_lib);
- lib.tor_proxy_stop(_proxyPtr);
+ bindings.tor_proxy_stop(_proxyPtr);
_proxyPtr = nullptr;
}
@@ -184,8 +152,7 @@ class Tor {
throw ClientNotActive();
}
- final lib = TorFfiPluginBindings(_lib);
- lib.tor_client_set_dormant(_clientPtr, dormant);
+ bindings.tor_client_set_dormant(_clientPtr, dormant);
}
Pointer _clientPtr = nullptr;
@@ -216,8 +183,9 @@ class Tor {
// // if (enabled && started && circuitEstablished) {}
// }
- static void throwRustException(TorFfiPluginBindings lib) {
- String rustError = lib.tor_last_error_message().cast().toDartString();
+ static void throwRustException() {
+ String rustError =
+ bindings.tor_last_error_message().cast().toDartString();
throw _getRustException(rustError);
}
@@ -231,7 +199,7 @@ class Tor {
}
void hello() {
- TorFfiPluginBindings(_lib).tor_hello();
+ bindings.tor_hello();
}
}
diff --git a/lib/tor_ffi_plugin_bindings_generated.dart b/lib/tor_ffi_plugin_bindings_generated.dart
index d71d4f3f..6113d4ce 100644
--- a/lib/tor_ffi_plugin_bindings_generated.dart
+++ b/lib/tor_ffi_plugin_bindings_generated.dart
@@ -5,136 +5,57 @@
// AUTO GENERATED FILE, DO NOT EDIT.
//
// Generated by `package:ffigen`.
-import 'dart:ffi' as ffi;
-
-/// Bindings for `src/tor_ffi_plugin.h`.
-///
-/// Regenerate bindings with `flutter pub run ffigen --config ffigen.yaml`.
-///
-class TorFfiPluginBindings {
- /// Holds the symbol lookup function.
- final ffi.Pointer Function(String symbolName)
- _lookup;
-
- /// The symbols are looked up in [dynamicLibrary].
- TorFfiPluginBindings(ffi.DynamicLibrary dynamicLibrary)
- : _lookup = dynamicLibrary.lookup;
-
- /// The symbols are looked up with [lookup].
- TorFfiPluginBindings.fromLookup(
- ffi.Pointer Function(String symbolName)
- lookup)
- : _lookup = lookup;
-
- Tor tor_start(
- int socks_port,
- ffi.Pointer state_dir,
- ffi.Pointer cache_dir,
- ) {
- return _tor_start(
- socks_port,
- state_dir,
- cache_dir,
- );
- }
-
- late final _tor_startPtr = _lookup<
- ffi.NativeFunction<
- Tor Function(ffi.Uint16, ffi.Pointer,
- ffi.Pointer)>>('tor_start');
- late final _tor_start = _tor_startPtr.asFunction<
- Tor Function(int, ffi.Pointer, ffi.Pointer)>();
-
- bool tor_client_bootstrap(
- ffi.Pointer client,
- ) {
- return _tor_client_bootstrap(
- client,
- );
- }
+// ignore_for_file: type=lint, unused_import, unused_element, deprecated_member_use_from_same_package
+@ffi.DefaultAsset(
+ 'package:tor_ffi_plugin/tor_ffi_plugin_bindings_generated.dart',
+)
+library;
- late final _tor_client_bootstrapPtr =
- _lookup)>>(
- 'tor_client_bootstrap');
- late final _tor_client_bootstrap = _tor_client_bootstrapPtr
- .asFunction)>();
-
- void tor_client_set_dormant(
- ffi.Pointer client,
- bool soft_mode,
- ) {
- return _tor_client_set_dormant(
- client,
- soft_mode,
- );
- }
-
- late final _tor_client_set_dormantPtr = _lookup<
- ffi
- .NativeFunction, ffi.Bool)>>(
- 'tor_client_set_dormant');
- late final _tor_client_set_dormant = _tor_client_set_dormantPtr
- .asFunction, bool)>();
-
- void tor_proxy_stop(
- ffi.Pointer proxy,
- ) {
- return _tor_proxy_stop(
- proxy,
- );
- }
-
- late final _tor_proxy_stopPtr =
- _lookup)>>(
- 'tor_proxy_stop');
- late final _tor_proxy_stop =
- _tor_proxy_stopPtr.asFunction)>();
+import 'dart:ffi' as ffi;
- void tor_hello() {
- return _tor_hello();
- }
+@ffi.Native)>()
+external bool tor_client_bootstrap(ffi.Pointer client);
- late final _tor_helloPtr =
- _lookup>('tor_hello');
- late final _tor_hello = _tor_helloPtr.asFunction();
+@ffi.Native, ffi.Bool)>()
+external void tor_client_set_dormant(
+ ffi.Pointer client,
+ bool soft_mode,
+);
- ffi.Pointer tor_last_error_message() {
- return _tor_last_error_message();
- }
+@ffi.Native()
+external int tor_get_nofile_limit();
- late final _tor_last_error_messagePtr =
- _lookup Function()>>(
- 'tor_last_error_message');
- late final _tor_last_error_message =
- _tor_last_error_messagePtr.asFunction Function()>();
+@ffi.Native()
+external void tor_hello();
- int tor_get_nofile_limit() {
- return _tor_get_nofile_limit();
- }
+@ffi.Native Function()>()
+external ffi.Pointer tor_last_error_message();
- late final _tor_get_nofile_limitPtr =
- _lookup>(
- 'tor_get_nofile_limit');
- late final _tor_get_nofile_limit =
- _tor_get_nofile_limitPtr.asFunction();
+@ffi.Native)>()
+external void tor_proxy_stop(ffi.Pointer proxy);
- int tor_set_nofile_limit(
- int limit,
- ) {
- return _tor_set_nofile_limit(
- limit,
- );
- }
+@ffi.Native()
+external int tor_set_nofile_limit(int limit);
- late final _tor_set_nofile_limitPtr =
- _lookup>(
- 'tor_set_nofile_limit');
- late final _tor_set_nofile_limit =
- _tor_set_nofile_limitPtr.asFunction();
-}
+@ffi.Native<
+ Tor Function(ffi.Uint16, ffi.Pointer, ffi.Pointer)>()
+external Tor tor_start(
+ int socks_port,
+ ffi.Pointer state_dir,
+ ffi.Pointer cache_dir,
+);
final class Tor extends ffi.Struct {
external ffi.Pointer client;
external ffi.Pointer proxy;
+
+ static ffi.Pointer $allocate(
+ ffi.Allocator $allocator, {
+ required ffi.Pointer client,
+ required ffi.Pointer proxy,
+ }) =>
+ $allocator()
+ ..ref.client = client
+ ..ref.proxy = proxy;
}
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
deleted file mode 100644
index 5b1433fb..00000000
--- a/linux/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# The Flutter tooling requires that developers have CMake 3.10 or later
-# installed. You should not increase this version, as doing so will cause
-# the plugin to fail to compile for some customers of the plugin.
-cmake_minimum_required(VERSION 3.10)
-
-# Project-level configuration.
-set(PROJECT_NAME "tor_ffi_plugin")
-project(${PROJECT_NAME} LANGUAGES CXX)
-
-# Invoke the build for native code shared with the other target platforms.
-# This can be changed to accommodate different builds.
-include("../cargokit/cmake/cargokit.cmake")
-apply_cargokit(${PROJECT_NAME} ../rust tor_ffi_plugin "")
-
-# List of absolute paths to libraries that should be bundled with the plugin.
-# This list could contain prebuilt libraries, or libraries created by an
-# external build triggered from this build file.
-set(tor_ffi_plugin_bundled_libraries
- # Defined in ../src/CMakeLists.txt.
- # This can be changed to accommodate different builds.
- "${${PROJECT_NAME}_cargokit_lib}"
- PARENT_SCOPE
-)
diff --git a/macos/Classes/tor_ffi_plugin.c b/macos/Classes/tor_ffi_plugin.c
deleted file mode 100644
index 09168e87..00000000
--- a/macos/Classes/tor_ffi_plugin.c
+++ /dev/null
@@ -1,2 +0,0 @@
-// Relative import to be able to reuse the C sources.
-// See the comment in ../{projectName}}.podspec for more information.
diff --git a/macos/tor_ffi_plugin.podspec b/macos/tor_ffi_plugin.podspec
deleted file mode 100644
index 48fdfd11..00000000
--- a/macos/tor_ffi_plugin.podspec
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
-# Run `pod lib lint tor_ffi_plugin.podspec` to validate before publishing.
-#
-Pod::Spec.new do |s|
- s.name = 'tor_ffi_plugin'
- s.version = '0.0.1'
- s.summary = 'A new Flutter FFI plugin project.'
- s.description = <<-DESC
-A new Flutter FFI plugin project.
- DESC
- s.homepage = 'http://example.com'
- s.license = { :file => '../LICENSE' }
- s.author = { 'Your Company' => 'email@example.com' }
-
- s.source = { :path => '.' }
- s.source_files = 'Classes/**/*'
- s.platform = :osx, '10.13'
-
- s.script_phase = {
- :name => 'Build Rust library',
- # First argument is relative path to the `rust` folder, second is name of rust library
- :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../rust tor_ffi_plugin',
- :execution_position => :before_compile,
- :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
- # Let XCode know that the static library referenced in -force_load below is
- # created by this build step.
- :output_files => ["${BUILT_PRODUCTS_DIR}/libtor_ffi_plugin.a"],
- }
- s.pod_target_xcconfig = {
- 'DEFINES_MODULE' => 'YES',
- # We use `-force_load` instead of `-l` since Xcode strips out unused symbols from static libraries.
- 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/libtor_ffi_plugin.a',
- 'DEAD_CODE_STRIPPING' => 'YES',
- 'STRIP_INSTALLED_PRODUCT[config=Release][sdk=*][arch=*]' => "YES",
- 'STRIP_STYLE[config=Release][sdk=*][arch=*]' => "non-global",
- 'DEPLOYMENT_POSTPROCESSING[config=Release][sdk=*][arch=*]' => "YES",
- }
-end
diff --git a/pubspec.yaml b/pubspec.yaml
index 222cd64f..c722be8e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,81 +1,21 @@
name: tor_ffi_plugin
description: Tor FFI plugin for Dart and Flutter. Uses Arti (A Rust Tor Implementation) via FFI.
-version: 0.0.1
+version: 0.1.0
homepage: https://github.com/cypherstack/tor
environment:
- sdk: '>=3.5.3 <4.0.0'
- flutter: ">=3.24.3"
+ sdk: '>=3.13.0 <4.0.0'
+ flutter: ">=3.47.2"
dependencies:
flutter:
sdk: flutter
ffi: ^2.0.1
- plugin_platform_interface: ^2.0.2
+ hooks: ^2.0.2
+ native_toolchain_rust: ^1.0.6
dev_dependencies:
- ffigen: ^6.1.2
+ ffigen: ^21.0.0
flutter_test:
sdk: flutter
- flutter_lints: ^2.0.0
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter packages.
-flutter:
- # This section identifies this Flutter project as a plugin project.
- # The 'pluginClass' specifies the class (in Java, Kotlin, Swift, Objective-C, etc.)
- # which should be registered in the plugin registry. This is required for
- # using method channels.
- # The Android 'package' specifies package in which the registered class is.
- # This is required for using method channels on Android.
- # The 'ffiPlugin' specifies that native code should be built and bundled.
- # This is required for using `dart:ffi`.
- # All these are used by the tooling to maintain consistency when
- # adding or updating assets for this project.
- #
- # Please refer to README.md for a detailed explanation.
- plugin:
- platforms:
- android:
- ffiPlugin: true
- ios:
- ffiPlugin: true
- linux:
- ffiPlugin: true
- macos:
- ffiPlugin: true
- windows:
- ffiPlugin: true
-
- # To add assets to your plugin package, add an assets section, like this:
- # assets:
- # - images/a_dot_burr.jpeg
- # - images/a_dot_ham.jpeg
- #
- # For details regarding assets in packages, see
- # https://flutter.dev/assets-and-images/#from-packages
- #
- # An image asset can refer to one or more resolution-specific "variants", see
- # https://flutter.dev/assets-and-images/#resolution-aware
-
- # To add custom fonts to your plugin package, add a fonts section here,
- # in this "flutter" section. Each entry in this list should have a
- # "family" key with the font family name, and a "fonts" key with a
- # list giving the asset and other descriptors for the font. For
- # example:
- # fonts:
- # - family: Schyler
- # fonts:
- # - asset: fonts/Schyler-Regular.ttf
- # - asset: fonts/Schyler-Italic.ttf
- # style: italic
- # - family: Trajan Pro
- # fonts:
- # - asset: fonts/TrajanPro.ttf
- # - asset: fonts/TrajanPro_Bold.ttf
- # weight: 700
- #
- # For details regarding fonts in packages, see
- # https://flutter.dev/custom-fonts/#from-packages
+ flutter_lints: ^6.0.0
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 5d060f31..b53342ba 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -9,6 +9,7 @@ authors = ["Igor Cota "]
edition = "2021"
[lib]
+name = "tor_ffi_plugin"
crate-type = ["cdylib", "staticlib"]
[dependencies]
diff --git a/rust/build.rs b/rust/build.rs
index 6117a8de..817bbcf3 100644
--- a/rust/build.rs
+++ b/rust/build.rs
@@ -51,9 +51,10 @@ fn android_on_linux_check() {
let ndk_home = if let Some(value) = ndk_home_result.ok() {
value
} else {
- println!("ANDROID_NDK_HOME not set. Trying _CARGOKIT_NDK_LINK_CLANG");
- let path_to_parse_with_hack = env::var("_CARGOKIT_NDK_LINK_CLANG")
- .expect("_CARGOKIT_NDK_LINK_CLANG not set");
+ println!("ANDROID_NDK_HOME not set. Trying CC_x86_64_linux_android");
+ let path_to_parse_with_hack = env::var("CC_x86_64_linux_android")
+ .expect("CC_x86_64_linux_android not set")
+ .replace('\\', "/");
path_to_parse_with_hack
.split("/toolchains/")
@@ -75,4 +76,4 @@ fn android_on_linux_check() {
println!("cargo:rustc-link-lib=static=clang_rt.builtins-x86_64-android");
println!("cargo:rustc-link-search={}", link_search_path.display());
}
-}
\ No newline at end of file
+}
diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml
new file mode 100644
index 00000000..edb844f8
--- /dev/null
+++ b/rust/rust-toolchain.toml
@@ -0,0 +1,18 @@
+[toolchain]
+channel = "1.90.0"
+profile = "minimal"
+
+targets = [
+ "armv7-linux-androideabi",
+ "aarch64-linux-android",
+ "x86_64-linux-android",
+ "aarch64-apple-ios",
+ "aarch64-apple-ios-sim",
+ "x86_64-apple-ios",
+ "aarch64-pc-windows-msvc",
+ "x86_64-pc-windows-msvc",
+ "aarch64-unknown-linux-gnu",
+ "x86_64-unknown-linux-gnu",
+ "aarch64-apple-darwin",
+ "x86_64-apple-darwin",
+]
diff --git a/windows/.gitignore b/windows/.gitignore
deleted file mode 100644
index b3eb2be1..00000000
--- a/windows/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-flutter/
-
-# Visual Studio user-specific files.
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# Visual Studio build-related files.
-x64/
-x86/
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
deleted file mode 100644
index 78154760..00000000
--- a/windows/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# The Flutter tooling requires that developers have a version of Visual Studio
-# installed that includes CMake 3.14 or later. You should not increase this
-# version, as doing so will cause the plugin to fail to compile for some
-# customers of the plugin.
-cmake_minimum_required(VERSION 3.14)
-
-# Project-level configuration.
-set(PROJECT_NAME "tor_ffi_plugin")
-project(${PROJECT_NAME} LANGUAGES CXX)
-
-# Invoke the build for native code shared with the other target platforms.
-# This can be changed to accommodate different builds.
-include("../cargokit/cmake/cargokit.cmake")
-apply_cargokit(${PROJECT_NAME} ../rust tor_ffi_plugin "")
-
-# List of absolute paths to libraries that should be bundled with the plugin.
-# This list could contain prebuilt libraries, or libraries created by an
-# external build triggered from this build file.
-set(tor_ffi_plugin_bundled_libraries
- # Defined in ../src/CMakeLists.txt.
- # This can be changed to accommodate different builds.
- "${${PROJECT_NAME}_cargokit_lib}"
- PARENT_SCOPE
-)