diff --git a/CMakeLists.txt b/CMakeLists.txt index 49587b28..56ea8495 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,6 @@ -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_dart_utils") +cmake_minimum_required(VERSION 3.0) +project(angel_wings) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_dart_utils/cmake") find_package(Dart REQUIRED) +set(CMAKE_CXX_STANDARD 11) add_subdirectory(lib/src) diff --git a/analysis_options.yaml b/analysis_options.yaml index c230cee7..1009a0a1 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,4 +1,6 @@ include: package:pedantic/analysis_options.yaml analyzer: + exclude: + - cmake_dart_utils/example/* strong-mode: implicit-casts: false \ No newline at end of file diff --git a/example/main.dart b/example/main.dart index 7f951f99..e1c45216 100644 --- a/example/main.dart +++ b/example/main.dart @@ -4,7 +4,7 @@ import 'package:angel_static/angel_static.dart'; import 'package:angel_wings/angel_wings.dart'; import 'package:file/local.dart'; import 'package:logging/logging.dart'; -import 'pretty_log.dart'; +import 'package:pretty_logging/pretty_logging.dart'; main() async { var app = Angel(); diff --git a/example/pretty_log.dart b/example/pretty_log.dart deleted file mode 100644 index 2172fdd0..00000000 --- a/example/pretty_log.dart +++ /dev/null @@ -1,35 +0,0 @@ -import 'package:angel_http_exception/angel_http_exception.dart'; -import 'package:logging/logging.dart'; -import 'package:io/ansi.dart'; - -/// Prints the contents of a [LogRecord] with pretty colors. -void prettyLog(LogRecord record) { - var code = chooseLogColor(record.level); - - if (record.error == null) print(code.wrap(record.toString())); - - if (record.error != null) { - var err = record.error; - if (err is AngelHttpException && err.statusCode != 500) return; - print(code.wrap(record.toString() + '\n')); - print(code.wrap(err.toString())); - - if (record.stackTrace != null) { - print(code.wrap(record.stackTrace.toString())); - } - } -} - -/// Chooses a color based on the logger [level]. -AnsiCode chooseLogColor(Level level) { - if (level == Level.SHOUT) { - return backgroundRed; - } else if (level == Level.SEVERE) { - return red; - } else if (level == Level.WARNING) { - return yellow; - } else if (level == Level.INFO) { - return cyan; - } else if (level == Level.FINER || level == Level.FINEST) return lightGray; - return resetAll; -} diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt index a9ea0ce7..e0ab58dd 100644 --- a/lib/src/CMakeLists.txt +++ b/lib/src/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(http-parser) +include_directories("${CMAKE_CURRENT_LIST_DIR}") add_dart_native_extension(angel_wings http-parser/http_parser.c angel_wings.h angel_wings.cc diff --git a/lib/src/libangel_wings.build_native.yaml b/lib/src/libangel_wings.build_native.yaml deleted file mode 100644 index f260efe8..00000000 --- a/lib/src/libangel_wings.build_native.yaml +++ /dev/null @@ -1,6 +0,0 @@ -include: - - lib/src -sources: - - angel_wings|lib/src/angel_wings.cc - - angel_wings|lib/src/bind.cc - - angel_wings|lib/src/wings_socket.cc \ No newline at end of file diff --git a/lib/src/libangel_wings.dylib b/lib/src/libangel_wings.dylib new file mode 100755 index 00000000..328b4045 Binary files /dev/null and b/lib/src/libangel_wings.dylib differ diff --git a/libangel_wings.dylib b/libangel_wings.dylib new file mode 120000 index 00000000..eb7bc46e --- /dev/null +++ b/libangel_wings.dylib @@ -0,0 +1 @@ +/Users/thosakwe/Source/Angel/wings/lib/src/libangel_wings.dylib \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 1d825c84..c04e9505 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,10 +3,9 @@ environment: sdk: ">=2.0.0-dev <3.0.0" dependencies: angel_framework: ^2.0.0-alpha - build_native: ^0.0.11 mock_request: ^1.0.0 dev_dependencies: angel_static: ^2.0.0 - build_runner: ^1.0.0 io: ^0.3.2 - pedantic: ^1.0.0 \ No newline at end of file + pedantic: ^1.0.0 + pretty_logging: ^1.0.0 \ No newline at end of file