Add Missing Devices (#15)

* Update device datasets

* Update dependencies

* Update Xcode project

* Update gyb script

* Generate source files

* Update readme

* Bump version

* Remove generated commented device entries

* Update GitHub workflow

.github/workflows/build.yml

@@ -14,11 +14,5 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Update Homebrew
-      run: brew update
-    - name: Install Homebrew Dependencies
-      run: brew bundle
-    - name: Install enum
-      run: pip install --upgrade pip enum34
     - name: xcodebuild
       run: xcodebuild -project Orchard.xcodeproj -target ${{ matrix.target }} -configuration Debug -sdk ${{ matrix.sdk }}

.ruby-version

@@ -1 +1 @@
-3.0.2
+3.1.2

.version

@@ -1 +1 @@
-1.11.0
+1.12.0

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Orchard Change Log
 
+## [1.12.0](https://github.com/Detroit-Labs/Orchard/releases/tag/1.12.0)
+**Released:** 2022-05-23
+
+### Added
+- Support for iPhone SE (3rd Generation)
+- Support for iPad Air (5th Generation)
+- Support for Apple TV 4K (2nd Generation)
+
 ## [1.11.0](https://github.com/Detroit-Labs/Orchard/releases/tag/1.11.0)
 **Released:** 2021-10-18
 

Common/GYBPhase.sh

@@ -5,37 +5,11 @@
 #
 #  Created by Jeff Kelley on 3/21/19.
 #
-GYB_PATH="/usr/local/bin/gyb"
-
-if [ ! -f "${GYB_PATH}" ]; then
-    echo "gyb not installed at /usr/local/bin. Use Homebrew to install gyb."
-    exit 1
-fi
 
 function gyb {
     file=$1
-    if [ ${file: -4} == ".gyb" ]; then
-        echo "gyb: ${file} -> ${file%.gyb}"
-        "${GYB_PATH}"  --line-directive '' -o "${file%.gyb}" "$file";
-    else
-        echo "Not gybbing non-gyb file ${file}"
-    fi
+    echo "gyb: ${file}"
+    "Common/gyb" --line-directive '' -o "${file%.gyb}" "$file";
 }
 
-if [ $SCRIPT_INPUT_FILE_COUNT -ne 0 ]; then
-    for i in $(seq 0 $(expr $SCRIPT_INPUT_FILE_COUNT - 1)); do
-        inputFileVar="SCRIPT_INPUT_FILE_${i}"
-        inputFile="${!inputFileVar}"
-        gyb "$inputFile"
-    done
-fi
-
-if [ $SCRIPT_INPUT_FILE_LIST_COUNT -ne 0 ]; then
-    for i in $(seq 0 $(expr $SCRIPT_INPUT_FILE_LIST_COUNT - 1)); do
-        inputFileListVar="SCRIPT_INPUT_FILE_LIST_${i}"
-        inputFileList="${!inputFileListVar}"
-        cat "${inputFileList}" | while read inputFile; do
-            gyb "$inputFile"
-        done
-    done
-fi
+find "$(pwd)/$1" -type f -name "*.gyb" | while read file; do gyb "$file"; done

Common/GYBUtilities.py

@@ -1,6 +1,5 @@
 import csv
 from enum import Enum
-from itertools import izip
 import os
 
 class OSFamily(Enum):
@@ -9,7 +8,6 @@ class OSFamily(Enum):
 	TVOS = "tvOS"
 
 class iOSDeviceFamily(Enum):
-	__order__ = 'IPHONE IPAD'
 	IPHONE = "iPhone"
 	IPAD = "iPad"
 	IPOD = "iPod"
@@ -49,7 +47,7 @@ def versiontuple(v):
 	return tuple(map(int, v.split('.')))
 
 def versiontupleAdd(u, v):
-	return tuple(x + y for x, y in izip(versiontuple(u), versiontuple(v)))
+	return tuple(x + y for x, y in zip(versiontuple(u), versiontuple(v)))
 
 def versiontupleToString(v):
 	return ".".join(map(str, v))

Common/gyb

@@ -0,0 +1,3 @@
+#!/usr/bin/env python3
+import gyb
+gyb.main()