From 2aa24e12283fce53ca5abe274ee8434d17fac853 Mon Sep 17 00:00:00 2001
From: Zachary Ferguson <zfergus@nyu.edu>
Date: Fri, 18 Aug 2023 18:10:48 -0700
Subject: [PATCH] Update to v1.1.1

---
 CMakeLists.txt                    | 3 +--
 docs/CHANGELOG.md                 | 7 +++++++
 docs/source/_static/versions.json | 7 +++++--
 docs/source/conf.py               | 2 +-
 docs/source/cpp.rst               | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c42d2b304..61d35bc53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,6 @@ if(IPC_TOOLKIT_WITH_CCACHE AND CCACHE_PROGRAM)
   endforeach()
 endif()
 
-
 ################################################################################
 # CMake Policies
 ################################################################################
@@ -60,7 +59,7 @@ endif()
 project(IPCToolkit
         DESCRIPTION "A set of reusable functions to integrate IPC into an existing simulation."
         LANGUAGES CXX
-        VERSION "1.1.0")
+        VERSION "1.1.1")
 
 option(IPC_TOOLKIT_BUILD_TESTS                "Build unit-tests"  ${IPC_TOOLKIT_TOPLEVEL_PROJECT})
 option(IPC_TOOLKIT_BUILD_PYTHON               "Build Python bindings"                         OFF)
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 209ef8ba2..ca61ef85c 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## v1.1.1 (Aug 18, 2023)
+
+* Logo by @zfergus in [#52](https://github.com/ipc-sim/ipc-toolkit/pull/52)
+* Fix vertex-vertex `==` and `<` functions to be order independent
+    * This allows vertex-vertex constraints merge correctly
+* Update Tight Inclusion CCD
+
 ## v1.1.0 (Jul 25, 2023)
 
 Large refactoring to make the code more object-oriented rather than passing objects to functions. Other changes include the friction potential now being a function of velocity, bug fixes, and a new tutorial.
diff --git a/docs/source/_static/versions.json b/docs/source/_static/versions.json
index 75797fef2..181965576 100644
--- a/docs/source/_static/versions.json
+++ b/docs/source/_static/versions.json
@@ -3,9 +3,12 @@
     "title": "main",
     "aliases": ["latest", "head"]
 }, {
-    "version": "https://ipc-sim.github.io/ipc-toolkit/v1.1.0",
-    "title": "v1.1.0",
+    "version": "https://ipc-sim.github.io/ipc-toolkit/v1.1.1",
+    "title": "v1.1.1",
     "aliases": ["stable"]
+}, {
+    "version": "https://ipc-sim.github.io/ipc-toolkit/v1.1.0",
+    "title": "v1.1.0"
 }, {
     "version": "https://ipc-sim.github.io/ipc-toolkit/v1.0.0",
     "title": "v1.0.0"
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 011abbe19..4dc96ed00 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -23,7 +23,7 @@
 project = "IPC Toolkit"
 copyright = '2020-2023, IPC-Sim Organization; MIT License'
 author = "Zachary Ferguson"
-version = "1.1.0"
+version = "1.1.1"
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/docs/source/cpp.rst b/docs/source/cpp.rst
index db9b354aa..2dbbb7040 100644
--- a/docs/source/cpp.rst
+++ b/docs/source/cpp.rst
@@ -45,7 +45,7 @@ where :cmake:`IPC_TOOLKIT_GIT_TAG` is set to the version of the toolkit you want
 where :cmake:`PROJECT_NAME` is the name of your library/binary.
 
 .. tip::
-   If your :cmake:`IPC_TOOLKIT_GIT_TAG` is a tag (e.g. ``v1.1.0``), then you can use the :cmake:`FetchContent_Declare` argument :cmake:`GIT_SHALLOW TRUE` to download only a single commit. Otherwise, you should use the default :cmake:`GIT_SHALLOW FALSE`.
+   If your :cmake:`IPC_TOOLKIT_GIT_TAG` is a tag (e.g. ``v1.1.1``), then you can use the :cmake:`FetchContent_Declare` argument :cmake:`GIT_SHALLOW TRUE` to download only a single commit. Otherwise, you should use the default :cmake:`GIT_SHALLOW FALSE`.
 
 Dependencies
 ------------