Merge branch 'develop'

tastyigniter · Feb 23, 2022 · 3eb06a6 · 3eb06a6
2 parents 6e72878 + b3938e9
commit 3eb06a6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/admin/composer.json b/app/admin/composer.json
@@ -20,7 +20,6 @@
     }
   ],
   "require": {
-    "php": ">=7.4",
     "composer/installers": "~2.0"
   },
   "autoload": {
@@ -30,7 +29,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0-dev"
+      "dev-master": "3.x-dev"
     }
   },
   "minimum-stability": "dev"

diff --git a/app/main/composer.json b/app/main/composer.json
@@ -20,7 +20,6 @@
     }
   ],
   "require": {
-    "php": ">=7.4",
     "composer/installers": "~2.0"
   },
   "autoload": {
@@ -30,7 +29,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0-dev"
+      "dev-master": "3.x-dev"
     }
   },
   "minimum-stability": "dev"

diff --git a/app/system/composer.json b/app/system/composer.json
@@ -20,7 +20,6 @@
     }
   ],
   "require": {
-    "php": ">=7.4",
     "composer/installers": "~2.0"
   },
   "autoload": {
@@ -30,7 +29,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0-dev"
+      "dev-master": "3.x-dev"
     }
   },
   "minimum-stability": "dev"

diff --git a/composer.json b/composer.json
@@ -26,6 +26,9 @@
   "require": {
     "php": ">=7.4",
     "tastyigniter/flame": "~1.2",
+    "tastyigniter/ti-module-system": "~3.0",
+    "tastyigniter/ti-module-admin": "~3.0",
+    "tastyigniter/ti-module-main": "~3.0",
     "laravel/framework": "~8.0"
   },
   "require-dev": {