Merge branch 'work/9.0.2' of https://github.com/SwiftKickMobile/Swift…

…Messages into work/master-fix

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 9.0.2
+
+### Fixes
+
+* Fix app extension compile error when using CocoaPods.
+
+## 9.0.1
+
+### Fixes
+
+* #455 #458 Restore key window after message is interacted with. When a message becomes the key window, such as if the user interacts with the message, iOS does not automatically restore the previous key window when the message is dismissed. SwiftMessages has some logic in `WindowViewController` to restore the key window. This change makes that logic more robust.
+
 ## 9.0.0
 
 ### Features

SwiftMessages.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name             = 'SwiftMessages'
-    spec.version          = '9.0.0'
+    spec.version          = '9.0.2'
     spec.license          = { :type => 'MIT' }
     spec.homepage         = 'https://github.com/SwiftKickMobile/SwiftMessages'
     spec.authors          = { 'Timothy Moose' => '[email protected]' }

SwiftMessages/UIWindow+Extensions.swift

@@ -9,6 +9,7 @@
 import UIKit
 
 extension UIWindow {
+    #if !SWIFTMESSAGES_APP_EXTENSIONS
     static var keyWindow: UIWindow? {
         if #available(iOS 13.0, *) {
             return UIApplication.shared.connectedScenes
@@ -21,4 +22,5 @@ extension UIWindow {
             return UIApplication.shared.keyWindow
         }
     }
+    #endif
 }

iMessageDemo/Podfile

@@ -0,0 +1,19 @@
+# Uncomment the next line to define a global platform for your project
+# platform :ios, '9.0'
+
+target 'iMessageDemo' do
+  # Comment the next line if you don't want to use dynamic frameworks
+  use_frameworks!
+
+  # Pods for iMessageDemo
+
+end
+
+target 'iMessageExtensionDemo' do
+  # Comment the next line if you don't want to use dynamic frameworks
+  use_frameworks!
+
+  # Pods for iMessageExtensionDemo
+  pod 'SwiftMessages/AppExtension', :path => "../"
+
+end

iMessageDemo/Podfile.lock

@@ -0,0 +1,16 @@
+PODS:
+  - SwiftMessages/AppExtension (9.0.1)
+
+DEPENDENCIES:
+  - SwiftMessages/AppExtension (from `../`)
+
+EXTERNAL SOURCES:
+  SwiftMessages:
+    :path: "../"
+
+SPEC CHECKSUMS:
+  SwiftMessages: b71f53eb919887c0273bf43cbc002bd4f0cfb3d6
+
+PODFILE CHECKSUM: 4cfafdad7d8903d0f4cfadbe05660bcdeff7c9e6
+
+COCOAPODS: 1.10.0