From e4d78b09747ecd3700f423bce9e6b8f5db347b24 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Fri, 23 Jun 2023 08:41:20 -0400
Subject: [PATCH] Version 0.18.0

---
 Cargo.lock                           | 22 +++++++++++-----------
 Cargo.toml                           | 22 +++++++++++-----------
 docker/docker-compose.yml            |  4 ++--
 docker/federation/docker-compose.yml |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e29f8998..9590e8f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2518,7 +2518,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lemmy_api"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -2541,7 +2541,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_api_common"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "actix-rt",
  "actix-web",
@@ -2570,7 +2570,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_api_crud"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "activitypub_federation",
  "actix-web",
@@ -2589,7 +2589,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_apub"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "activitypub_federation",
  "actix-rt",
@@ -2627,7 +2627,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_schema"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "activitypub_federation",
  "async-trait",
@@ -2659,7 +2659,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_views"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "diesel",
  "diesel-async",
@@ -2676,7 +2676,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_views_actor"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "diesel",
  "diesel-async",
@@ -2689,7 +2689,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_views_moderator"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "diesel",
  "diesel-async",
@@ -2701,7 +2701,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_routes"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "activitypub_federation",
  "actix-web",
@@ -2726,7 +2726,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_server"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "activitypub_federation",
  "actix-cors",
@@ -2763,7 +2763,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_utils"
-version = "0.18.0-rc.8"
+version = "0.18.0"
 dependencies = [
  "actix-web",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index a8625257..430deb08 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.18.0-rc.8"
+version = "0.18.0"
 edition = "2021"
 description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
@@ -49,16 +49,16 @@ members = [
 ]
 
 [workspace.dependencies]
-lemmy_api = { version = "=0.18.0-rc.8", path = "./crates/api" }
-lemmy_api_crud = { version = "=0.18.0-rc.8", path = "./crates/api_crud" }
-lemmy_apub = { version = "=0.18.0-rc.8", path = "./crates/apub" }
-lemmy_utils = { version = "=0.18.0-rc.8", path = "./crates/utils" }
-lemmy_db_schema = { version = "=0.18.0-rc.8", path = "./crates/db_schema" }
-lemmy_api_common = { version = "=0.18.0-rc.8", path = "./crates/api_common" }
-lemmy_routes = { version = "=0.18.0-rc.8", path = "./crates/routes" }
-lemmy_db_views = { version = "=0.18.0-rc.8", path = "./crates/db_views" }
-lemmy_db_views_actor = { version = "=0.18.0-rc.8", path = "./crates/db_views_actor" }
-lemmy_db_views_moderator = { version = "=0.18.0-rc.8", path = "./crates/db_views_moderator" }
+lemmy_api = { version = "=0.18.0", path = "./crates/api" }
+lemmy_api_crud = { version = "=0.18.0", path = "./crates/api_crud" }
+lemmy_apub = { version = "=0.18.0", path = "./crates/apub" }
+lemmy_utils = { version = "=0.18.0", path = "./crates/utils" }
+lemmy_db_schema = { version = "=0.18.0", path = "./crates/db_schema" }
+lemmy_api_common = { version = "=0.18.0", path = "./crates/api_common" }
+lemmy_routes = { version = "=0.18.0", path = "./crates/routes" }
+lemmy_db_views = { version = "=0.18.0", path = "./crates/db_views" }
+lemmy_db_views_actor = { version = "=0.18.0", path = "./crates/db_views_actor" }
+lemmy_db_views_moderator = { version = "=0.18.0", path = "./crates/db_views_moderator" }
 activitypub_federation = { version = "0.4.4", default-features = false, features = ["actix-web"] }
 diesel = "2.1.0"
 diesel_migrations = "2.1.0"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 2846f547..2033ee8c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -35,7 +35,7 @@ services:
     logging: *default-logging
 
   lemmy:
-    # image: dessalines/lemmy:dev
+    # image: dessalines/lemmy:0.18.0
     # use this to build your local lemmy server image for development
     # run docker compose up --build
     build:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   lemmy-ui:
-    image: dessalines/lemmy-ui:0.17.1
+    image: dessalines/lemmy-ui:0.18.0
     # use this to build your local lemmy ui image for development
     # run docker compose up --build
     # assuming lemmy-ui is cloned besides lemmy directory
diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml
index 569f264c..b3464bac 100644
--- a/docker/federation/docker-compose.yml
+++ b/docker/federation/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 x-ui-default: &ui-default
   init: true
-  image: dessalines/lemmy-ui:0.17.3
+  image: dessalines/lemmy-ui:0.18.0
   # assuming lemmy-ui is cloned besides lemmy directory
   # build:
   #     context: ../../../lemmy-ui
-- 
2.44.1