Merge pull request #111 from fleetbase/dev-main

v0.1.6 Release

.gitmodules

@@ -5,37 +5,37 @@
 [submodule "packages/core-api"]
 	path = packages/core-api
 	url = git@github.com:fleetbase/core-api.git
-	branch = dev-main
+	branch = main
 [submodule "packages/fleetops-api"]
 	path = packages/fleetops-api
 	url = git@github.com:fleetbase/fleetops-api.git
-	branch = dev-main
+	branch = main
 [submodule "packages/ember-core"]
 	path = packages/ember-core
 	url = git@github.com:fleetbase/ember-core.git
-	branch = dev-main
+	branch = main
 [submodule "packages/ember-ui"]
 	path = packages/ember-ui
 	url = git@github.com:fleetbase/ember-ui.git
-	branch = dev-main
+	branch = main
 [submodule "packages/storefront-engine"]
 	path = packages/storefront-engine
 	url = git@github.com:fleetbase/storefront-engine.git
-	branch = dev-main
+	branch = main
 [submodule "packages/iam-engine"]
 	path = packages/iam-engine
 	url = git@github.com:fleetbase/iam-engine.git
 [submodule "packages/dev-engine"]
 	path = packages/dev-engine
 	url = git@github.com:fleetbase/dev-engine.git
-	branch = dev-main
+	branch = main
 [submodule "packages/fleetbase-extensions-indexer"]
 	path = packages/fleetbase-extensions-indexer
 	url = git@github.com:fleetbase/fleetbase-extensions-indexer.git
 [submodule "packages/fleetops-engine"]
 	path = packages/fleetops-engine
 	url = git@github.com:fleetbase/fleetops-engine.git
-	branch = dev-main
+	branch = main
 [submodule "docs/guides"]
 	path = docs/guides
 	url = git@github.com:fleetbase/guides.git
@@ -45,20 +45,20 @@
 [submodule "packages/storefront-api"]
 	path = packages/storefront-api
 	url = git@github.com:fleetbase/storefront-api.git
-	branch = dev-main
+	branch = main
 [submodule "packages/fleetops-data"]
 	path = packages/fleetops-data
 	url = git@github.com:fleetbase/fleetops-data.git
-	branch = dev-main
+	branch = main
 [submodule "socket"]
 	path = socket
 	url = git@github.com:fleetbase/socket.git
-	branch = dev-main
+	branch = main
 [submodule "packages/pallet-api"]
 	path = packages/pallet-api
 	url = git@github.com:fleetbase/pallet-api.git
-	branch = dev-main
+	branch = main
 [submodule "packages/pallet-engine"]
 	path = packages/pallet-engine
 	url = git@github.com:fleetbase/pallet-engine.git
-	branch = dev-main
+	branch = main

api/composer.dev.json

@@ -6,10 +6,10 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "fleetbase/core-api": "^1.1.4-alpha",
-        "fleetbase/fleetops-api": "^1.0.7-alpha",
-        "fleetbase/storefront-api": "^1.0.6-alpha",
-        "fleetbase/billing-api": "^0.0.2",
+        "fleetbase/core-api": "^1.2.4",
+        "fleetbase/fleetops-api": "^1.1.2",
+        "fleetbase/storefront-api": "^1.1.0",
+        "fleetbase/pallet-api": "^0.0.1",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^8.75",
@@ -46,7 +46,7 @@
         },
         {
             "type": "path",
-            "url": "../packages/billing-api"
+            "url": "../packages/pallet-api"
         }
     ],
     "autoload": {

api/composer.json

@@ -9,8 +9,8 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "fleetbase/core-api": "^1.2.3",
-        "fleetbase/fleetops-api": "^1.1.1",
+        "fleetbase/core-api": "^1.2.4",
+        "fleetbase/fleetops-api": "^1.1.2",
         "fleetbase/storefront-api": "^1.1.0",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",