Merge pull request #71 from willowtreeapps/bump-version

Bump version
willowtreeapps · May 3, 2021 · e66afc3 · e66afc3
2 parents b4d62a0 + 27be9f3
commit e66afc3
Show file tree

Hide file tree

Showing 22 changed files with 87 additions and 121 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -30,7 +30,7 @@ jobs:
       - run:
           name: 📦 Install carthage
           command: |
-            brew outdated carthage || brew upgrade carthage
+            brew upgrade carthage
       - run:
           name: 🏗 Build Frameworks
           command: sh build.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.0] Apr 30, 2021
+### Fixed
+* Removed strong reference to attachedWindow (#60)
+* Fixed issue with Hyperion window attaching with UISceneDelegate (#67)
+* Updated Xcode Build version to 12.4.0 (#68)
+
 ## [1.1.0] Mar 15, 2018
 ### Added
 - Add accessibility identifiers to the main window

diff --git a/Core/HyperionCore.h b/Core/HyperionCore.h
@@ -28,15 +28,14 @@ FOUNDATION_EXPORT double HyperionCoreVersionNumber;
 FOUNDATION_EXPORT const unsigned char HyperionCoreVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <HyperionCore/PublicHeader.h>
-
-#import "HYPPlugin.h"
-#import "HYPPluginExtension.h"
-#import "HYPOverlayViewProvider.h"
-#import "HYPOverlayContainer.h"
-#import "HYPSnapshotInteractionView.h"
-#import "HYPPluginModule.h"
-#import "HYPPluginMenuItem.h"
-#import "HYPSnapshotPluginModule.h"
-#import "HYPPluginHelper.h"
-#import "HyperionManager.h"
-#import "HYPActivationGestureOptions.h"
+#import <HyperionCore/HYPPlugin.h>
+#import <HyperionCore/HYPPluginExtension.h>
+#import <HyperionCore/HYPOverlayViewProvider.h>
+#import <HyperionCore/HYPOverlayContainer.h>
+#import <HyperionCore/HYPSnapshotInteractionView.h>
+#import <HyperionCore/HYPPluginModule.h>
+#import <HyperionCore/HYPPluginMenuItem.h>
+#import <HyperionCore/HYPSnapshotPluginModule.h>
+#import <HyperionCore/HYPPluginHelper.h>
+#import <HyperionCore/HyperionManager.h>
+#import <HyperionCore/HYPActivationGestureOptions.h>
diff --git a/Core/Public/HyperionManager.h b/Core/Public/HyperionManager.h
@@ -20,7 +20,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "HYPActivationGestureOptions.h"
+#import <HyperionCore/HYPActivationGestureOptions.h>
 
 @protocol HYPPlugin;
 @protocol HYPPluginModule;

diff --git a/Core/Public/Plugin/HYPOverlayContainer.h b/Core/Public/Plugin/HYPOverlayContainer.h
@@ -21,8 +21,8 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "HYPOverlayViewProvider.h"
-#import "HYPViewSelectionDelegate.h"
+#import <HyperionCore/HYPOverlayViewProvider.h>
+#import <HyperionCore/HYPViewSelectionDelegate.h>
 
 @protocol HYPPluginModule;
 

diff --git a/Core/Public/Plugin/HYPPlugin.h b/Core/Public/Plugin/HYPPlugin.h
@@ -20,8 +20,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "HYPPluginModule.h"
-#import "HYPPluginExtension.h"
+#import <HyperionCore/HYPPluginModule.h>
+#import <HyperionCore/HYPPluginExtension.h>
 
 /**
  * The HYPPlugin protocol defines a mechanism for creating instances of plugins and providing

diff --git a/Core/Public/Plugin/HYPPluginExtension.h b/Core/Public/Plugin/HYPPluginExtension.h
@@ -21,7 +21,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "HYPOverlayContainer.h"
+#import <HyperionCore/HYPOverlayContainer.h>
 
 /**
  * The HYPPluginExtension protocol provides the plugin with context about windows and containers that are available to it.

diff --git a/Core/Public/Plugin/HYPPluginModule.h b/Core/Public/Plugin/HYPPluginModule.h
@@ -21,8 +21,8 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "HYPPluginExtension.h"
-#import "HYPPluginExtension.h"
+#import <HyperionCore/HYPPluginExtension.h>
+#import <HyperionCore/HYPPluginExtension.h>
 
 @protocol HYPPluginMenuItem;
 

diff --git a/Core/Public/Plugin/SnapShotPlugin/HYPSnapshotPluginModule.h b/Core/Public/Plugin/SnapShotPlugin/HYPSnapshotPluginModule.h
@@ -19,8 +19,8 @@
 //  THE SOFTWARE.
 //
 
-#import "HYPPluginModule.h"
-#import "HYPOverlayViewProvider.h"
+#import <HyperionCore/HYPPluginModule.h>
+#import <HyperionCore/HYPOverlayViewProvider.h>
 
 /**
  *  HYPSnapshotPluginModule is a base implementation of a Snapshot Plugin.

diff --git a/Example/HyperioniOS.xcodeproj/project.pbxproj b/Example/HyperioniOS.xcodeproj/project.pbxproj
@@ -242,7 +242,6 @@
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				C3D216763CD4FB2B89CBF5F5 /* [CP] Embed Pods Frameworks */,
-				B2CB353B75D96163C048D2E9 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -261,8 +260,6 @@
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
-				352BC718222B853381B0CA3B /* [CP] Embed Pods Frameworks */,
-				6A0A8E232E0EB464ECEF8AFD /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -335,36 +332,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		352BC718222B853381B0CA3B /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HyperioniOS_Tests/Pods-HyperioniOS_Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		6A0A8E232E0EB464ECEF8AFD /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HyperioniOS_Tests/Pods-HyperioniOS_Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		90C06F2D077DC201D090EFC3 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -380,22 +347,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		B2CB353B75D96163C048D2E9 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HyperioniOS_Example/Pods-HyperioniOS_Example-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		C3D216763CD4FB2B89CBF5F5 /* [CP] Embed Pods Frameworks */ = {
@@ -404,16 +356,16 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-HyperioniOS_Example/Pods-HyperioniOS_Example-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/HyperioniOS/HyperioniOS.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-HyperioniOS_Example/Pods-HyperioniOS_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/HyperioniOS/HyperionCore.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HyperioniOS.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HyperionCore.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HyperioniOS_Example/Pods-HyperioniOS_Example-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HyperioniOS_Example/Pods-HyperioniOS_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		D078D9CEB0B71EB39F7FAD27 /* [CP] Check Pods Manifest.lock */ = {
@@ -431,7 +383,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/Example/HyperioniOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/HyperioniOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/HyperionCore/AttributesInspector/Info.plist b/HyperionCore/AttributesInspector/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>