Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Merge new structure and dependencies #80

Merged
merged 175 commits into from
Oct 8, 2024
Merged

✨ Merge new structure and dependencies #80

merged 175 commits into from
Oct 8, 2024

Conversation

AlexV525
Copy link
Contributor

No description provided.

Resolves #76

(cherry picked from commit f50971d)
# Conflicts:
#	Cargo.toml
#	agent_dart_workspace.iml
#	analysis_options.yaml
#	android/build.gradle
#	example/android/gradle/wrapper/gradle-wrapper.properties
#	example/ios/Podfile.lock
#	example/linux/flutter/generated_plugin_registrant.cc
#	example/macos/Flutter/GeneratedPluginRegistrant.swift
#	example/macos/Podfile.lock
#	ios/Classes/bridge_generated.h
#	ios/agent_dart.podspec
#	lib/agent/crypto/keystore/key_store.dart
#	lib/bridge/ffi/ffi_bridge.dart
#	lib/bridge/ffi/ffi_helper.dart
#	lib/protobuf/ic_base_types/pb/v1/types.pbenum.dart
#	lib/protobuf/ic_ledger/pb/v1/types.pbenum.dart
#	lib/wallet/pem.dart
#	linux/CMakeLists.txt
#	macos/Classes/bridge_generated.h
#	macos/Frameworks/agent_dart-v1.0.0.zip
#	macos/agent_dart.podspec
#	packages/agent_dart/android/.gitignore
#	packages/agent_dart/android/CMakeLists.txt
#	packages/agent_dart/android/agent_dart-v1.0.0.tar.gz
#	packages/agent_dart/example/android/app/build.gradle
#	packages/agent_dart/example/android/build.gradle
#	packages/agent_dart/example/android/gradle/wrapper/gradle-wrapper.properties
#	packages/agent_dart/example/ios/Podfile
#	packages/agent_dart/example/linux/flutter/generated_plugins.cmake
#	packages/agent_dart/example/macos/Podfile
#	packages/agent_dart/example/pubspec.yaml
#	packages/agent_dart/example/windows/.gitignore
#	packages/agent_dart/example/windows/agent_dart-v1.0.0.tar.gz
#	packages/agent_dart/ios/.gitignore
#	packages/agent_dart_base/lib/agent/actor.dart
#	packages/agent_dart_base/lib/archiver/encoder.dart
#	packages/agent_dart_base/lib/protobuf/ic_base_types/pb/v1/types.pb.dart
#	packages/agent_dart_base/lib/protobuf/ic_base_types/pb/v1/types.pbjson.dart
#	packages/agent_dart_base/lib/protobuf/ic_base_types/pb/v1/types.pbserver.dart
#	packages/agent_dart_base/lib/protobuf/ic_ledger/pb/v1/types.pb.dart
#	packages/agent_dart_base/lib/protobuf/ic_ledger/pb/v1/types.pbjson.dart
#	packages/agent_dart_base/lib/protobuf/ic_ledger/pb/v1/types.pbserver.dart
#	packages/agent_dart_ffi/native/agent_dart/Cargo.toml
#	packages/agent_dart_ffi/native/agent_dart/src/bls/bls12381/mpin.rs
#	packages/agent_dart_ffi/native/agent_dart/src/bls/hmac.rs
#	packages/agent_dart_ffi/native/agent_dart/src/lib.rs
#	pubspec.yaml
#	rust/.gitignore
#	rust/agent_dart/src/bridge_generated.rs
#	rust/headers/bridge_generated.h
#	scripts/build-android.bat
#	scripts/build-windows.bat
#	scripts/build_android.sh
#	scripts/build_ios.sh
#	scripts/build_protobuf.sh
#	windows/CMakeLists.txt
#	windows/include/agent_dart/agent_dart_plugin.h
# Conflicts:
#	lib/principal/principal.dart
#	pubspec.yaml
#	test/principal/principal.dart
@AlexV525 AlexV525 marked this pull request as ready for review October 8, 2024 03:52
@AlexV525 AlexV525 requested a review from a team as a code owner October 8, 2024 03:52
@AlexV525 AlexV525 merged commit 1f4e282 into main Oct 8, 2024
1 check passed
@AlexV525 AlexV525 deleted the bdk_lite branch October 8, 2024 12:07
AlexV525 added a commit that referenced this pull request Oct 15, 2024
AlexV525 added a commit that referenced this pull request Oct 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants