diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c59ec1b..dd8c875 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,5 +1,5 @@ -# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions -# https://github.com/actions/virtual-environments/blob/master/images/macos +# https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions +# https://github.com/actions/runner-images/tree/main/images/macos name: CI on: @@ -10,40 +10,47 @@ on: pull_request: env: - DEVELOPER_DIR: /Applications/Xcode_15.0.app + DEVELOPER_DIR: /Applications/Xcode_26.0.app jobs: + build-package: + runs-on: macos-26 + steps: + - uses: actions/checkout@v4 + - name: Build package + run: make build-package + build-SwiftUI-Basic: - runs-on: macos-13 + runs-on: macos-26 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build SwiftUI-Basic run: make build-SwiftUI-Basic build-SwiftUI-Gallery: - runs-on: macos-13 + runs-on: macos-26 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build SwiftUI-Gallery run: make build-SwiftUI-Gallery build-UIKit-Gallery: - runs-on: macos-13 + runs-on: macos-26 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build UIKit-Gallery run: make build-UIKit-Gallery build-Favorite-Sync: - runs-on: macos-13 + runs-on: macos-26 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build Favorite-Sync run: make build-Favorite-Sync build-VideoPlayer: - runs-on: macos-13 + runs-on: macos-26 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build VideoPlayer run: make build-VideoPlayer diff --git a/Examples/Favorite-Sync/Actomaton-Favorite-Sync.xcodeproj/project.pbxproj b/Examples/Favorite-Sync/Actomaton-Favorite-Sync.xcodeproj/project.pbxproj index 2297ea7..a557043 100644 --- a/Examples/Favorite-Sync/Actomaton-Favorite-Sync.xcodeproj/project.pbxproj +++ b/Examples/Favorite-Sync/Actomaton-Favorite-Sync.xcodeproj/project.pbxproj @@ -345,7 +345,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.2; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -400,7 +400,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.2; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -426,7 +426,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -456,7 +456,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/Examples/Favorite-Sync/Actomaton-Favorite-Sync.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/Favorite-Sync/Actomaton-Favorite-Sync.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f0af810..b927d17 100644 --- a/Examples/Favorite-Sync/Actomaton-Favorite-Sync.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Examples/Favorite-Sync/Actomaton-Favorite-Sync.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/inamiy/Actomaton", "state" : { - "revision" : "e51e5ea17f3fb31f4d98eaab1d044f33d4c02386", - "version" : "0.8.0" + "branch" : "main", + "revision" : "2495542d31ee0342ee231099141978572bd00d10" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/inamiy/OrientationKit", "state" : { - "revision" : "491927e9cc835c0fcc7eac349c0245024f5d8579", - "version" : "0.1.0" + "revision" : "0341a47ce116cf6a25a164981ecb1de28f06ea53", + "version" : "0.2.0" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-case-paths", "state" : { - "revision" : "a09839348486db8866f85a727b8550be1d671c50", - "version" : "0.9.1" + "revision" : "bb436421f57269fbcfe7360735985321585a86e5", + "version" : "0.10.1" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-custom-dump", "state" : { - "revision" : "21ec1d717c07cea5a026979cb0471dd95c7087e7", - "version" : "0.5.0" + "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c", + "version" : "1.3.0" } }, { @@ -77,8 +77,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "ef8e14e7ce1c0c304c644c6ba365d06c468ded6b", - "version" : "0.3.3" + "revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad", + "version" : "1.9.0" } } ], diff --git a/Examples/SwiftUI-Gallery/Actomaton-Gallery.xcodeproj/project.pbxproj b/Examples/SwiftUI-Gallery/Actomaton-Gallery.xcodeproj/project.pbxproj index 85b9de5..98d1450 100644 --- a/Examples/SwiftUI-Gallery/Actomaton-Gallery.xcodeproj/project.pbxproj +++ b/Examples/SwiftUI-Gallery/Actomaton-Gallery.xcodeproj/project.pbxproj @@ -308,7 +308,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -353,16 +353,13 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - OTHER_LDFLAGS = ( - "-Xlinker", - "-interposable", - ); + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.inamiy.Actomaton-Gallery"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Examples/SwiftUI-Gallery/Actomaton-Gallery.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/SwiftUI-Gallery/Actomaton-Gallery.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a304a20..8d32d39 100644 --- a/Examples/SwiftUI-Gallery/Actomaton-Gallery.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Examples/SwiftUI-Gallery/Actomaton-Gallery.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/inamiy/Actomaton", "state" : { - "revision" : "28d1c1bd8da017148b920e066845f8b8e20948fc", - "version" : "0.9.0" + "branch" : "main", + "revision" : "2495542d31ee0342ee231099141978572bd00d10" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-custom-dump", "state" : { - "revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1", - "version" : "1.3.3" + "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c", + "version" : "1.3.0" } }, { diff --git a/Examples/UIKit-Gallery/Actomaton-UIKit-Gallery.xcodeproj/project.pbxproj b/Examples/UIKit-Gallery/Actomaton-UIKit-Gallery.xcodeproj/project.pbxproj index 090d8ac..42222a0 100644 --- a/Examples/UIKit-Gallery/Actomaton-UIKit-Gallery.xcodeproj/project.pbxproj +++ b/Examples/UIKit-Gallery/Actomaton-UIKit-Gallery.xcodeproj/project.pbxproj @@ -201,7 +201,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -256,7 +256,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; diff --git a/Examples/UIKit-Gallery/Actomaton-UIKit-Gallery.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/UIKit-Gallery/Actomaton-UIKit-Gallery.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 97c80ea..46b8765 100644 --- a/Examples/UIKit-Gallery/Actomaton-UIKit-Gallery.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Examples/UIKit-Gallery/Actomaton-UIKit-Gallery.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/inamiy/Actomaton", "state" : { - "revision" : "e51e5ea17f3fb31f4d98eaab1d044f33d4c02386", - "version" : "0.8.0" + "branch" : "main", + "revision" : "2495542d31ee0342ee231099141978572bd00d10" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/inamiy/OrientationKit", "state" : { - "revision" : "491927e9cc835c0fcc7eac349c0245024f5d8579", - "version" : "0.1.0" + "revision" : "0341a47ce116cf6a25a164981ecb1de28f06ea53", + "version" : "0.2.0" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-custom-dump", "state" : { - "revision" : "21ec1d717c07cea5a026979cb0471dd95c7087e7", - "version" : "0.5.0" + "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c", + "version" : "1.3.0" } }, { @@ -68,8 +68,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "ef8e14e7ce1c0c304c644c6ba365d06c468ded6b", - "version" : "0.3.3" + "revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad", + "version" : "1.9.0" } } ], diff --git a/Examples/VideoPlayer/Actomaton-VideoPlayer.xcodeproj/project.pbxproj b/Examples/VideoPlayer/Actomaton-VideoPlayer.xcodeproj/project.pbxproj index 9d54554..704d906 100644 --- a/Examples/VideoPlayer/Actomaton-VideoPlayer.xcodeproj/project.pbxproj +++ b/Examples/VideoPlayer/Actomaton-VideoPlayer.xcodeproj/project.pbxproj @@ -287,7 +287,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.2; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -342,7 +342,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.2; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -369,7 +369,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -401,7 +401,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/Examples/VideoPlayer/Actomaton-VideoPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/VideoPlayer/Actomaton-VideoPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f0af810..a51872b 100644 --- a/Examples/VideoPlayer/Actomaton-VideoPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Examples/VideoPlayer/Actomaton-VideoPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/inamiy/Actomaton", "state" : { - "revision" : "e51e5ea17f3fb31f4d98eaab1d044f33d4c02386", - "version" : "0.8.0" + "branch" : "main", + "revision" : "2495542d31ee0342ee231099141978572bd00d10" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/inamiy/OrientationKit", "state" : { - "revision" : "491927e9cc835c0fcc7eac349c0245024f5d8579", - "version" : "0.1.0" + "revision" : "0341a47ce116cf6a25a164981ecb1de28f06ea53", + "version" : "0.2.0" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-custom-dump", "state" : { - "revision" : "21ec1d717c07cea5a026979cb0471dd95c7087e7", - "version" : "0.5.0" + "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c", + "version" : "1.3.0" } }, { @@ -77,8 +77,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "ef8e14e7ce1c0c304c644c6ba365d06c468ded6b", - "version" : "0.3.3" + "revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad", + "version" : "1.9.0" } } ], diff --git a/Examples/VideoPlayer/Actomaton-VideoPlayer/Root/RootReducer.swift b/Examples/VideoPlayer/Actomaton-VideoPlayer/Root/RootReducer.swift index 548f7ed..4683279 100644 --- a/Examples/VideoPlayer/Actomaton-VideoPlayer/Root/RootReducer.swift +++ b/Examples/VideoPlayer/Actomaton-VideoPlayer/Root/RootReducer.swift @@ -55,7 +55,9 @@ func rootReducer() -> Reducer let startTime = CFAbsoluteTimeGetCurrent() // NOTE: `AVPlayerItem` will require `Sendable` in order to instantiate in background. - let playerItem = AVPlayerItem(asset: asset) + typealias PlayerItemInit = @MainActor (AVAsset, [AVPartialAsyncProperty]) -> AVPlayerItem + let makeItem: PlayerItemInit = AVPlayerItem.init(asset:automaticallyLoadedAssetKeys:) + let playerItem = makeItem(asset, []) let playerItemInitTime = CFAbsoluteTimeGetCurrent() - startTime player.replaceCurrentItem(with: playerItem) diff --git a/Makefile b/Makefile index 063a0f0..3fec9a7 100644 --- a/Makefile +++ b/Makefile @@ -1,35 +1,29 @@ -DESTINATION := -destination 'platform=iOS Simulator,name=iPhone 15 Pro' +DESTINATION := -destination 'platform=iOS Simulator,name=iPhone 17 Pro' # NOTE: Only supports iOS, so `swift build` won't work. .PHONY: build-package build-package: - xcodebuild build -scheme Actomaton-Gallery-Package $(DESTINATION) | xcpretty - + xcodebuild build -scheme Actomaton-Gallery-Package $(DESTINATION) .PHONY: build-SwiftUI-Basic build-SwiftUI-Basic: cd Examples/Actomaton-Basic.swiftpm && \ - xcodebuild build -scheme Actomaton-Basic $(DESTINATION) | xcpretty - + xcodebuild build -scheme Actomaton-Basic $(DESTINATION) .PHONY: build-SwiftUI-Gallery build-SwiftUI-Gallery: cd Examples/SwiftUI-Gallery/ && \ - xcodebuild build -scheme Actomaton-Gallery $(DESTINATION) | xcpretty - + xcodebuild build -scheme Actomaton-Gallery $(DESTINATION) .PHONY: build-UIKit-Gallery build-UIKit-Gallery: cd Examples/UIKit-Gallery/ && \ - xcodebuild build -scheme Actomaton-UIKit-Gallery $(DESTINATION) | xcpretty - + xcodebuild build -scheme Actomaton-UIKit-Gallery $(DESTINATION) .PHONY: build-Favorite-Sync build-Favorite-Sync: cd Examples/Favorite-Sync/ && \ - xcodebuild build -scheme Actomaton-Favorite-Sync $(DESTINATION) | xcpretty - + xcodebuild build -scheme Actomaton-Favorite-Sync $(DESTINATION) .PHONY: build-VideoPlayer build-VideoPlayer: cd Examples/VideoPlayer/ && \ - xcodebuild build -scheme Actomaton-VideoPlayer $(DESTINATION) | xcpretty - + xcodebuild build -scheme Actomaton-VideoPlayer $(DESTINATION) .PHONY: build-all build-all: build-package build-SwiftUI-Basic build-SwiftUI-Gallery build-UIKit-Gallery build-Favorite-Sync build-VideoPlayer diff --git a/Package.resolved b/Package.resolved index 98aa953..233e19a 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/inamiy/Actomaton", "state" : { - "revision" : "e51e5ea17f3fb31f4d98eaab1d044f33d4c02386", - "version" : "0.8.0" + "branch" : "main", + "revision" : "2495542d31ee0342ee231099141978572bd00d10" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/inamiy/OrientationKit", "state" : { - "revision" : "491927e9cc835c0fcc7eac349c0245024f5d8579", - "version" : "0.1.0" + "revision" : "0341a47ce116cf6a25a164981ecb1de28f06ea53", + "version" : "0.2.0" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-case-paths", "state" : { - "revision" : "c3a42e8d1a76ff557cf565ed6d8b0aee0e6e75af", - "version" : "0.11.0" + "revision" : "bb436421f57269fbcfe7360735985321585a86e5", + "version" : "0.10.1" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-custom-dump", "state" : { - "revision" : "ead7d30cc224c3642c150b546f4f1080d1c411a8", - "version" : "0.6.1" + "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c", + "version" : "1.3.0" } }, { @@ -68,8 +68,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "16b23a295fa322eb957af98037f86791449de60f", - "version" : "0.8.1" + "revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad", + "version" : "1.9.0" } } ], diff --git a/Package.swift b/Package.swift index ea0acf7..4ef6911 100644 --- a/Package.swift +++ b/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "Actomaton-Gallery", - platforms: [.macOS(.v12), .iOS(.v15), .watchOS(.v8), .tvOS(.v15)], + platforms: [.macOS("15.4"), .iOS("18.4"), .watchOS("11.4"), .tvOS("18.4")], products: [ .library( name: "SwiftUI-Gallery", @@ -19,11 +19,14 @@ let package = Package( ], dependencies: [ // .package(name: "Actomaton", path: "../Actomaton"), // local - .package(url: "https://github.com/inamiy/Actomaton", from: "0.9.0"), + .package(url: "https://github.com/inamiy/Actomaton", branch: "main"), +// .package(url: "https://github.com/inamiy/Actomaton", from: "0.9.0"), .package(url: "https://github.com/inamiy/OrientationKit", from: "0.2.0"), .package(url: "https://github.com/inamiy/SwiftUI-PhotoPicker", branch: "main"), .package(url: "https://github.com/inamiy/AVFoundation-Combine", branch: "main"), - .package(url: "https://github.com/nicklockwood/VectorMath", from: "0.4.1") + .package(url: "https://github.com/nicklockwood/VectorMath", from: "0.4.1"), + // Pin to 1.3.0 to avoid swift-issue-reporting vs xctest-dynamic-overlay target conflict. + .package(url: "https://github.com/pointfreeco/swift-custom-dump", exact: "1.3.0") ], targets: [ .target(