Skip to content
This repository has been archived by the owner on Mar 25, 2023. It is now read-only.

Commit

Permalink
NHL 2021-2022 Support Update (#84)
Browse files Browse the repository at this point in the history
Updated Xcode to 12.5, fixed a few small bugs and updated team data/logos.
---

* Updated .gitignore

* Add Gemfile

* Update Podfile.lock, test build

* Use new URL, enable SSL

Co-authored-by: Tyler Wolf <[email protected]>
Co-authored-by: abuhamsa <[email protected]>

* Set deployment target to iOS 13, script assets for NHL

* Update MLB team data, fix deployment target

* Convert SVG to PDF, fix decoding some schedules

* revert back to iOS 9 deployment target

* revert to only dark logos for now

* Update Crashlytics

* Fix weird split behavior introduced on iOS 14

* Some iOS appearance changes

* Hopefully fix ci

* Set Xcode version

* Set Xcode version V2

* Set macOS version to Big Sur

Co-authored-by: Tyler Wolf <[email protected]>
Co-authored-by: abuhamsa <[email protected]>
  • Loading branch information
3 people authored Oct 10, 2021
1 parent 8fdd952 commit 7068856
Show file tree
Hide file tree
Showing 212 changed files with 1,169 additions and 970 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push]
jobs:
build:
name: Build LazyMan
runs-on: macos-latest
runs-on: macos-11
steps:
- name: Checkout
uses: actions/checkout@v1
Expand All @@ -20,7 +20,9 @@ jobs:
- name: Install Pods
run: pod install
- name: Choose Xcode Version
run: sudo xcode-select -switch /Applications/Xcode_11.2.1.app
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '12.5.1'
- name: Install dpkg
run: brew install dpkg
- name: Checkout ldid
Expand All @@ -36,7 +38,7 @@ jobs:
chmod +x ldid2
cp ldid2 /usr/local/bin/ldid2
- name: Generate build number
uses: einaregilsson/build-number@v2
uses: einaregilsson/build-number@v3
with:
token: ${{ secrets.github_token }}
- name: Build App
Expand Down
59 changes: 45 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
## User settings
xcuserdata/

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/

## Various settings
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -15,16 +21,11 @@ DerivedData/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/
*.storyboardbak

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap

## App packaging
*.ipa
*.dSYM.zip
*.dSYM
Expand All @@ -38,6 +39,13 @@ playground.xcworkspace
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
# *.xcodeproj
#
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
# hence it is not needed unless you have added a package configuration file to your project
# .swiftpm

.build/

# CocoaPods
Expand All @@ -47,22 +55,45 @@ playground.xcworkspace
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build
Carthage/Build/

# Accio dependency management
Dependencies/
.accio/

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# It is recommended to not store the screenshots in the git repo.
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

# Ignore bundler
vendor/

# Storyboard version number
*.storyboardbak

# Local development config
LocalConfig.xcconfig
7 changes: 7 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# frozen_string_literal: true

source "https://rubygems.org"

git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

gem "cocoapods", "~> 1.10"
95 changes: 95 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
activesupport (5.2.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.10.2)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
cocoapods-core (1.10.2)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.9)
escape (0.0.4)
ethon (0.14.0)
ffi (>= 1.15.0)
ffi (1.15.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
json (2.5.1)
minitest (5.14.4)
molinillo (0.6.6)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.6)
rexml (3.2.5)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
xcodeproj (1.20.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)

PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.10)

BUNDLED WITH
2.1.4
27 changes: 21 additions & 6 deletions LazyMan-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
01434A742040D3FF0094E221 /* GameTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01434A732040D3FF0094E221 /* GameTableViewCell.swift */; };
01434A762040DAA70094E221 /* GameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01434A752040DAA70094E221 /* GameViewController.swift */; };
015F34602055EA960005453C /* GameSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 015F345F2055EA960005453C /* GameSettingsViewController.swift */; };
017757C82713558E0009C23C /* PrimarySplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017757C72713558E0009C23C /* PrimarySplitViewController.swift */; };
0179AEC22076DB5D00539C6D /* nhlschedule2018-04-05.json in Resources */ = {isa = PBXBuildFile; fileRef = 0179AEC12076DB5D00539C6D /* nhlschedule2018-04-05.json */; };
0179AEC42076F84200539C6D /* mlbschedule2018-04-05.json in Resources */ = {isa = PBXBuildFile; fileRef = 0179AEC32076F84200539C6D /* mlbschedule2018-04-05.json */; };
0186CA43208A7BE800F7907A /* UIView+searcVisualEffectsSubview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0186CA42208A7BE800F7907A /* UIView+searcVisualEffectsSubview.swift */; };
Expand All @@ -31,6 +32,7 @@
01DC7B9720925325003C311A /* GameListTableBackgroundView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 01DC7B9620925325003C311A /* GameListTableBackgroundView.xib */; };
01DC7B9F2092BE6B003C311A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DC7B9E2092BE6B003C311A /* SettingsViewController.swift */; };
01DC7BA020940B23003C311A /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 01DC7BA220940B23003C311A /* Settings.storyboard */; };
01DC8E7D26C09A1D003EDA9D /* LocalConfig-template.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 01DC8E7C26C09A1D003EDA9D /* LocalConfig-template.xcconfig */; };
01EC4DE5225AA78300034D83 /* DarkOptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EC4DE4225AA78300034D83 /* DarkOptionViewController.swift */; };
01EC4DE7225AA97500034D83 /* CDN+OptionSelectorCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EC4DE6225AA97500034D83 /* CDN+OptionSelectorCell.swift */; };
01EC4DE9225AA98500034D83 /* Feed+OptionSelectorCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EC4DE8225AA98500034D83 /* Feed+OptionSelectorCell.swift */; };
Expand Down Expand Up @@ -68,6 +70,7 @@
01434A732040D3FF0094E221 /* GameTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameTableViewCell.swift; sourceTree = "<group>"; };
01434A752040DAA70094E221 /* GameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = "<group>"; };
015F345F2055EA960005453C /* GameSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameSettingsViewController.swift; sourceTree = "<group>"; };
017757C72713558E0009C23C /* PrimarySplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimarySplitViewController.swift; sourceTree = "<group>"; };
0179AEC12076DB5D00539C6D /* nhlschedule2018-04-05.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "nhlschedule2018-04-05.json"; sourceTree = "<group>"; };
0179AEC32076F84200539C6D /* mlbschedule2018-04-05.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "mlbschedule2018-04-05.json"; sourceTree = "<group>"; };
0186CA42208A7BE800F7907A /* UIView+searcVisualEffectsSubview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+searcVisualEffectsSubview.swift"; sourceTree = "<group>"; };
Expand All @@ -80,6 +83,9 @@
01DC7B9620925325003C311A /* GameListTableBackgroundView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GameListTableBackgroundView.xib; sourceTree = "<group>"; };
01DC7B9E2092BE6B003C311A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
01DC7BA120940B23003C311A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Settings.storyboard; sourceTree = "<group>"; };
01DC8E7A26C091EE003EDA9D /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
01DC8E7B26C094CB003EDA9D /* LocalConfig.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = LocalConfig.xcconfig; sourceTree = "<group>"; };
01DC8E7C26C09A1D003EDA9D /* LocalConfig-template.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "LocalConfig-template.xcconfig"; sourceTree = "<group>"; };
01EC4DE4225AA78300034D83 /* DarkOptionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DarkOptionViewController.swift; sourceTree = "<group>"; };
01EC4DE6225AA97500034D83 /* CDN+OptionSelectorCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CDN+OptionSelectorCell.swift"; sourceTree = "<group>"; };
01EC4DE8225AA98500034D83 /* Feed+OptionSelectorCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Feed+OptionSelectorCell.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -164,6 +170,7 @@
013CF1F120901A30001A24EC /* GameListTableViewController.swift */,
01DC7B942092530A003C311A /* GameListTableBackgroundView.swift */,
01DC7B9620925325003C311A /* GameListTableBackgroundView.xib */,
017757C72713558E0009C23C /* PrimarySplitViewController.swift */,
);
path = GameList;
sourceTree = "<group>";
Expand Down Expand Up @@ -207,6 +214,9 @@
012CB8B9203A3E7C00E76740 /* LaunchScreen.storyboard */,
012CB8B7203A3E7C00E76740 /* Assets.xcassets */,
010E4585203A6B4A001EF46C /* Icons.xcassets */,
01DC8E7A26C091EE003EDA9D /* Config.xcconfig */,
01DC8E7B26C094CB003EDA9D /* LocalConfig.xcconfig */,
01DC8E7C26C09A1D003EDA9D /* LocalConfig-template.xcconfig */,
);
path = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -328,6 +338,7 @@
012CB8B6203A3E7C00E76740 /* GameList.storyboard in Resources */,
01344C862061D0EC0040BDE7 /* Game.storyboard in Resources */,
0142C652226A72EE0060A017 /* GoogleService-Info.plist in Resources */,
01DC8E7D26C09A1D003EDA9D /* LocalConfig-template.xcconfig in Resources */,
0179AEC22076DB5D00539C6D /* nhlschedule2018-04-05.json in Resources */,
01DC7BA020940B23003C311A /* Settings.storyboard in Resources */,
);
Expand All @@ -344,7 +355,8 @@
inputFileListPaths = (
);
inputPaths = (
"$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
"$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
);
name = Crashlytics;
outputFileListPaths = (
Expand All @@ -353,7 +365,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Fabric/run\"\n";
shellScript = "\"${PODS_ROOT}/FirebaseCrashlytics/run\"\n";
};
019B740C23AD78F50033DA82 /* Build/Version Number in Storyboard */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -436,6 +448,7 @@
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
"${BUILT_PRODUCTS_DIR}/OptionSelector/OptionSelector.framework",
"${BUILT_PRODUCTS_DIR}/Pantomime-iOS/Pantomime.framework",
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
"${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework",
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
);
Expand All @@ -445,6 +458,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OptionSelector.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Pantomime.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/protobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
);
Expand Down Expand Up @@ -488,6 +502,7 @@
01EC4DE5225AA78300034D83 /* DarkOptionViewController.swift in Sources */,
015F34602055EA960005453C /* GameSettingsViewController.swift in Sources */,
01EC4DE7225AA97500034D83 /* CDN+OptionSelectorCell.swift in Sources */,
017757C82713558E0009C23C /* PrimarySplitViewController.swift in Sources */,
01EC4DEB225AA99400034D83 /* Playlist+OptionSelectorCell.swift in Sources */,
013CF1F220901A30001A24EC /* GameListTableViewController.swift in Sources */,
0186CA43208A7BE800F7907A /* UIView+searcVisualEffectsSubview.swift in Sources */,
Expand Down Expand Up @@ -541,6 +556,7 @@
/* Begin XCBuildConfiguration section */
012CB8BD203A3E7C00E76740 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 01DC8E7A26C091EE003EDA9D /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -600,6 +616,7 @@
};
012CB8BE203A3E7C00E76740 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 01DC8E7A26C091EE003EDA9D /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -659,10 +676,9 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "$(SRCROOT)/LazyMan-iOS/Resources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "dev.nickt.LazyMan-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
Expand All @@ -679,10 +695,9 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "$(SRCROOT)/LazyMan-iOS/Resources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "dev.nickt.LazyMan-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
Expand Down
Loading

0 comments on commit 7068856

Please sign in to comment.