deps

Dockerfile.release

@@ -86,7 +86,7 @@ COPY --link priv/localisation/ priv/localisation/
 
 # copy these before compiling so we don't override things like flavour_assets/components.css (generated by Surface compiler)
 COPY --link data/current_flavour/config/flavour_assets data/current_flavour/config/flavour_assets
-RUN ls -la data/current_flavour/config/flavour_assets
+RUN ls -la data/current_flavour/config/flavour_assets && ls -la data/current_flavour/config/flavour_assets/hooks
 
 # Compile remaining deps
 # RUN MIX_ENV=prod mix deps.compile # disabled because doesn't properly compile Surface hooks/CSS

flavours/classic/config/deps.flavour.hex

@@ -6,6 +6,7 @@ plug_crypto = "~> 2.0" # newer crypto for plug/phoenix
 sourceror = "~> 1.0.0"
 telemetry = "~> 1.2.0"
 httpoison = "~> 2.1"
+poison = "~> 5.0" # not our preferred one, but some libs use it
 opentelemetry_process_propagator = "~> 0.2"
 
 # Data Schemas

flavours/community/config/deps.flavour.git

@@ -7,6 +7,7 @@ bonfire_files = "https://github.com/bonfire-networks/bonfire_files"
 ## Flavour:COOPERATION"
 
 bonfire_api_graphql = "https://github.com/bonfire-networks/bonfire_api_graphql"
+absinthe_client = "https://github.com/bonfire-networks/absinthe_client"
 
 bonfire_ui_topics = "https://github.com/bonfire-networks/bonfire_ui_topics"
 

flavours/cooperation/config/deps.flavour.git

@@ -1,7 +1,6 @@
 bonfire = "https://github.com/bonfire-networks/bonfire_spark"
 
 ## Flavour:COOPERATION
-bonfire_api_graphql = "https://github.com/bonfire-networks/bonfire_api_graphql"
 bonfire_ui_topics = "https://github.com/bonfire-networks/bonfire_ui_topics"
 bonfire_ui_groups = "https://github.com/bonfire-networks/bonfire_ui_groups"
 bonfire_pages = "https://github.com/bonfire-networks/bonfire_pages"
@@ -14,13 +13,15 @@ bonfire_ui_kanban = "https://github.com/bonfire-networks/bonfire_ui_kanban"
 bonfire_ui_coordination = "https://github.com/bonfire-networks/bonfire_ui_coordination"
 bonfire_breadpub = "https://github.com/bonfire-networks/bonfire_breadpub"
 
+bonfire_api_graphql = "https://github.com/bonfire-networks/bonfire_api_graphql"
+absinthe_client = "https://github.com/bonfire-networks/absinthe_client"
+
 # bonfire_ui_reflow = "https://github.com/bonfire-networks/bonfire_ui_reflow"
 
 # bonfire_recyclapp = "https://github.com/bonfire-networks/bonfire_recyclapp"
 
 # bonfire_taxonomy_seeder = "https://github.com/bonfire-networks/bonfire_taxonomy_seeder"
 bonfire_valueflows_observe = "https://github.com/bonfire-networks/bonfire_valueflows_observe"
-absinthe_client = "https://github.com/bonfire-networks/absinthe_client"
 towel = "https://github.com/CyrusOfEden/towel"
 
 ## Flavour:UPCYCLE

flavours/cooperation/config/deps.flavour.hex

@@ -1,3 +1,14 @@
+# these are copied from deps.hex and needed here for CI (workaround for errors like Because "your app" depends on "telemetry empty" which doesn't match any versions, version solving failed)
+floki = "~> 0.36"
+phoenix = "~> 1.7.0" 
+phoenix_live_view = "~> 0.20.9" # usually should let surface decide the version
+plug_crypto = "~> 2.0" # newer crypto for plug/phoenix
+sourceror = "~> 1.0.0"
+telemetry = "~> 1.2.0"
+httpoison = "~> 2.1"
+poison = "~> 5.0" # not our preferred one, but some libs use it
+opentelemetry_process_propagator = "~> 0.2"
+
 
 # API 
 absinthe = "~> 1.7.6"

mix.exs

@@ -154,7 +154,7 @@ defmodule Bonfire.Umbrella.MixProject do
   # TODO: put these in ENV or an external writeable config file similar to deps.*
   @config [
     # note that the flavour will automatically be added where the dash appears
-    version: "0.9.10-beta.47",
+    version: "0.9.10-beta.48",
     elixir: ">= #{System.get_env("ELIXIR_VERSION", "1.13.4")}",
     flavour: @flavour,
     default_flavour: @default_flavour,