From 52f97c56f06a8a0b2bc0d19867efe7690a57e06e Mon Sep 17 00:00:00 2001 From: Antoine Marandon Date: Tue, 4 Jul 2023 10:38:07 +0900 Subject: [PATCH 1/2] Fix demo build --- Dev/Brightroom.xcodeproj/project.pbxproj | 61 ++--- .../xcshareddata/swiftpm/Package.resolved | 249 ++++++++---------- Package.resolved | 52 ---- Package.swift | 6 +- Podfile | 23 -- Podfile.lock | 98 ------- 6 files changed, 141 insertions(+), 348 deletions(-) delete mode 100644 Package.resolved delete mode 100644 Podfile delete mode 100644 Podfile.lock diff --git a/Dev/Brightroom.xcodeproj/project.pbxproj b/Dev/Brightroom.xcodeproj/project.pbxproj index 44df11fb..381af8fc 100644 --- a/Dev/Brightroom.xcodeproj/project.pbxproj +++ b/Dev/Brightroom.xcodeproj/project.pbxproj @@ -32,8 +32,6 @@ 4B4103602611EAB20061A218 /* DemoImitationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41035F2611EAB20061A218 /* DemoImitationsViewController.swift */; }; 4B487E5728EEC0520026A8CF /* BrightroomEngine in Frameworks */ = {isa = PBXBuildFile; productRef = 4B487E5628EEC0520026A8CF /* BrightroomEngine */; }; 4B487E5928EEC0520026A8CF /* BrightroomUI in Frameworks */ = {isa = PBXBuildFile; productRef = 4B487E5828EEC0520026A8CF /* BrightroomUI */; }; - 4B487E5B28EEC0590026A8CF /* BrightroomEngine in Frameworks */ = {isa = PBXBuildFile; productRef = 4B487E5A28EEC0590026A8CF /* BrightroomEngine */; }; - 4B487E5D28EEC0590026A8CF /* BrightroomUI in Frameworks */ = {isa = PBXBuildFile; productRef = 4B487E5C28EEC0590026A8CF /* BrightroomUI */; }; 4B487E5F28EEC0670026A8CF /* BrightroomEngine in Frameworks */ = {isa = PBXBuildFile; productRef = 4B487E5E28EEC0670026A8CF /* BrightroomEngine */; }; 4B487E6128EEC0A40026A8CF /* MosaiqueAssetsPicker in Frameworks */ = {isa = PBXBuildFile; productRef = 4B487E6028EEC0A40026A8CF /* MosaiqueAssetsPicker */; }; 4B487E6C28EECC480026A8CF /* GlossButtonNode in Frameworks */ = {isa = PBXBuildFile; productRef = 4B487E6B28EECC480026A8CF /* GlossButtonNode */; }; @@ -130,6 +128,8 @@ 4BF934202614CAD600E0637A /* CGContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF9341F2614CAD600E0637A /* CGContextTests.swift */; }; 4BF934282614CB6000E0637A /* screenshot-8bit-lcd.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BF934272614CB6000E0637A /* screenshot-8bit-lcd.png */; }; 4BF934412614D08300E0637A /* screenshot-8bit-p3-alpha.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BF934402614D08300E0637A /* screenshot-8bit-p3-alpha.png */; }; + FC06C87F2A53AF4500215B89 /* BrightroomEngine in Frameworks */ = {isa = PBXBuildFile; productRef = FC06C87E2A53AF4500215B89 /* BrightroomEngine */; }; + FC06C8812A53AF4500215B89 /* BrightroomUI in Frameworks */ = {isa = PBXBuildFile; productRef = FC06C8802A53AF4500215B89 /* BrightroomUI */; }; FC110D2B2660F90200CC45EA /* ImageSourceInitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC110D2A2660F90200CC45EA /* ImageSourceInitTest.swift */; }; FC110D8F2660FD5500CC45EA /* 5633ed9d0eb700d0093bf85d86a95ebf.jpg in Resources */ = {isa = PBXBuildFile; fileRef = FC110D2D2660FD2200CC45EA /* 5633ed9d0eb700d0093bf85d86a95ebf.jpg */; }; FC110D902660FD5500CC45EA /* acce3629083f0e348e94fb58f952d3de.jpg in Resources */ = {isa = PBXBuildFile; fileRef = FC110D2E2660FD2200CC45EA /* acce3629083f0e348e94fb58f952d3de.jpg */; }; @@ -1043,8 +1043,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4B487E5D28EEC0590026A8CF /* BrightroomUI in Frameworks */, - 4B487E5B28EEC0590026A8CF /* BrightroomEngine in Frameworks */, + FC06C87F2A53AF4500215B89 /* BrightroomEngine in Frameworks */, + FC06C8812A53AF4500215B89 /* BrightroomUI in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1753,8 +1753,8 @@ ); name = SwiftUIDemo; packageProductDependencies = ( - 4B487E5A28EEC0590026A8CF /* BrightroomEngine */, - 4B487E5C28EEC0590026A8CF /* BrightroomUI */, + FC06C87E2A53AF4500215B89 /* BrightroomEngine */, + FC06C8802A53AF4500215B89 /* BrightroomUI */, ); productName = SwiftUIDemo; productReference = 4B98CCB925EFF31300E4F61F /* SwiftUIDemo.app */; @@ -1771,7 +1771,6 @@ buildRules = ( ); dependencies = ( - 4B487E6328EEC3E50026A8CF /* PBXTargetDependency */, ); name = BrightroomEngineTests; packageProductDependencies = ( @@ -1853,7 +1852,6 @@ ); mainGroup = 4B600AF3216B7A94001E1456; packageReferences = ( - A6ABB4F4260AA8F0006B46ED /* XCRemoteSwiftPackageReference "Verge" */, A6ABB4FA260AA8FB006B46ED /* XCRemoteSwiftPackageReference "TransitionPatch" */, FCA2BEA7278EA24C00050FA4 /* XCRemoteSwiftPackageReference "AssetsPicker" */, 4B487E6A28EECC480026A8CF /* XCRemoteSwiftPackageReference "GlossButtonNode" */, @@ -2435,9 +2433,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 4B487E6328EEC3E50026A8CF /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - }; 4BED49D2261C9BBD0011A98F /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4BED49C7261C9BBD0011A98F /* Import LUT */; @@ -2522,7 +2517,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -2582,7 +2577,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "app.muukii.brightroom.$(TARGET_NAME)"; @@ -2605,6 +2600,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = KU2QEJ9K3Z; INFOPLIST_FILE = "$(SRCROOT)/Sources/Demo/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2625,6 +2621,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = KU2QEJ9K3Z; INFOPLIST_FILE = "$(SRCROOT)/Sources/Demo/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2643,7 +2640,7 @@ CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = "\"Sources/SwiftUIDemo/Preview Content\""; - DEVELOPMENT_TEAM = KU2QEJ9K3Z; + DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = Sources/SwiftUIDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -2665,7 +2662,7 @@ CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = "\"Sources/SwiftUIDemo/Preview Content\""; - DEVELOPMENT_TEAM = KU2QEJ9K3Z; + DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = Sources/SwiftUIDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; @@ -2687,6 +2684,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = GKNHX9R5U2; INFOPLIST_FILE = "Tests/$(TARGET_NAME)/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2706,6 +2704,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = GKNHX9R5U2; INFOPLIST_FILE = "Tests/$(TARGET_NAME)/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2724,6 +2723,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = KU2QEJ9K3Z; INFOPLIST_FILE = "$(SRCROOT)/Bundle/LUTs/Import LUT/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2744,6 +2744,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = KU2QEJ9K3Z; INFOPLIST_FILE = "$(SRCROOT)/Bundle/LUTs/Import LUT/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2764,6 +2765,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = KU2QEJ9K3Z; INFOPLIST_FILE = Bundle/LUTs/ShareLUT/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2784,6 +2786,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = KU2QEJ9K3Z; INFOPLIST_FILE = Bundle/LUTs/ShareLUT/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2869,8 +2872,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/muukii/MondrianLayout.git"; requirement = { - branch = main; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 0.9.0; }; }; 4B487E7028EECCB10026A8CF /* XCRemoteSwiftPackageReference "TextureSwiftSupport" */ = { @@ -2881,14 +2884,6 @@ kind = branch; }; }; - A6ABB4F4260AA8F0006B46ED /* XCRemoteSwiftPackageReference "Verge" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/VergeGroup/Verge.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 10.1.0; - }; - }; A6ABB4FA260AA8FB006B46ED /* XCRemoteSwiftPackageReference "TransitionPatch" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/muukii/TransitionPatch.git"; @@ -2916,14 +2911,6 @@ isa = XCSwiftPackageProductDependency; productName = BrightroomUI; }; - 4B487E5A28EEC0590026A8CF /* BrightroomEngine */ = { - isa = XCSwiftPackageProductDependency; - productName = BrightroomEngine; - }; - 4B487E5C28EEC0590026A8CF /* BrightroomUI */ = { - isa = XCSwiftPackageProductDependency; - productName = BrightroomUI; - }; 4B487E5E28EEC0670026A8CF /* BrightroomEngine */ = { isa = XCSwiftPackageProductDependency; productName = BrightroomEngine; @@ -2948,6 +2935,14 @@ package = 4B487E7028EECCB10026A8CF /* XCRemoteSwiftPackageReference "TextureSwiftSupport" */; productName = TextureSwiftSupport; }; + FC06C87E2A53AF4500215B89 /* BrightroomEngine */ = { + isa = XCSwiftPackageProductDependency; + productName = BrightroomEngine; + }; + FC06C8802A53AF4500215B89 /* BrightroomUI */ = { + isa = XCSwiftPackageProductDependency; + productName = BrightroomUI; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 4B600AF4216B7A94001E1456 /* Project object */; diff --git a/Dev/Brightroom.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Dev/Brightroom.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index e97d41a4..ba3424c0 100644 --- a/Dev/Brightroom.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Dev/Brightroom.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,142 +1,113 @@ { - "object": { - "pins": [ - { - "package": "MosaiqueAssetsPicker", - "repositoryURL": "https://github.com/eure/AssetsPicker.git", - "state": { - "branch": "master", - "revision": "7908a947243c9fb8014ab8ce85095f61edf2b113", - "version": null - } - }, - { - "package": "Descriptors", - "repositoryURL": "https://github.com/FluidGroup/Descriptors", - "state": { - "branch": null, - "revision": "f41ce2605a76c5d378fe8c5e8c5c98b544dfd108", - "version": "0.2.3" - } - }, - { - "package": "GlossButtonNode", - "repositoryURL": "https://github.com/FluidGroup/GlossButtonNode", - "state": { - "branch": "main", - "revision": "b509307ce86999f281d7c5cee17fec2e1179a5d5", - "version": null - } - }, - { - "package": "IGListKit", - "repositoryURL": "https://github.com/3a4oT/IGListKit", - "state": { - "branch": "spmNumber10", - "revision": "979eca9b2da15e35af36f4613452dd6e07641969", - "version": null - } - }, - { - "package": "libwebp", - "repositoryURL": "https://github.com/SDWebImage/libwebp-Xcode", - "state": { - "branch": null, - "revision": "0f3bdb28a1edc5e8e43876d3835d20c601ef331f", - "version": "1.2.3" - } - }, - { - "package": "MondrianLayout", - "repositoryURL": "https://github.com/muukii/MondrianLayout.git", - "state": { - "branch": "main", - "revision": "b26edaa5a469bc5fd58f9afe37d257ca1b3771e0", - "version": null - } - }, - { - "package": "PINCache", - "repositoryURL": "https://github.com/pinterest/PINCache.git", - "state": { - "branch": null, - "revision": "875c654984fb52b47ca65ae70d24852b0003ccd9", - "version": "3.0.3" - } - }, - { - "package": "PINOperation", - "repositoryURL": "https://github.com/pinterest/PINOperation.git", - "state": { - "branch": null, - "revision": "44d8ca154a4e75a028a5548c31ff3a53b90cef15", - "version": "1.2.1" - } - }, - { - "package": "PINRemoteImage", - "repositoryURL": "https://github.com/pinterest/PINRemoteImage.git", - "state": { - "branch": "master", - "revision": "18637e4414d77fbc95cd7d499179a9880e9a78d8", - "version": null - } - }, - { - "package": "RxSwift", - "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", - "state": { - "branch": null, - "revision": "b4307ba0b6425c0ba4178e138799946c3da594f8", - "version": "6.5.0" - } - }, - { - "package": "swift-atomics", - "repositoryURL": "https://github.com/apple/swift-atomics.git", - "state": { - "branch": null, - "revision": "ff3d2212b6b093db7f177d0855adbc4ef9c5f036", - "version": "1.0.3" - } - }, - { - "package": "Texture", - "repositoryURL": "https://github.com/FluidGroup/Texture.git", - "state": { - "branch": "spm", - "revision": "5d03875bcfb0d87f8057ebeb5f2f6e4527e18128", - "version": null - } - }, - { - "package": "TextureSwiftSupport", - "repositoryURL": "https://github.com/FluidGroup/TextureSwiftSupport", - "state": { - "branch": "main", - "revision": "775e0336d096f3299caff9905a06c0ced40e687f", - "version": null - } - }, - { - "package": "TransitionPatch", - "repositoryURL": "https://github.com/muukii/TransitionPatch.git", - "state": { - "branch": null, - "revision": "88aac5305fe568ef62f73a3cf19f0b8392ffb52c", - "version": "1.0.5" - } - }, - { - "package": "Verge", - "repositoryURL": "https://github.com/VergeGroup/Verge.git", - "state": { - "branch": null, - "revision": "4e5938313601f8522c1146b5fbaaa0aada6820b6", - "version": "10.1.1" - } + "pins" : [ + { + "identity" : "assetspicker", + "kind" : "remoteSourceControl", + "location" : "https://github.com/eure/AssetsPicker.git", + "state" : { + "branch" : "master", + "revision" : "7908a947243c9fb8014ab8ce85095f61edf2b113" } - ] - }, - "version": 1 + }, + { + "identity" : "descriptors", + "kind" : "remoteSourceControl", + "location" : "https://github.com/FluidGroup/Descriptors", + "state" : { + "revision" : "f41ce2605a76c5d378fe8c5e8c5c98b544dfd108", + "version" : "0.2.3" + } + }, + { + "identity" : "glossbuttonnode", + "kind" : "remoteSourceControl", + "location" : "https://github.com/FluidGroup/GlossButtonNode", + "state" : { + "branch" : "main", + "revision" : "b509307ce86999f281d7c5cee17fec2e1179a5d5" + } + }, + { + "identity" : "mondrianlayout", + "kind" : "remoteSourceControl", + "location" : "https://github.com/muukii/MondrianLayout.git", + "state" : { + "revision" : "5f00b13984fe08316fc5b5be06e2f41c14a3befa", + "version" : "0.10.0" + } + }, + { + "identity" : "rxswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ReactiveX/RxSwift.git", + "state" : { + "revision" : "9dcaa4b333db437b0fbfaf453fad29069044a8b4", + "version" : "6.6.0" + } + }, + { + "identity" : "swift-atomics", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-atomics.git", + "state" : { + "revision" : "6c89474e62719ddcc1e9614989fff2f68208fe10", + "version" : "1.1.0" + } + }, + { + "identity" : "swift-collections", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-collections", + "state" : { + "branch" : "main", + "revision" : "939cfd25234472b4dc91c3caeab304d15bca9a73" + } + }, + { + "identity" : "swift-concurrency-task-manager", + "kind" : "remoteSourceControl", + "location" : "https://github.com/VergeGroup/swift-concurrency-task-manager", + "state" : { + "revision" : "9f686139a7d08ecca12d64a7a9bdf81cb1a1c986", + "version" : "1.2.0" + } + }, + { + "identity" : "texture", + "kind" : "remoteSourceControl", + "location" : "https://github.com/FluidGroup/Texture.git", + "state" : { + "branch" : "spm", + "revision" : "17e0b467fe7360cfb29f2612785acf60e86775e9" + } + }, + { + "identity" : "textureswiftsupport", + "kind" : "remoteSourceControl", + "location" : "https://github.com/FluidGroup/TextureSwiftSupport", + "state" : { + "branch" : "main", + "revision" : "cc10f020f3f765a12b279fc0984f9b061ccd2485" + } + }, + { + "identity" : "transitionpatch", + "kind" : "remoteSourceControl", + "location" : "https://github.com/muukii/TransitionPatch.git", + "state" : { + "revision" : "88aac5305fe568ef62f73a3cf19f0b8392ffb52c", + "version" : "1.0.5" + } + }, + { + "identity" : "verge", + "kind" : "remoteSourceControl", + "location" : "https://github.com/VergeGroup/Verge.git", + "state" : { + "branch" : "main", + "revision" : "945f6348fa1a7f16850f475e1c6fcda5f950876a" + } + } + ], + "version" : 2 } diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index 93e0d29a..00000000 --- a/Package.resolved +++ /dev/null @@ -1,52 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "RxSwift", - "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", - "state": { - "branch": null, - "revision": "7e01c05f25c025143073eaa3be3532f9375c614b", - "version": "6.1.0" - } - }, - { - "package": "swift-atomics", - "repositoryURL": "https://github.com/apple/swift-atomics.git", - "state": { - "branch": null, - "revision": "ff3d2212b6b093db7f177d0855adbc4ef9c5f036", - "version": "1.0.3" - } - }, - { - "package": "swift-collections", - "repositoryURL": "https://github.com/apple/swift-collections", - "state": { - "branch": null, - "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2", - "version": "1.0.4" - } - }, - { - "package": "TransitionPatch", - "repositoryURL": "https://github.com/FluidGroup/TransitionPatch.git", - "state": { - "branch": null, - "revision": "88aac5305fe568ef62f73a3cf19f0b8392ffb52c", - "version": "1.0.5" - } - }, - { - "package": "Verge", - "repositoryURL": "https://github.com/VergeGroup/Verge.git", - "state": { - "branch": null, - "revision": "b380ac6505b6b58e4181b7ae5cf9b65948790bf8", - "version": "11.0.0-beta.5" - } - } - ] - }, - "version": 1 -} diff --git a/Package.swift b/Package.swift index 6d2415ed..780f2135 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.7 import PackageDescription let package = Package( @@ -11,7 +11,7 @@ let package = Package( .library(name: "BrightroomUI", targets: ["BrightroomUI"]), ], dependencies: [ - .package(name: "Verge", url: "https://github.com/VergeGroup/Verge.git", from: "11.0.0-beta.5"), + .package(url: "https://github.com/VergeGroup/Verge.git", branch: "main"), .package(url: "https://github.com/FluidGroup/TransitionPatch.git", from: "1.0.3") ], targets: [ @@ -19,7 +19,7 @@ let package = Package( name: "BrightroomEngine", dependencies: ["Verge"], exclude: ["Info.plist"] - ), + ), .target( name: "BrightroomUI", dependencies: ["BrightroomEngine", "Verge", "TransitionPatch"], diff --git a/Podfile b/Podfile deleted file mode 100644 index a4509221..00000000 --- a/Podfile +++ /dev/null @@ -1,23 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, "12.0" - -project 'Brightroom.xcodeproj' - -abstract_target 'Demo_Apps' do - - use_frameworks! - pod "Reveal-SDK" - pod "SwiftGen" - - target "Demo" do - pod "Texture" - pod "GlossButtonNode" - pod "TextureSwiftSupport" - pod "TinyConstraints" - end - - target "SwiftUIDemo" do - use_frameworks! - end - -end diff --git a/Podfile.lock b/Podfile.lock deleted file mode 100644 index 495dfc2e..00000000 --- a/Podfile.lock +++ /dev/null @@ -1,98 +0,0 @@ -PODS: - - Descriptors (0.2.1): - - Descriptors/Core (= 0.2.1) - - Descriptors/Core (0.2.1) - - GlossButtonNode (3.1.2): - - Texture/Core (~> 3) - - TextureSwiftSupport (>= 3.10.0) - - PINCache (3.0.3): - - PINCache/Arc-exception-safe (= 3.0.3) - - PINCache/Core (= 3.0.3) - - PINCache/Arc-exception-safe (3.0.3): - - PINCache/Core - - PINCache/Core (3.0.3): - - PINOperation (~> 1.2.1) - - PINOperation (1.2.1) - - PINRemoteImage/Core (3.0.3): - - PINOperation - - PINRemoteImage/iOS (3.0.3): - - PINRemoteImage/Core - - PINRemoteImage/PINCache (3.0.3): - - PINCache (~> 3.0.3) - - PINRemoteImage/Core - - Reveal-SDK (38) - - SwiftGen (6.6.2) - - Texture (3.1.0): - - Texture/AssetsLibrary (= 3.1.0) - - Texture/Core (= 3.1.0) - - Texture/MapKit (= 3.1.0) - - Texture/Photos (= 3.1.0) - - Texture/PINRemoteImage (= 3.1.0) - - Texture/Video (= 3.1.0) - - Texture/AssetsLibrary (3.1.0): - - Texture/Core - - Texture/Core (3.1.0) - - Texture/MapKit (3.1.0): - - Texture/Core - - Texture/Photos (3.1.0): - - Texture/Core - - Texture/PINRemoteImage (3.1.0): - - PINRemoteImage/iOS (~> 3.0.0) - - PINRemoteImage/PINCache - - Texture/Core - - Texture/Video (3.1.0): - - Texture/Core - - TextureSwiftSupport (3.17.0): - - Texture/Core (>= 3) - - TextureSwiftSupport/Components (= 3.17.0) - - TextureSwiftSupport/Experiments (= 3.17.0) - - TextureSwiftSupport/Extensions (= 3.17.0) - - TextureSwiftSupport/LayoutSpecBuilders (= 3.17.0) - - TextureSwiftSupport/Components (3.17.0): - - Descriptors (>= 0.2.1) - - Texture/Core (>= 3) - - TextureSwiftSupport/LayoutSpecBuilders - - TextureSwiftSupport/Experiments (3.17.0): - - Texture/Core (>= 3) - - TextureSwiftSupport/Extensions (3.17.0): - - Texture/Core (>= 3) - - TextureSwiftSupport/LayoutSpecBuilders (3.17.0): - - Texture/Core (>= 3) - - TinyConstraints (4.0.2) - -DEPENDENCIES: - - GlossButtonNode - - Reveal-SDK - - SwiftGen - - Texture - - TextureSwiftSupport - - TinyConstraints - -SPEC REPOS: - trunk: - - Descriptors - - GlossButtonNode - - PINCache - - PINOperation - - PINRemoteImage - - Reveal-SDK - - SwiftGen - - Texture - - TextureSwiftSupport - - TinyConstraints - -SPEC CHECKSUMS: - Descriptors: 44f9f316368c2815048b1062e0be49be59c1c696 - GlossButtonNode: 4ea1197a744f2fb5fb875fe31caf17ded4762e8f - PINCache: 7a8fc1a691173d21dbddbf86cd515de6efa55086 - PINOperation: 00c935935f1e8cf0d1e2d6b542e75b88fc3e5e20 - PINRemoteImage: f1295b29f8c5e640e25335a1b2bd9d805171bd01 - Reveal-SDK: 685ccb1f3cdb0b1d2926ec0b29f0eeb43d2240a3 - SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c - Texture: 2e8ab2519452515f7f5a520f5a8f7e0a413abfa3 - TextureSwiftSupport: 22741c367e22744e8e9a90347bde6550a0229888 - TinyConstraints: 7b7ccc0c485bb3bb47082138ff28bc33cd49897f - -PODFILE CHECKSUM: 07aa55f54421f6e6d3a920c11716a89fc9243d1b - -COCOAPODS: 1.11.3 From 0d71818e0102f3f9aa3538a584acd04b0bf96e89 Mon Sep 17 00:00:00 2001 From: Muukii Date: Tue, 4 Jul 2023 11:29:50 +0900 Subject: [PATCH 2/2] Update Packages --- Package.resolved | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ Package.swift | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 00000000..ba672067 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,59 @@ +{ + "pins" : [ + { + "identity" : "rxswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ReactiveX/RxSwift.git", + "state" : { + "revision" : "7e01c05f25c025143073eaa3be3532f9375c614b", + "version" : "6.1.0" + } + }, + { + "identity" : "swift-atomics", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-atomics.git", + "state" : { + "revision" : "ff3d2212b6b093db7f177d0855adbc4ef9c5f036", + "version" : "1.0.3" + } + }, + { + "identity" : "swift-collections", + "kind" : "remoteSourceControl", + "location" : "https://github.com/FluidGroup/swift-collections", + "state" : { + "revision" : "939cfd25234472b4dc91c3caeab304d15bca9a73", + "version" : "1.1.0" + } + }, + { + "identity" : "swift-concurrency-task-manager", + "kind" : "remoteSourceControl", + "location" : "https://github.com/VergeGroup/swift-concurrency-task-manager", + "state" : { + "revision" : "9f686139a7d08ecca12d64a7a9bdf81cb1a1c986", + "version" : "1.2.0" + } + }, + { + "identity" : "transitionpatch", + "kind" : "remoteSourceControl", + "location" : "https://github.com/FluidGroup/TransitionPatch.git", + "state" : { + "revision" : "88aac5305fe568ef62f73a3cf19f0b8392ffb52c", + "version" : "1.0.5" + } + }, + { + "identity" : "verge", + "kind" : "remoteSourceControl", + "location" : "https://github.com/VergeGroup/Verge.git", + "state" : { + "revision" : "ee68d135a7af556a272d0c857907fa391728a9d5", + "version" : "11.5.3" + } + } + ], + "version" : 2 +} diff --git a/Package.swift b/Package.swift index 780f2135..13d4eaa5 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ let package = Package( .library(name: "BrightroomUI", targets: ["BrightroomUI"]), ], dependencies: [ - .package(url: "https://github.com/VergeGroup/Verge.git", branch: "main"), + .package(url: "https://github.com/VergeGroup/Verge.git", from: "11.5.3"), .package(url: "https://github.com/FluidGroup/TransitionPatch.git", from: "1.0.3") ], targets: [