Merge pull request dart-backend#158 from dukefirehawk/feature/dart35

Feature/dart35

.github/workflows/dart.yml

@@ -120,14 +120,14 @@ jobs:
         run: dart analyze
 
       # Angel3 ORM Test
-      - id: angel3_orm_test_upgrade
-        name: angel3_orm_test; Upgrade depedencies
-        working-directory: packages/orm/angel_orm_test
-        run: dart pub upgrade
+      #- id: angel3_orm_test_upgrade
+      #  name: angel3_orm_test; Upgrade depedencies
+      #  working-directory: packages/orm/angel_orm_test
+      #  run: dart pub upgrade
 
-      - name: angel3_orm_test; Run orm code generator
-        working-directory: packages/orm/angel_orm_test
-        run: dart run build_runner build --delete-conflicting-outputs
+      #- name: angel3_orm_test; Run orm code generator
+      #  working-directory: packages/orm/angel_orm_test
+      #  run: dart run build_runner build --delete-conflicting-outputs
 
       #- name: angel3_orm_test; Verify formatting
       #  working-directory: packages/orm/angel_orm_test

CHANGELOG.md

@@ -7,7 +7,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Changes
 
-- Require Dart >= 3.5
+- Require Dart >= 3.6
 - Updated `lints` to 5.0.0
 - Updated dependencies to the latest release
 

TODO.md

@@ -1,5 +1,10 @@
 # Development Blueprint
 
+## TODO
+
+* Fix ORM generator issue
+* Fix MySQL ORM issue
+
 ## Short Term Goal
 
 * Update examples

doc/deployment/docker/README.md

@@ -1,65 +1,67 @@
-# Docker Services
+# Running as Container Services
 
-The required applications by the framework can be run using the docker compose files provided in this folder.
+The required applications by the framework can be run using the Docker compose files provided in this folder. Replace `nerdctl` with `docker` if using Docker.
 
-## PostreSQL
+## Installation
 
-### Starting the PostreSQL container
+### PostreSQL
+
+* Starting the PostreSQL container
 
     ```bash
-    docker compose -f docker-compose-pg.yml -p pg up -d
+    nerdctl compose -f docker-compose-pg.yml -p pg up -d
     ```
 
-### Stopping the PostreSQL container
+* Stopping the PostreSQL container
 
     ```bash
-    docker compose -f docker-compose-pg.yml -p pg stop
-    docker compose -f docker-compose-pg.yml -p pg down
+    nerdctl compose -f docker-compose-pg.yml -p pg stop
+    nerdctl compose -f docker-compose-pg.yml -p pg down
     ```
 
-### Checking the PostreSQL container log
+* Checking the PostreSQL container log
 
     ```bash
-    docker logs docker-pg-1 -f
+    nerdctl logs docker-pg-1 -f
     ```
 
-### Running psql
+* Running psql
 
     ```bash
-    docker exec -it <container id> /bin/bash
+    nerdctl exec -it <container id> /bin/bash
     psql --username postgres
     ```
 
-### Create PostgreSQL database, user and grant access
+* Create PostgreSQL database, user and grant access
 
     ```sql
     create database orm_test;
     create user test with encrypted password 'test123';
     grant all privileges on database orm_test to test;
     ```
 
-## MariaDB
+### MariaDB
 
-### Starting the MariaDB container
+* Starting the MariaDB container
 
     ```bash
-    docker compose -f docker-compose-mariadb.yml -p maria up -d
+    nerdctl compose -f docker-compose-mariadb.yml -p maria up -d
     ```
 
-### Stopping the MariaDB container
+* Stopping the MariaDB container
 
     ```bash
-    docker compose -f docker-compose-mariadb.yml -p maria stop
-    docker compose -f docker-compose-mariadb.yml -p maria down
+    nerdctl compose -f docker-compose-mariadb.yml -p maria stop
+    nerdctl compose -f docker-compose-mariadb.yml -p maria down
     ```
 
-### Checking the MariaDB container log
+* Checking the MariaDB container log
 
     ```bash
-    docker logs maria-mariadb-1 -f
+    nerdctl logs maria-mariadb-1 -f
     ```
 
-### Create MariaDB database, user and grant access
+* Create MariaDB database, user and grant access
 
     ```sql
     create database orm_test;
@@ -73,28 +75,28 @@ The required applications by the framework can be run using the docker compose f
     grant all privileges on orm_test.* to 'test'@'%';
     ```
 
-## MySQL
+### MySQL
 
-### Starting the MySQL container
+* Starting the MySQL container
 
     ```bash
-    docker compose -f docker-compose-mysql.yml -p mysql up -d
+    nerdctl compose -f docker-compose-mysql.yml -p mysql up -d
     ```
 
-### Stopping the MySQL container
+* Stopping the MySQL container
 
     ```bash
-    docker compose -f docker-compose-mysql.yml -p mysql stop
-    docker compose -f docker-compose-mysql.yml -p mysql down
+    nerdctl compose -f docker-compose-mysql.yml -p mysql stop
+    nerdctl compose -f docker-compose-mysql.yml -p mysql down
     ```
 
-### Checking the MySQL container log
+* Checking the MySQL container log
 
     ```bash
-    docker logs mysql-mysql-1 -f
+    nerdctl logs mysql-mysql-1 -f
     ```
 
-### Create MySQL database, user and grant access
+* Create MySQL database, user and grant access
 
     ```sql
     create database orm_test;
@@ -108,65 +110,65 @@ The required applications by the framework can be run using the docker compose f
     grant all privileges on orm_test.* to 'test'@'%';
     ```
 
-## MongoDB
+### MongoDB
 
-### Starting the MongoDB container
+* Starting the MongoDB container
 
     ```bash
-    docker compose -f docker-compose-mongo.yml -p mongo up -d
+    nerdctl compose -f docker-compose-mongo.yml -p mongo up -d
     ```
 
-### Stopping the MongoDB container
+* Stopping the MongoDB container
 
     ```bash
-    docker compose -f docker-compose-mongo.yml -p mongo stop
-    docker compose -f docker-compose-mongo.yml -p mongo down
+    nerdctl compose -f docker-compose-mongo.yml -p mongo stop
+    nerdctl compose -f docker-compose-mongo.yml -p mongo down
     ```
 
-### Checking the MongoDB container log
+* Checking the MongoDB container log
 
     ```bash
-    docker logs mongo-mongo-1 -f
+    nerdctl logs mongo-mongo-1 -f
     ```
 
-## rethinkDB
+### rethinkDB
 
-### Starting the rethinkDB container
+* Starting the rethinkDB container
 
     ```bash
-    docker compose -f docker-compose-rethinkdb.yml -p rethink up -d
+    nerdctl compose -f docker-compose-rethinkdb.yml -p rethink up -d
     ```
 
-### Stopping the rethinkDB container
+* Stopping the rethinkDB container
 
     ```bash
-    docker compose -f docker-compose-rethinkdb.yml -p rethink stop
-    docker compose -f docker-compose-rethinkdb.yml -p rethink down
+    nerdctl compose -f docker-compose-rethinkdb.yml -p rethink stop
+    nerdctl compose -f docker-compose-rethinkdb.yml -p rethink down
     ```
 
-### Checking the rethinkDB container log
+* Checking the rethinkDB container log
 
     ```bash
-    docker logs rethink-rethinkdb-1 -f
+    nerdctl logs rethink-rethinkdb-1 -f
     ```
 
-## Redis
+### Redis
 
-### Starting the Redis container
+* Starting the Redis container
 
     ```bash
-    docker compose -f docker-compose-redis.yml -p redis up -d
+    nerdctl compose -f docker-compose-redis.yml -p redis up -d
     ```
 
-### Stopping the Redis container
+* Stopping the Redis container
 
     ```bash
-    docker compose -f docker-compose-redis.yml -p redis stop
-    docker compose -f docker-compose-redis.yml -p redis down
+    nerdctl compose -f docker-compose-redis.yml -p redis stop
+    nerdctl compose -f docker-compose-redis.yml -p redis down
     ```
 
-### Checking the Redis container log
+* Checking the Redis container log
 
     ```bash
-    docker logs redis-redis-1 -f
+    nerdctl logs redis-redis-1 -f
     ```

doc/deployment/docker/docker-compose-mariadb.yml

@@ -6,14 +6,8 @@ services:
       - "3306:3306"
     environment:
       - MARIADB_ROOT_PASSWORD=Qwerty
-    volumes:
-      - "mariadb:/var/lib/mysql"
     networks:
       - appnet
 
-volumes:
-  mariadb:
-    driver: local
-
 networks:
   appnet:

doc/deployment/docker/docker-compose-mongo.yml

@@ -9,8 +9,6 @@ services:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: Qwerty
       MONGO_INITDB_DATABASE: local
-    volumes:
-      - "mongo:/data/db"
     networks:
       - appnet
 
@@ -27,11 +25,7 @@ services:
       ME_CONFIG_MONGODB_URL: mongodb://root:Qwerty@mongo:27017/
       ME_CONFIG_BASICAUTH: false
     networks:
-      - webnet
-
-volumes:
-  mongo:
-    driver: local
+      - appnet
 
 networks:
   appnet:

doc/deployment/docker/docker-compose-mysql.yml

@@ -6,14 +6,17 @@ services:
       - "3306:3306"
     environment:
       - MYSQL_ROOT_PASSWORD=Qwerty
-    volumes:
-      - "mysql:/var/lib/mysql"
+      - MYSQL_DATABASE=orm_test
+      - MYSQL_USER=test
+      - MYSQL_PASSWORD=Test123
+#    volumes:
+#      - C://storage/mysql:/var/lib/mysql:ro
     networks:
       - appnet
 
-volumes:
-  mysql:
-    driver: local
+#volumes:
+#  mysql-data-external:
+#    driver: local
 
 networks:
   appnet:

doc/deployment/docker/docker-compose-pg.yml

@@ -7,8 +7,6 @@ services:
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
-    volumes:
-      - "db:/var/lib/postgresql/data"
     networks:
       - appnet
 
@@ -23,9 +21,5 @@ services:
     networks:
       - appnet
 
-volumes:
-  db:
-    driver: local
-
 networks:
   appnet:

doc/deployment/docker/docker-compose-redis.yml

@@ -7,14 +7,8 @@ services:
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
-    volumes:
-      - "redis:/data"
     networks:
       - appnet
 
-volumes:
-  redis:
-    driver: local
-
 networks:
   appnet:

doc/deployment/docker/docker-compose-rethinkdb.yml

@@ -6,14 +6,8 @@ services:
       - "8080:8080"
       - "28015:28015"
       - "29015:29015"
-    volumes:
-      - "rethinkdb:/data"
     networks:
       - appnet
 
-volumes:
-  rethinkdb:
-    driver: local
-
 networks:
   appnet:

packages/auth/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 8.3.0
 
-* Require Dart >= 3.5
+* Require Dart >= 3.6
 * Updated `lints` to 5.0.0
 * Updated dependencies to the latest release
 

packages/auth/lib/angel3_auth.dart

@@ -1,4 +1,4 @@
-library angel3_auth;
+library;
 
 export 'src/middleware/require_auth.dart';
 export 'src/strategies/strategies.dart';

packages/auth/lib/auth_token.dart

@@ -1,4 +1,4 @@
 /// Stand-alone JWT library.
-library angel3_auth.auth_token;
+library;
 
 export 'src/auth_token.dart';

packages/auth/pubspec.yaml

@@ -4,7 +4,7 @@ version: 8.3.0
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dart-backend/angel/tree/master/packages/auth
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: '>=3.6.0 <4.0.0'
 dependencies:
   angel3_framework: ^8.4.0
   charcode: ^1.3.0