From 81d8d5e1ae3d36f8addaaf6c4a832abb88601d7d Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 15 Oct 2021 17:24:07 -0700
Subject: [PATCH] Combine package requirements into single file

---
 .github/workflows/publish-installers.yml |  4 ++--
 package/requirements-macos.txt           |  7 -------
 package/requirements-package.txt         | 10 ++++++++++
 package/requirements-windows.txt         |  6 ------
 4 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 package/requirements-macos.txt
 create mode 100644 package/requirements-package.txt
 delete mode 100644 package/requirements-windows.txt

diff --git a/.github/workflows/publish-installers.yml b/.github/workflows/publish-installers.yml
index 11ea21e8..e3ce7c74 100644
--- a/.github/workflows/publish-installers.yml
+++ b/.github/workflows/publish-installers.yml
@@ -59,13 +59,13 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~\AppData\Local\pip\Cache
-          key: ${{ runner.os }}-pip-${{ hashFiles(format('package/requirements-{0}.txt', matrix.os)) }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('package/requirements-package.txt') }}
           restore-keys: ${{ runner.os }}-pip-
 
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r package/requirements-${{ matrix.os }}.txt
+          pip install -r package/requirements-package.txt
 
       - name: Build Package
         run: |
diff --git a/package/requirements-macos.txt b/package/requirements-macos.txt
deleted file mode 100644
index 197497c0..00000000
--- a/package/requirements-macos.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-apscheduler==3.8.0
-importlib-resources==5.2.2
-pyinstaller==4.5.1
-pyopenssl==21.0.0
-pycryptodomex==3.11.0
-pyobjc-framework-Cocoa==7.3
-pyobjc-core==7.3
diff --git a/package/requirements-package.txt b/package/requirements-package.txt
new file mode 100644
index 00000000..2c7d8619
--- /dev/null
+++ b/package/requirements-package.txt
@@ -0,0 +1,10 @@
+apscheduler==3.8.0
+importlib-resources==5.2.2
+pyinstaller==4.5.1
+pyopenssl==21.0.0
+pycryptodomex==3.11.0
+
+pyobjc-framework-Cocoa==7.3; platform_system == "Darwin"
+pyobjc-core==7.3; platform_system == "Darwin"
+
+pywin32==302; platform_system == "Windows"
diff --git a/package/requirements-windows.txt b/package/requirements-windows.txt
deleted file mode 100644
index 246cde18..00000000
--- a/package/requirements-windows.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-apscheduler==3.8.0
-importlib-resources==5.2.2
-pyinstaller==4.5.1
-pyopenssl==21.0.0
-pycryptodomex==3.11.0
-pywin32==302