diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52d46f9..de4de53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,18 +9,18 @@ env: DEVELOPER_DIR: /Applications/Xcode_15.2.app jobs: build: - runs-on: macos-13 + runs-on: macos-14 steps: - uses: actions/checkout@v3 - name: Build macOS - run: xcodebuild -scheme EasyMetalShader build -destination "generic/platform=macOS" + run: set -o pipefail && xcodebuild -skipMacroValidation -scheme EasyMetalShader build -destination "generic/platform=macOS,arch=arm64,variant=macOS" | xcpretty - name: Build iOS - run: xcodebuild -scheme EasyMetalShader build -destination "generic/platform=iOS" + run: set -o pipefail && xcodebuild -skipMacroValidation -scheme EasyMetalShader build -destination "generic/platform=iOS" | xcpretty test: - runs-on: macos-13 + runs-on: macos-14 steps: - uses: actions/checkout@v3 - name: Test macOS - run: xcodebuild -scheme EasyMetalShaderTests test -destination "platform=macOS,arch=x86_64" + run: set -o pipefail && xcodebuild -skipMacroValidation -scheme EasyMetalShaderTests test -destination "platform=macOS,arch=arm64" | xcpretty - name: Test iOS - run: xcodebuild -scheme EasyMetalShaderTests test -destination "name=iPhone 14 Pro" + run: set -o pipefail && xcodebuild -skipMacroValidation -scheme EasyMetalShaderTests test -destination "platform=iOS" | xcpretty diff --git a/Sources/EasyMetalShaderMacro/EMComputeShader/EMComputeShader+MemberMacro.swift b/Sources/EasyMetalShaderMacro/EMComputeShader/EMComputeShader+MemberMacro.swift index f5699fd..c4e3900 100644 --- a/Sources/EasyMetalShaderMacro/EMComputeShader/EMComputeShader+MemberMacro.swift +++ b/Sources/EasyMetalShaderMacro/EMComputeShader/EMComputeShader+MemberMacro.swift @@ -125,12 +125,12 @@ extension EMComputeShader: MemberMacro { let thisDecl1: DeclSyntax = """ - var computePipelineState: MTLComputePipelineState! + public var computePipelineState: MTLComputePipelineState! """ let thisDecl2: DeclSyntax = """ - var args: [String: EMMetalArgument] = [:] + public var args: [String: EMMetalArgument] = [:] """ let thisDecl3: DeclSyntax = .init(stringLiteral: ComputeFunctionStrings.initFunc(variableInitStrings: initStringList, gidTypeString: "ushort2")) @@ -140,7 +140,7 @@ extension EMComputeShader: MemberMacro { if !hasInitInImplementation { thisDecl4 = """ - init() { + public init() { setup() } """ diff --git a/Sources/EasyMetalShaderMacro/EMComputeShader3D/EMComputeShader3D+MemberMacro.swift b/Sources/EasyMetalShaderMacro/EMComputeShader3D/EMComputeShader3D+MemberMacro.swift index b57b2bb..48bd979 100644 --- a/Sources/EasyMetalShaderMacro/EMComputeShader3D/EMComputeShader3D+MemberMacro.swift +++ b/Sources/EasyMetalShaderMacro/EMComputeShader3D/EMComputeShader3D+MemberMacro.swift @@ -125,12 +125,12 @@ extension EMComputeShader3D: MemberMacro { let thisDecl1: DeclSyntax = """ - var computePipelineState: MTLComputePipelineState! + public var computePipelineState: MTLComputePipelineState! """ let thisDecl2: DeclSyntax = """ - var args: [String: EMMetalArgument] = [:] + public var args: [String: EMMetalArgument] = [:] """ let thisDecl3: DeclSyntax = .init(stringLiteral: ComputeFunctionStrings.initFunc(variableInitStrings: initStringList, gidTypeString: "ushort3")) @@ -140,7 +140,7 @@ extension EMComputeShader3D: MemberMacro { if !hasInitInImplementation { thisDecl4 = """ - init() { + public init() { setup() } """ diff --git a/Sources/EasyMetalShaderMacro/EMRenderShader/EMRenderShader+MemberMacro.swift b/Sources/EasyMetalShaderMacro/EMRenderShader/EMRenderShader+MemberMacro.swift index 00cc1e1..4b744d0 100644 --- a/Sources/EasyMetalShaderMacro/EMRenderShader/EMRenderShader+MemberMacro.swift +++ b/Sources/EasyMetalShaderMacro/EMRenderShader/EMRenderShader+MemberMacro.swift @@ -136,12 +136,12 @@ extension EMRenderShader: MemberMacro { let thisDecl1: DeclSyntax = """ - var renderPipelineState: MTLRenderPipelineState! + public var renderPipelineState: MTLRenderPipelineState! """ let thisDecl2: DeclSyntax = """ - var args: [String: EMMetalArgument] = [:] + public var args: [String: EMMetalArgument] = [:] """ let thisDecl3: DeclSyntax = .init(stringLiteral: RenderFunctionStrings.initFunc(variableInitStrings: initStringList)) @@ -151,7 +151,7 @@ extension EMRenderShader: MemberMacro { if !hasInitInImplementation { thisDecl4 = """ - init(targetPixelFormat: MTLPixelFormat) { + public init(targetPixelFormat: MTLPixelFormat) { setup(targetPixelFormat: targetPixelFormat) } """