From 5898c8a8e6a5cb1910afdaa1ac55d774d9d1f960 Mon Sep 17 00:00:00 2001 From: nakajijapan Date: Thu, 29 Jul 2021 17:45:02 +0900 Subject: [PATCH 1/9] SPM asset warning - Resolved a warning by moving out the Info.plist. Resolved a warning by moving package asset to the Source root. Changed the way of fetching Kingsfisher dependency through https instead of ssh as it's not best practice --- .../contents.xcworkspacedata | 7 +++++++ Cartfile | 1 - Cartfile.resolved | 1 - Sources/Info.plist => Info.plist | 0 Package.resolved | 16 ++++++++++++++++ Package.swift | 2 +- .../PhotoSlider.xcassets/Contents.json | 0 .../PhotoSliderClose.imageset/Contents.json | 0 .../PhotoSliderClose.imageset/close.pdf | Bin .../PhotoSliderShare.imageset/Contents.json | 0 .../PhotoSliderShare.imageset/ShareButton.pdf | Bin 11 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata delete mode 100644 Cartfile delete mode 100644 Cartfile.resolved rename Sources/Info.plist => Info.plist (100%) create mode 100644 Package.resolved rename Sources/{PhotoSlider => }/PhotoSlider.xcassets/Contents.json (100%) rename Sources/{PhotoSlider => }/PhotoSlider.xcassets/PhotoSliderClose.imageset/Contents.json (100%) rename Sources/{PhotoSlider => }/PhotoSlider.xcassets/PhotoSliderClose.imageset/close.pdf (100%) rename Sources/{PhotoSlider => }/PhotoSlider.xcassets/PhotoSliderShare.imageset/Contents.json (100%) rename Sources/{PhotoSlider => }/PhotoSlider.xcassets/PhotoSliderShare.imageset/ShareButton.pdf (100%) diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Cartfile b/Cartfile deleted file mode 100644 index 658e4bc..0000000 --- a/Cartfile +++ /dev/null @@ -1 +0,0 @@ -github "onevcat/Kingfisher" diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index f2d8f1d..0000000 --- a/Cartfile.resolved +++ /dev/null @@ -1 +0,0 @@ -github "onevcat/Kingfisher" "6.3.0" diff --git a/Sources/Info.plist b/Info.plist similarity index 100% rename from Sources/Info.plist rename to Info.plist diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..a41d3d1 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "Kingfisher", + "repositoryURL": "https://github.com/onevcat/Kingfisher.git", + "state": { + "branch": null, + "revision": "d06df9adf50ed8cde5786d935836a5f445f780ba", + "version": "6.3.1" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift index 273fb82..a2fec94 100644 --- a/Package.swift +++ b/Package.swift @@ -8,7 +8,7 @@ let package = Package( .library(name: "PhotoSlider", targets: ["PhotoSlider"]) ], dependencies: [ - .package(url: "git@github.com:onevcat/Kingfisher.git", from: "6.3.0") + .package(url: "https://github.com/onevcat/Kingfisher.git", from: "6.3.0") ], targets: [ .target( diff --git a/Sources/PhotoSlider/PhotoSlider.xcassets/Contents.json b/Sources/PhotoSlider.xcassets/Contents.json similarity index 100% rename from Sources/PhotoSlider/PhotoSlider.xcassets/Contents.json rename to Sources/PhotoSlider.xcassets/Contents.json diff --git a/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/Contents.json b/Sources/PhotoSlider.xcassets/PhotoSliderClose.imageset/Contents.json similarity index 100% rename from Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/Contents.json rename to Sources/PhotoSlider.xcassets/PhotoSliderClose.imageset/Contents.json diff --git a/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/close.pdf b/Sources/PhotoSlider.xcassets/PhotoSliderClose.imageset/close.pdf similarity index 100% rename from Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/close.pdf rename to Sources/PhotoSlider.xcassets/PhotoSliderClose.imageset/close.pdf diff --git a/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/Contents.json b/Sources/PhotoSlider.xcassets/PhotoSliderShare.imageset/Contents.json similarity index 100% rename from Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/Contents.json rename to Sources/PhotoSlider.xcassets/PhotoSliderShare.imageset/Contents.json diff --git a/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/ShareButton.pdf b/Sources/PhotoSlider.xcassets/PhotoSliderShare.imageset/ShareButton.pdf similarity index 100% rename from Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/ShareButton.pdf rename to Sources/PhotoSlider.xcassets/PhotoSliderShare.imageset/ShareButton.pdf From 49c4b89e47f18275c9e2ad007f5c14f4f69c368d Mon Sep 17 00:00:00 2001 From: TomchyshenDenys Date: Tue, 2 Nov 2021 12:57:40 +0200 Subject: [PATCH 2/9] Reverted Info.plist back --- Info.plist => Sources/Info.plist | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Info.plist => Sources/Info.plist (100%) diff --git a/Info.plist b/Sources/Info.plist similarity index 100% rename from Info.plist rename to Sources/Info.plist From ead579fd2e03f26adf274847538875af0172f7de Mon Sep 17 00:00:00 2001 From: TomchyshenDenys Date: Tue, 2 Nov 2021 13:45:32 +0200 Subject: [PATCH 3/9] Resolved info.plist warning --- Sources/Info.plist => Info.plist | 0 PhotoSlider.xcodeproj/project.pbxproj | 16 ++++++++-------- .../project.xcworkspace/contents.xcworkspacedata | 7 +++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../xcshareddata/swiftpm/Package.resolved | 16 ++++++++++++++++ 5 files changed, 39 insertions(+), 8 deletions(-) rename Sources/Info.plist => Info.plist (100%) create mode 100644 PhotoSlider.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/Sources/Info.plist b/Info.plist similarity index 100% rename from Sources/Info.plist rename to Info.plist diff --git a/PhotoSlider.xcodeproj/project.pbxproj b/PhotoSlider.xcodeproj/project.pbxproj index 6950124..7308209 100644 --- a/PhotoSlider.xcodeproj/project.pbxproj +++ b/PhotoSlider.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 94530E041E247C6100D12C16 /* ImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94530E031E247C6100D12C16 /* ImageLoader.swift */; }; 94530E141E247CA300D12C16 /* KingfisherImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94530E131E247CA300D12C16 /* KingfisherImageLoader.swift */; }; - B012C9C926B0EB5A00914DF2 /* PhotoSlider.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B012C9C826B0EB5A00914DF2 /* PhotoSlider.xcassets */; }; B05F013726AEA845005519C5 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; platformFilter = ios; productRef = B05F013626AEA845005519C5 /* Kingfisher */; }; DC0E42021C3182080090AC94 /* ImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0E41C71C317E850090AC94 /* ImageView.swift */; }; DC0E42031C3182090090AC94 /* Photo.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0E41C81C317E850090AC94 /* Photo.swift */; }; @@ -17,14 +16,13 @@ DC0E42051C3182110090AC94 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0E41CA1C317E850090AC94 /* ViewController.swift */; }; DC0E42061C3182130090AC94 /* ZoomingAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0E41CB1C317E850090AC94 /* ZoomingAnimationController.swift */; }; DC3EE1DB1D9C96610046AFE2 /* UIImage+PhotoSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3EE1DA1D9C96610046AFE2 /* UIImage+PhotoSlider.swift */; }; + EF51ECD727315C1600F8F19B /* PhotoSlider.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EF51ECD627315C1600F8F19B /* PhotoSlider.xcassets */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 94530E031E247C6100D12C16 /* ImageLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageLoader.swift; sourceTree = ""; }; 94530E131E247CA300D12C16 /* KingfisherImageLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KingfisherImageLoader.swift; sourceTree = ""; }; B012C9C626B0E4D800914DF2 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; - B012C9C826B0EB5A00914DF2 /* PhotoSlider.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = PhotoSlider.xcassets; sourceTree = ""; }; - B05F013326AEA670005519C5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Sources/Info.plist; sourceTree = ""; }; B05F013426AEA670005519C5 /* PhotoSlider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PhotoSlider.h; path = Sources/PhotoSlider.h; sourceTree = ""; }; DC0E41C71C317E850090AC94 /* ImageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageView.swift; sourceTree = ""; }; DC0E41C81C317E850090AC94 /* Photo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Photo.swift; sourceTree = ""; }; @@ -34,6 +32,8 @@ DC0E41F31C3181230090AC94 /* Kingfisher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kingfisher.framework; path = Carthage/Build/iOS/Kingfisher.framework; sourceTree = ""; }; DC0E41FA1C3181EE0090AC94 /* PhotoSlider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PhotoSlider.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DC3EE1DA1D9C96610046AFE2 /* UIImage+PhotoSlider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+PhotoSlider.swift"; sourceTree = ""; }; + EF51ECD527315BDD00F8F19B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + EF51ECD627315C1600F8F19B /* PhotoSlider.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = PhotoSlider.xcassets; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -51,7 +51,6 @@ B012C9C726B0E70600914DF2 /* PhotoSlider */ = { isa = PBXGroup; children = ( - B012C9C826B0EB5A00914DF2 /* PhotoSlider.xcassets */, DC0E41C51C317E850090AC94 /* Classes */, ); path = PhotoSlider; @@ -60,7 +59,7 @@ DC0E419E1C317DD50090AC94 = { isa = PBXGroup; children = ( - B05F013326AEA670005519C5 /* Info.plist */, + EF51ECD527315BDD00F8F19B /* Info.plist */, B05F013426AEA670005519C5 /* PhotoSlider.h */, B012C9C626B0E4D800914DF2 /* Package.swift */, DC0E41BF1C317E850090AC94 /* Sources */, @@ -80,6 +79,7 @@ DC0E41BF1C317E850090AC94 /* Sources */ = { isa = PBXGroup; children = ( + EF51ECD627315C1600F8F19B /* PhotoSlider.xcassets */, B012C9C726B0E70600914DF2 /* PhotoSlider */, ); path = Sources; @@ -183,7 +183,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - B012C9C926B0EB5A00914DF2 /* PhotoSlider.xcassets in Resources */, + EF51ECD727315C1600F8F19B /* PhotoSlider.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -327,7 +327,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -355,7 +355,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/PhotoSlider.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/PhotoSlider.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/PhotoSlider.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..aae0975 --- /dev/null +++ b/PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "Kingfisher", + "repositoryURL": "git@github.com:onevcat/Kingfisher.git", + "state": { + "branch": null, + "revision": "d06df9adf50ed8cde5786d935836a5f445f780ba", + "version": "6.3.1" + } + } + ] + }, + "version": 1 +} From 5a12b80650be7a5a7c2a1196f3bee21fd443b7b3 Mon Sep 17 00:00:00 2001 From: TomchyshenDenys Date: Tue, 2 Nov 2021 13:58:54 +0200 Subject: [PATCH 4/9] Resolved info.plist warning --- PhotoSlider.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PhotoSlider.xcodeproj/project.pbxproj b/PhotoSlider.xcodeproj/project.pbxproj index 7308209..0a93b6d 100644 --- a/PhotoSlider.xcodeproj/project.pbxproj +++ b/PhotoSlider.xcodeproj/project.pbxproj @@ -212,6 +212,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_INCLUDE_INFOPLIST_LOCALIZATIONS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -269,6 +270,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_INCLUDE_INFOPLIST_LOCALIZATIONS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -328,6 +330,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Info.plist; + INFOPLIST_OUTPUT_FORMAT = "same-as-input"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -356,6 +359,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Info.plist; + INFOPLIST_OUTPUT_FORMAT = "same-as-input"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( From 06e24ef380275b09e9b5cc63a1bc997ae5b16e87 Mon Sep 17 00:00:00 2001 From: TomchyshenDenys Date: Tue, 2 Nov 2021 14:11:14 +0200 Subject: [PATCH 5/9] Resolved info.plist warning --- Package.swift | 1 + PhotoSlider.xcodeproj/project.pbxproj | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index a2fec94..8b3de5f 100644 --- a/Package.swift +++ b/Package.swift @@ -15,6 +15,7 @@ let package = Package( name: "PhotoSlider", dependencies: ["Kingfisher"], path: "Sources", + exclude: ["Info.plist"], resources: [ .process("PhotoSlider.xcassets") ] diff --git a/PhotoSlider.xcodeproj/project.pbxproj b/PhotoSlider.xcodeproj/project.pbxproj index 0a93b6d..bcf4d98 100644 --- a/PhotoSlider.xcodeproj/project.pbxproj +++ b/PhotoSlider.xcodeproj/project.pbxproj @@ -59,8 +59,8 @@ DC0E419E1C317DD50090AC94 = { isa = PBXGroup; children = ( - EF51ECD527315BDD00F8F19B /* Info.plist */, B05F013426AEA670005519C5 /* PhotoSlider.h */, + EF51ECD527315BDD00F8F19B /* Info.plist */, B012C9C626B0E4D800914DF2 /* Package.swift */, DC0E41BF1C317E850090AC94 /* Sources */, DC0E420F1C3184880090AC94 /* Frameworks */, @@ -257,6 +257,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_OUTPUT_FORMAT = "same-as-input"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -309,6 +310,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_OUTPUT_FORMAT = "same-as-input"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; From fb57d25a09c987c63dc0af7bc231da524b3eabb9 Mon Sep 17 00:00:00 2001 From: TomchyshenDenys Date: Tue, 2 Nov 2021 14:16:42 +0200 Subject: [PATCH 6/9] Resolved info.plist warning --- PhotoSlider.xcodeproj/project.pbxproj | 6 +++--- Info.plist => Sources/Info.plist | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename Info.plist => Sources/Info.plist (100%) diff --git a/PhotoSlider.xcodeproj/project.pbxproj b/PhotoSlider.xcodeproj/project.pbxproj index bcf4d98..a7fda66 100644 --- a/PhotoSlider.xcodeproj/project.pbxproj +++ b/PhotoSlider.xcodeproj/project.pbxproj @@ -60,7 +60,6 @@ isa = PBXGroup; children = ( B05F013426AEA670005519C5 /* PhotoSlider.h */, - EF51ECD527315BDD00F8F19B /* Info.plist */, B012C9C626B0E4D800914DF2 /* Package.swift */, DC0E41BF1C317E850090AC94 /* Sources */, DC0E420F1C3184880090AC94 /* Frameworks */, @@ -79,6 +78,7 @@ DC0E41BF1C317E850090AC94 /* Sources */ = { isa = PBXGroup; children = ( + EF51ECD527315BDD00F8F19B /* Info.plist */, EF51ECD627315C1600F8F19B /* PhotoSlider.xcassets */, B012C9C726B0E70600914DF2 /* PhotoSlider */, ); @@ -331,7 +331,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = Sources/Info.plist; INFOPLIST_OUTPUT_FORMAT = "same-as-input"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -360,7 +360,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = Sources/Info.plist; INFOPLIST_OUTPUT_FORMAT = "same-as-input"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; diff --git a/Info.plist b/Sources/Info.plist similarity index 100% rename from Info.plist rename to Sources/Info.plist From 09c393ef5494750bc6ef8f10aaa29d79bd21707a Mon Sep 17 00:00:00 2001 From: TomchyshenDenys Date: Tue, 2 Nov 2021 14:31:51 +0200 Subject: [PATCH 7/9] Resolved info.plist warning --- Package.swift | 2 +- PhotoSlider.xcodeproj/project.pbxproj | 2 ++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++ .../xcshareddata/swiftpm/Package.resolved | 25 +++++++++++++++++++ Sources/{ => Support}/Info.plist | 0 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 PhotoSliderDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 PhotoSliderDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved rename Sources/{ => Support}/Info.plist (100%) diff --git a/Package.swift b/Package.swift index 8b3de5f..0fcc15a 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( name: "PhotoSlider", dependencies: ["Kingfisher"], path: "Sources", - exclude: ["Info.plist"], + exclude: ["Support"], resources: [ .process("PhotoSlider.xcassets") ] diff --git a/PhotoSlider.xcodeproj/project.pbxproj b/PhotoSlider.xcodeproj/project.pbxproj index a7fda66..5cdada7 100644 --- a/PhotoSlider.xcodeproj/project.pbxproj +++ b/PhotoSlider.xcodeproj/project.pbxproj @@ -257,6 +257,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = Sources/Info.plist; INFOPLIST_OUTPUT_FORMAT = "same-as-input"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -310,6 +311,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = Sources/Info.plist; INFOPLIST_OUTPUT_FORMAT = "same-as-input"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/PhotoSliderDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/PhotoSliderDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/PhotoSliderDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/PhotoSliderDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/PhotoSliderDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..239cc42 --- /dev/null +++ b/PhotoSliderDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,25 @@ +{ + "object": { + "pins": [ + { + "package": "Kingfisher", + "repositoryURL": "git@github.com:onevcat/Kingfisher.git", + "state": { + "branch": null, + "revision": "d06df9adf50ed8cde5786d935836a5f445f780ba", + "version": "6.3.1" + } + }, + { + "package": "PhotoSlider", + "repositoryURL": "git@github.com:nakajijapan/PhotoSlider.git", + "state": { + "branch": "master", + "revision": "4e851c21caf9d0775607a49ea1769fc46507c665", + "version": null + } + } + ] + }, + "version": 1 +} diff --git a/Sources/Info.plist b/Sources/Support/Info.plist similarity index 100% rename from Sources/Info.plist rename to Sources/Support/Info.plist From 9013b14d4da03fd24ec0f6b30fc5aa405f8511a9 Mon Sep 17 00:00:00 2001 From: TomchyshenDenys Date: Tue, 2 Nov 2021 14:54:32 +0200 Subject: [PATCH 8/9] Resolved info.plist warning --- PhotoSlider.xcodeproj/project.pbxproj | 22 +++++++++++++------ .../xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/PhotoSlider.xcodeproj/project.pbxproj b/PhotoSlider.xcodeproj/project.pbxproj index 5cdada7..83d1e32 100644 --- a/PhotoSlider.xcodeproj/project.pbxproj +++ b/PhotoSlider.xcodeproj/project.pbxproj @@ -32,8 +32,8 @@ DC0E41F31C3181230090AC94 /* Kingfisher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kingfisher.framework; path = Carthage/Build/iOS/Kingfisher.framework; sourceTree = ""; }; DC0E41FA1C3181EE0090AC94 /* PhotoSlider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PhotoSlider.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DC3EE1DA1D9C96610046AFE2 /* UIImage+PhotoSlider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+PhotoSlider.swift"; sourceTree = ""; }; - EF51ECD527315BDD00F8F19B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; EF51ECD627315C1600F8F19B /* PhotoSlider.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = PhotoSlider.xcassets; sourceTree = ""; }; + EFE7939727316B7E009E98EE /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -78,7 +78,7 @@ DC0E41BF1C317E850090AC94 /* Sources */ = { isa = PBXGroup; children = ( - EF51ECD527315BDD00F8F19B /* Info.plist */, + EFE7939627316B7E009E98EE /* Support */, EF51ECD627315C1600F8F19B /* PhotoSlider.xcassets */, B012C9C726B0E70600914DF2 /* PhotoSlider */, ); @@ -108,6 +108,14 @@ name = Frameworks; sourceTree = ""; }; + EFE7939627316B7E009E98EE /* Support */ = { + isa = PBXGroup; + children = ( + EFE7939727316B7E009E98EE /* Info.plist */, + ); + path = Support; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -257,7 +265,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = ""; INFOPLIST_OUTPUT_FORMAT = "same-as-input"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -311,7 +319,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = ""; INFOPLIST_OUTPUT_FORMAT = "same-as-input"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; @@ -333,7 +341,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = Sources/Support/Info.plist; INFOPLIST_OUTPUT_FORMAT = "same-as-input"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -362,7 +370,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = Sources/Support/Info.plist; INFOPLIST_OUTPUT_FORMAT = "same-as-input"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -410,7 +418,7 @@ repositoryURL = "git@github.com:onevcat/Kingfisher.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 6.3.0; + minimumVersion = 7.0.0; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index aae0975..e4c375e 100644 --- a/PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "git@github.com:onevcat/Kingfisher.git", "state": { "branch": null, - "revision": "d06df9adf50ed8cde5786d935836a5f445f780ba", - "version": "6.3.1" + "revision": "318e319998bf555c3e914d5c3adb6da05af86a32", + "version": "7.1.1" } } ] From 252df982cd688942935bfe0008568df1e0162cfc Mon Sep 17 00:00:00 2001 From: TomchyshenDenys Date: Tue, 2 Nov 2021 15:11:55 +0200 Subject: [PATCH 9/9] Updated Kingsfisher --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 0fcc15a..22ea4ee 100644 --- a/Package.swift +++ b/Package.swift @@ -8,7 +8,7 @@ let package = Package( .library(name: "PhotoSlider", targets: ["PhotoSlider"]) ], dependencies: [ - .package(url: "https://github.com/onevcat/Kingfisher.git", from: "6.3.0") + .package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0") ], targets: [ .target(