From 6a351442d1728a9803c483b3b8a6e80d0dd82ddc Mon Sep 17 00:00:00 2001
From: Josh Yaganeh <319444+jyaganeh@users.noreply.github.com>
Date: Thu, 19 Dec 2024 11:12:01 -0800
Subject: [PATCH] Release 18.6.0 (#1609)

---
 CHANGELOG.md | 12 ++++++++++++
 build.gradle |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2ae87a25..fd113ce55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 [Migration Guides](https://github.com/urbanairship/android-library/tree/main/documentation/migration)
 
+## Version 18.6.0 December 19, 2024
+Minor release that updates how Feature Flags are resolved, improves Scene rendering on Android 15,
+and fixes potential exceptions related to PermissionsManager and PermissionDelegates.
+ 
+### Changes
+- Added `resultCache` to `FeatureFlagManager`. This cache is managed by the app and can be optionally used when resolving a flag as a fallback if the flag fails to resolve or if
+  the flag rule set does not exist.
+- FeatureFlag resolution will now resolve a rule set even if the listing is out of date.
+- Improved Scene rendering on Android 15, for scenes that do not ignore safe areas.
+- Prevent potential "Already resumed" exceptions that could be caused by a permission delegate calling the callback multiple times.
+- Improved constraint version matching
+
 ## Version 18.5.0 December 5, 2024
 Minor release that includes various improvements to scenes, data management and some minor bug fixes.
 
diff --git a/build.gradle b/build.gradle
index 8c3584fe7..03dba5583 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         // Airship Version - major.minor.patch
-        airshipVersion = '18.5.0'
+        airshipVersion = '18.6.0'
 
         // Airship Version Qualifier beta, release, etc...
         // airshipVersionQualifier = "alpha"