Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Cocoapods and pin MarqueeLabel #22

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update Cocoapods and pin MarqueeLabel #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88d8ec3
Updating pods
farktronix Jun 7, 2019
c652bd7
Merge remote-tracking branch 'upstream/master'
farktronix Jun 7, 2019
e868018
Update to the new MarqueeLabel API
farktronix Jun 7, 2019
0919ca7
Merge commit 'e868018' into merge
farktronix Sep 17, 2020
b3987e5
Update cocoapods
farktronix Nov 1, 2020
8f9e470
Remove the OSX target- it doesn't compile, and Catalyst is the new wa…
farktronix Nov 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 0 additions & 159 deletions AGAudioPlayer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
00F6D8B8EE7CDB10908B8E7F /* Pods_AGAudioPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D67DF68517CEBB91D42D7E1 /* Pods_AGAudioPlayer.framework */; };
4333981B2249E91E00BECC8A /* UIColor+AGAudioPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4333981A2249E91E00BECC8A /* UIColor+AGAudioPlayer.swift */; };
4333981C2249E91E00BECC8A /* UIColor+AGAudioPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4333981A2249E91E00BECC8A /* UIColor+AGAudioPlayer.swift */; };
7C0D7BC81A44B68600607581 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7C0D7BC41A44B68600607581 /* LaunchScreen.xib */; };
7C3FE4461AB3B69900A52266 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C3FE4451AB3B69900A52266 /* MediaPlayer.framework */; };
7C3FF8361AB6723B003BAE01 /* AGAudioItemCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C3FF8351AB6723B003BAE01 /* AGAudioItemCollection.m */; };
Expand All @@ -33,19 +32,6 @@
7CE24AB01BDDD83800ABD545 /* (null) in Resources */ = {isa = PBXBuildFile; };
7CE24AB31BDDD84B00ABD545 /* (null) in Resources */ = {isa = PBXBuildFile; };
7CE24AB41BDDD84B00ABD545 /* (null) in Resources */ = {isa = PBXBuildFile; };
C122A1CB1C083B1800DE7E07 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C122A1CA1C083B1800DE7E07 /* AVFoundation.framework */; };
C1511AB51BDD9F6E003B4E6C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C1511AB41BDD9F6E003B4E6C /* AppDelegate.m */; };
C1511AB81BDD9F6E003B4E6C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C1511AB71BDD9F6E003B4E6C /* main.m */; };
C1511ABA1BDD9F6E003B4E6C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C1511AB91BDD9F6E003B4E6C /* Assets.xcassets */; };
C1511ABD1BDD9F6E003B4E6C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C1511ABB1BDD9F6E003B4E6C /* MainMenu.xib */; };
C1511AC21BDD9FE8003B4E6C /* AGAudioPlayer.h in Sources */ = {isa = PBXBuildFile; fileRef = 7CC250BE1A44792F009F91C8 /* AGAudioPlayer.h */; };
C1511AC31BDD9FE8003B4E6C /* AGAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CC250BF1A44792F009F91C8 /* AGAudioPlayer.m */; };
C1511AC41BDD9FE8003B4E6C /* AGAudioPlayerUpNextQueue.h in Sources */ = {isa = PBXBuildFile; fileRef = 7CC250CC1A447A98009F91C8 /* AGAudioPlayerUpNextQueue.h */; };
C1511AC51BDD9FE8003B4E6C /* AGAudioPlayerUpNextQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CC250CD1A447A98009F91C8 /* AGAudioPlayerUpNextQueue.m */; };
C1511AC61BDD9FE8003B4E6C /* AGAudioItem.h in Sources */ = {isa = PBXBuildFile; fileRef = 7CC250CF1A447AB0009F91C8 /* AGAudioItem.h */; };
C1511AC71BDD9FE8003B4E6C /* AGAudioItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CC250D01A447AB0009F91C8 /* AGAudioItem.m */; };
C1511AC81BDD9FE8003B4E6C /* AGAudioItemCollection.h in Sources */ = {isa = PBXBuildFile; fileRef = 7C3FF8341AB6723B003BAE01 /* AGAudioItemCollection.h */; };
C1511AC91BDD9FE8003B4E6C /* AGAudioItemCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C3FF8351AB6723B003BAE01 /* AGAudioItemCollection.m */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -88,13 +74,6 @@
7CC250D01A447AB0009F91C8 /* AGAudioItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AGAudioItem.m; sourceTree = "<group>"; };
B7B0EBDDDA4C85817C274304 /* Pods-AGAudioPlayer.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AGAudioPlayer.release.xcconfig"; path = "Pods/Target Support Files/Pods-AGAudioPlayer/Pods-AGAudioPlayer.release.xcconfig"; sourceTree = "<group>"; };
C122A1CA1C083B1800DE7E07 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; };
C1511AB11BDD9F6E003B4E6C /* AGAudioPlayerOSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AGAudioPlayerOSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
C1511AB31BDD9F6E003B4E6C /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
C1511AB41BDD9F6E003B4E6C /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
C1511AB71BDD9F6E003B4E6C /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
C1511AB91BDD9F6E003B4E6C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
C1511ABC1BDD9F6E003B4E6C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
C1511ABE1BDD9F6E003B4E6C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C1511ACA1BDDA420003B4E6C /* libPods-osx-HysteriaPlayer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-osx-HysteriaPlayer.a"; path = "../../Library/Developer/Xcode/DerivedData/AGAudioPlayer-ceysjiavmokbcggbxsrdkqaoqjyg/Build/Products/Debug/libPods-osx-HysteriaPlayer.a"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -108,14 +87,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
C1511AAE1BDD9F6E003B4E6C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C122A1CB1C083B1800DE7E07 /* AVFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -178,7 +149,6 @@
7CC250BD1A447910009F91C8 /* Example */,
7CC250961A447901009F91C8 /* AGAudioPlayer */,
7CC250B01A447901009F91C8 /* AGAudioPlayerTests */,
C1511AB21BDD9F6E003B4E6C /* AGAudioPlayerOSX */,
7CC250951A447901009F91C8 /* Products */,
611DADBAC9E9F54CCE4C248F /* Pods */,
80D42F16B827D769063109BD /* Frameworks */,
Expand All @@ -189,7 +159,6 @@
isa = PBXGroup;
children = (
7CC250941A447901009F91C8 /* AGAudioPlayer.app */,
C1511AB11BDD9F6E003B4E6C /* AGAudioPlayerOSX.app */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -263,27 +232,6 @@
name = Frameworks;
sourceTree = "<group>";
};
C1511AB21BDD9F6E003B4E6C /* AGAudioPlayerOSX */ = {
isa = PBXGroup;
children = (
C1511AB31BDD9F6E003B4E6C /* AppDelegate.h */,
C1511AB41BDD9F6E003B4E6C /* AppDelegate.m */,
C1511AB91BDD9F6E003B4E6C /* Assets.xcassets */,
C1511ABB1BDD9F6E003B4E6C /* MainMenu.xib */,
C1511ABE1BDD9F6E003B4E6C /* Info.plist */,
C1511AB61BDD9F6E003B4E6C /* Supporting Files */,
);
path = AGAudioPlayerOSX;
sourceTree = "<group>";
};
C1511AB61BDD9F6E003B4E6C /* Supporting Files */ = {
isa = PBXGroup;
children = (
C1511AB71BDD9F6E003B4E6C /* main.m */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -306,23 +254,6 @@
productReference = 7CC250941A447901009F91C8 /* AGAudioPlayer.app */;
productType = "com.apple.product-type.application";
};
C1511AB01BDD9F6E003B4E6C /* AGAudioPlayerOSX */ = {
isa = PBXNativeTarget;
buildConfigurationList = C1511AC11BDD9F6E003B4E6C /* Build configuration list for PBXNativeTarget "AGAudioPlayerOSX" */;
buildPhases = (
C1511AAD1BDD9F6E003B4E6C /* Sources */,
C1511AAE1BDD9F6E003B4E6C /* Frameworks */,
C1511AAF1BDD9F6E003B4E6C /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = AGAudioPlayerOSX;
productName = AGAudioPlayerOSX;
productReference = C1511AB11BDD9F6E003B4E6C /* AGAudioPlayerOSX.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -337,10 +268,6 @@
DevelopmentTeam = HT7ELV3Q35;
LastSwiftMigration = 1020;
};
C1511AB01BDD9F6E003B4E6C = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 1020;
};
};
};
buildConfigurationList = 7CC2508F1A447901009F91C8 /* Build configuration list for PBXProject "AGAudioPlayer" */;
Expand All @@ -358,7 +285,6 @@
projectRoot = "";
targets = (
7CC250931A447901009F91C8 /* AGAudioPlayer */,
C1511AB01BDD9F6E003B4E6C /* AGAudioPlayerOSX */,
);
};
/* End PBXProject section */
Expand All @@ -380,15 +306,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
C1511AAF1BDD9F6E003B4E6C /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C1511ABA1BDD9F6E003B4E6C /* Assets.xcassets in Resources */,
C1511ABD1BDD9F6E003B4E6C /* MainMenu.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -457,24 +374,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
C1511AAD1BDD9F6E003B4E6C /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C1511AC21BDD9FE8003B4E6C /* AGAudioPlayer.h in Sources */,
C1511AC31BDD9FE8003B4E6C /* AGAudioPlayer.m in Sources */,
C1511AC41BDD9FE8003B4E6C /* AGAudioPlayerUpNextQueue.h in Sources */,
C1511AC51BDD9FE8003B4E6C /* AGAudioPlayerUpNextQueue.m in Sources */,
C1511AC61BDD9FE8003B4E6C /* AGAudioItem.h in Sources */,
C1511AC71BDD9FE8003B4E6C /* AGAudioItem.m in Sources */,
4333981C2249E91E00BECC8A /* UIColor+AGAudioPlayer.swift in Sources */,
C1511AC81BDD9FE8003B4E6C /* AGAudioItemCollection.h in Sources */,
C1511AC91BDD9FE8003B4E6C /* AGAudioItemCollection.m in Sources */,
C1511AB81BDD9F6E003B4E6C /* main.m in Sources */,
C1511AB51BDD9F6E003B4E6C /* AppDelegate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
Expand All @@ -486,14 +385,6 @@
name = LaunchScreen.xib;
sourceTree = "<group>";
};
C1511ABB1BDD9F6E003B4E6C /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
C1511ABC1BDD9F6E003B4E6C /* Base */,
);
name = MainMenu.xib;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -659,47 +550,6 @@
};
name = Release;
};
C1511ABF1BDD9F6E003B4E6C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = AGAudioPlayerOSX/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = com.alecgorge.AGAudioPlayer.AGAudioPlayerOSX;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
C1511AC01BDD9F6E003B4E6C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = AGAudioPlayerOSX/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = com.alecgorge.AGAudioPlayer.AGAudioPlayerOSX;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SWIFT_VERSION = 5.0;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand All @@ -721,15 +571,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C1511AC11BDD9F6E003B4E6C /* Build configuration list for PBXNativeTarget "AGAudioPlayerOSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C1511ABF1BDD9F6E003B4E6C /* Debug */,
C1511AC01BDD9F6E003B4E6C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 7CC2508C1A447901009F91C8 /* Project object */;
Expand Down
15 changes: 0 additions & 15 deletions AGAudioPlayerOSX/AppDelegate.h
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions AGAudioPlayerOSX/AppDelegate.m
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions AGAudioPlayerOSX/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop

This file was deleted.

Loading