diff --git a/Example-Old/Example/Assets.xcassets/Contents.json b/Example-Old/Example/Assets.xcassets/Contents.json index da4a164..73c0059 100644 --- a/Example-Old/Example/Assets.xcassets/Contents.json +++ b/Example-Old/Example/Assets.xcassets/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Example-Old/Example/Assets.xcassets/prohud.checkmark.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.checkmark.imageset/Contents.json deleted file mode 100644 index 584ff70..0000000 --- a/Example-Old/Example/Assets.xcassets/prohud.checkmark.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "prohud.checkmark@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "prohud.checkmark@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example-Old/Example/Assets.xcassets/prohud.checkmark.imageset/prohud.checkmark@2x.png b/Example-Old/Example/Assets.xcassets/prohud.checkmark.imageset/prohud.checkmark@2x.png deleted file mode 100644 index 0fecb2b..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.checkmark.imageset/prohud.checkmark@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.checkmark.imageset/prohud.checkmark@3x.png b/Example-Old/Example/Assets.xcassets/prohud.checkmark.imageset/prohud.checkmark@3x.png deleted file mode 100644 index 9f75dfc..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.checkmark.imageset/prohud.checkmark@3x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.exclamationmark.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.exclamationmark.imageset/Contents.json deleted file mode 100644 index b7d3d0a..0000000 --- a/Example-Old/Example/Assets.xcassets/prohud.exclamationmark.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "prohud.exclamationmark@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "prohud.exclamationmark@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example-Old/Example/Assets.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@2x.png b/Example-Old/Example/Assets.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@2x.png deleted file mode 100644 index d84bf63..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@3x.png b/Example-Old/Example/Assets.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@3x.png deleted file mode 100644 index 80e07cb..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.exclamationmark.imageset/prohud.exclamationmark@3x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.message.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.message.imageset/Contents.json deleted file mode 100644 index 0219061..0000000 --- a/Example-Old/Example/Assets.xcassets/prohud.message.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "prohud.message@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "prohud.message@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example-Old/Example/Assets.xcassets/prohud.message.imageset/prohud.message@2x.png b/Example-Old/Example/Assets.xcassets/prohud.message.imageset/prohud.message@2x.png deleted file mode 100644 index 6d256b6..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.message.imageset/prohud.message@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.message.imageset/prohud.message@3x.png b/Example-Old/Example/Assets.xcassets/prohud.message.imageset/prohud.message@3x.png deleted file mode 100644 index c37d8b0..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.message.imageset/prohud.message@3x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.note.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.note.imageset/Contents.json deleted file mode 100644 index 91ca9d0..0000000 --- a/Example-Old/Example/Assets.xcassets/prohud.note.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "prohud.note@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "prohud.note@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example-Old/Example/Assets.xcassets/prohud.note.imageset/prohud.note@2x.png b/Example-Old/Example/Assets.xcassets/prohud.note.imageset/prohud.note@2x.png deleted file mode 100644 index 44c986e..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.note.imageset/prohud.note@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.note.imageset/prohud.note@3x.png b/Example-Old/Example/Assets.xcassets/prohud.note.imageset/prohud.note@3x.png deleted file mode 100644 index b7e326f..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.note.imageset/prohud.note@3x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.privacy.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.privacy.imageset/Contents.json deleted file mode 100644 index ebaf379..0000000 --- a/Example-Old/Example/Assets.xcassets/prohud.privacy.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "prohud.privacy@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "prohud.privacy@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example-Old/Example/Assets.xcassets/prohud.privacy.imageset/prohud.privacy@2x.png b/Example-Old/Example/Assets.xcassets/prohud.privacy.imageset/prohud.privacy@2x.png deleted file mode 100644 index cbd1022..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.privacy.imageset/prohud.privacy@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.privacy.imageset/prohud.privacy@3x.png b/Example-Old/Example/Assets.xcassets/prohud.privacy.imageset/prohud.privacy@3x.png deleted file mode 100644 index 1b42f67..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.privacy.imageset/prohud.privacy@3x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.questionmark.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.questionmark.imageset/Contents.json deleted file mode 100644 index ae5d524..0000000 --- a/Example-Old/Example/Assets.xcassets/prohud.questionmark.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "prohud.questionmark@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "prohud.questionmark@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example-Old/Example/Assets.xcassets/prohud.questionmark.imageset/prohud.questionmark@2x.png b/Example-Old/Example/Assets.xcassets/prohud.questionmark.imageset/prohud.questionmark@2x.png deleted file mode 100644 index dfd59f5..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.questionmark.imageset/prohud.questionmark@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.questionmark.imageset/prohud.questionmark@3x.png b/Example-Old/Example/Assets.xcassets/prohud.questionmark.imageset/prohud.questionmark@3x.png deleted file mode 100644 index 8154a9f..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.questionmark.imageset/prohud.questionmark@3x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/Contents.json deleted file mode 100644 index 266990e..0000000 --- a/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "prohud.rainbow.circle@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "prohud.rainbow.circle@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@2x.png b/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@2x.png deleted file mode 100644 index 51fdd40..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@3x.png b/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@3x.png deleted file mode 100644 index d6d457b..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.rainbow.circle.imageset/prohud.rainbow.circle@3x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.trash.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.trash.imageset/Contents.json deleted file mode 100644 index 551989a..0000000 --- a/Example-Old/Example/Assets.xcassets/prohud.trash.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "prohud.trash@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "prohud.trash@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example-Old/Example/Assets.xcassets/prohud.trash.imageset/prohud.trash@2x.png b/Example-Old/Example/Assets.xcassets/prohud.trash.imageset/prohud.trash@2x.png deleted file mode 100644 index 25fb085..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.trash.imageset/prohud.trash@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.trash.imageset/prohud.trash@3x.png b/Example-Old/Example/Assets.xcassets/prohud.trash.imageset/prohud.trash@3x.png deleted file mode 100644 index 1411e5e..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.trash.imageset/prohud.trash@3x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.windmill.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.windmill.imageset/Contents.json deleted file mode 100644 index b9c979b..0000000 --- a/Example-Old/Example/Assets.xcassets/prohud.windmill.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "prohud.windmill@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "prohud.windmill@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example-Old/Example/Assets.xcassets/prohud.windmill.imageset/prohud.windmill@2x.png b/Example-Old/Example/Assets.xcassets/prohud.windmill.imageset/prohud.windmill@2x.png deleted file mode 100644 index 0d0f0d5..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.windmill.imageset/prohud.windmill@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.windmill.imageset/prohud.windmill@3x.png b/Example-Old/Example/Assets.xcassets/prohud.windmill.imageset/prohud.windmill@3x.png deleted file mode 100644 index d42e6cd..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.windmill.imageset/prohud.windmill@3x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.xmark.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/prohud.xmark.imageset/Contents.json deleted file mode 100644 index 2797b4b..0000000 --- a/Example-Old/Example/Assets.xcassets/prohud.xmark.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "prohud.xmark@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "prohud.xmark@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example-Old/Example/Assets.xcassets/prohud.xmark.imageset/prohud.xmark@2x.png b/Example-Old/Example/Assets.xcassets/prohud.xmark.imageset/prohud.xmark@2x.png deleted file mode 100644 index ed77e18..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.xmark.imageset/prohud.xmark@2x.png and /dev/null differ diff --git a/Example-Old/Example/Assets.xcassets/prohud.xmark.imageset/prohud.xmark@3x.png b/Example-Old/Example/Assets.xcassets/prohud.xmark.imageset/prohud.xmark@3x.png deleted file mode 100644 index 448d1d0..0000000 Binary files a/Example-Old/Example/Assets.xcassets/prohud.xmark.imageset/prohud.xmark@3x.png and /dev/null differ diff --git a/Package.swift b/Package.swift index 7b1ce74..6d19920 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.0 +// swift-tools-version:5.3 import PackageDescription @@ -16,7 +16,8 @@ let package = Package( .target( name: "ProHUD", dependencies: ["SnapKit", "Inspire"], - path: "Source" + path: "Source", + resources: [.process("ProHUD.xcassets")] ) ], swiftLanguageVersions: [.v5] diff --git a/Podfile.lock b/Podfile.lock index 3245abf..3048d5b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,3 +1,3 @@ -PODFILE CHECKSUM: ed27fdd7ef2904f7a46847269180199e12907794 +PODFILE CHECKSUM: 6cebb4bc46375d38fc36a728dcb33f3b7ec0c396 -COCOAPODS: 1.9.2 +COCOAPODS: 1.10.1 diff --git a/ProHUD.xcodeproj/project.pbxproj b/ProHUD.xcodeproj/project.pbxproj index 93ba8b5..445bfa6 100644 --- a/ProHUD.xcodeproj/project.pbxproj +++ b/ProHUD.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 36CB9DEED3C3E823FE7B1C75 /* Pods_ProHUD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2011798511AD590A613E54E /* Pods_ProHUD.framework */; }; CD16490B22EF09AB0077988C /* AlertModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD16490A22EF09AB0077988C /* AlertModel.swift */; }; CD16490D22EF09B40077988C /* AlertConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD16490C22EF09B40077988C /* AlertConfig.swift */; }; CD16491222EF0D900077988C /* HUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD16491122EF0D900077988C /* HUDView.swift */; }; @@ -22,8 +23,8 @@ CDB6A07B22EEF06500AF6CF0 /* HUDController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB6A07A22EEF06500AF6CF0 /* HUDController.swift */; }; CDB6A07D22EEF19D00AF6CF0 /* HUDConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB6A07C22EEF19D00AF6CF0 /* HUDConfig.swift */; }; CDC39CFD22FD6DDF0070E914 /* GuardModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDC39CFC22FD6DDF0070E914 /* GuardModel.swift */; }; - CDC67BE92490A19100CC6FE6 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = CDC67BE82490A19100CC6FE6 /* SnapKit */; }; - CDC67BEC2490A1D100CC6FE6 /* Inspire in Frameworks */ = {isa = PBXBuildFile; productRef = CDC67BEB2490A1D100CC6FE6 /* Inspire */; }; + CDC67BE92490A19100CC6FE6 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = CDC67BE82490A19100CC6FE6 /* SwiftPackageProductDependency */; }; + CDC67BEC2490A1D100CC6FE6 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = CDC67BEB2490A1D100CC6FE6 /* SwiftPackageProductDependency */; }; CDF2C58924A0572C002ECDD5 /* HUDUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDF2C58824A0572C002ECDD5 /* HUDUtils.swift */; }; /* End PBXBuildFile section */ @@ -57,8 +58,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CDC67BEC2490A1D100CC6FE6 /* Inspire in Frameworks */, - CDC67BE92490A19100CC6FE6 /* SnapKit in Frameworks */, + CDC67BEC2490A1D100CC6FE6 /* BuildFile in Frameworks */, + CDC67BE92490A19100CC6FE6 /* BuildFile in Frameworks */, + 36CB9DEED3C3E823FE7B1C75 /* Pods_ProHUD.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -187,8 +189,8 @@ ); name = ProHUD; packageProductDependencies = ( - CDC67BE82490A19100CC6FE6 /* SnapKit */, - CDC67BEB2490A1D100CC6FE6 /* Inspire */, + CDC67BE82490A19100CC6FE6 /* SwiftPackageProductDependency */, + CDC67BEB2490A1D100CC6FE6 /* SwiftPackageProductDependency */, ); productName = ProHUD; productReference = CD95D21C22E72C4C007559A3 /* ProHUD.framework */; @@ -219,8 +221,8 @@ ); mainGroup = CD95D21222E72C4C007559A3; packageReferences = ( - CDC67BE72490A19100CC6FE6 /* XCRemoteSwiftPackageReference "SnapKit" */, - CDC67BEA2490A1D100CC6FE6 /* XCRemoteSwiftPackageReference "Inspire" */, + CDC67BE72490A19100CC6FE6 /* RemoteSwiftPackageReference */, + CDC67BEA2490A1D100CC6FE6 /* RemoteSwiftPackageReference */, ); productRefGroup = CD95D21D22E72C4C007559A3 /* Products */; projectDirPath = ""; @@ -491,7 +493,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - CDC67BE72490A19100CC6FE6 /* XCRemoteSwiftPackageReference "SnapKit" */ = { + CDC67BE72490A19100CC6FE6 /* RemoteSwiftPackageReference */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/SnapKit/SnapKit"; requirement = { @@ -499,7 +501,7 @@ minimumVersion = 5.0.1; }; }; - CDC67BEA2490A1D100CC6FE6 /* XCRemoteSwiftPackageReference "Inspire" */ = { + CDC67BEA2490A1D100CC6FE6 /* RemoteSwiftPackageReference */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/xaoxuu/Inspire"; requirement = { @@ -510,14 +512,14 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - CDC67BE82490A19100CC6FE6 /* SnapKit */ = { + CDC67BE82490A19100CC6FE6 /* SwiftPackageProductDependency */ = { isa = XCSwiftPackageProductDependency; - package = CDC67BE72490A19100CC6FE6 /* XCRemoteSwiftPackageReference "SnapKit" */; + package = CDC67BE72490A19100CC6FE6 /* RemoteSwiftPackageReference */; productName = SnapKit; }; - CDC67BEB2490A1D100CC6FE6 /* Inspire */ = { + CDC67BEB2490A1D100CC6FE6 /* SwiftPackageProductDependency */ = { isa = XCSwiftPackageProductDependency; - package = CDC67BEA2490A1D100CC6FE6 /* XCRemoteSwiftPackageReference "Inspire" */; + package = CDC67BEA2490A1D100CC6FE6 /* RemoteSwiftPackageReference */; productName = Inspire; }; /* End XCSwiftPackageProductDependency section */