diff --git a/.github/workflows/custom-build.yml b/.github/workflows/custom-build.yml index 4f8d69c..9cbdfbd 100644 --- a/.github/workflows/custom-build.yml +++ b/.github/workflows/custom-build.yml @@ -176,8 +176,8 @@ jobs: -f ${{ steps.strings.outputs.build-dir }} -b ${{ steps.strings.outputs.build-output-dir }} - - name: Build for iOS and xrOS - if: ${{ matrix.os == 'macos-latest' && (matrix.target_platform == 'ios' || matrix.target_platform == 'xros') }} + - name: Build for macOS iOS and xrOS + if: ${{ matrix.os == 'macos-latest' && (matrix.target_platform == 'macos' || matrix.target_platform == 'ios' || matrix.target_platform == 'xros') }} run: > sh scripts/build.sh -p ${{ matrix.target_platform }} -v ${{ inputs.build_version }} @@ -185,12 +185,6 @@ jobs: -f ${{ steps.strings.outputs.build-dir }} -b ${{ steps.strings.outputs.build-output-dir }} - - name: Build for macOS - if: ${{ matrix.os == 'macos-latest' && (matrix.target_platform == 'macos') }} - run: | - sh scripts/build.sh -p ${{ matrix.target_platform }} -v ${{ inputs.build_version }} -t ${{ inputs.build_type }} -f ${{ steps.strings.outputs.build-dir }} -b ${{ steps.strings.outputs.build-output-dir }} - sh scripts/build.sh -p ${{ matrix.target_platform }} -v ${{ inputs.build_version }} -t ${{ inputs.build_type }} -f ${{ steps.strings.outputs.build-dir }} -b ${{ steps.strings.outputs.build-output-dir }} --no-framework - - name: Upload artifacts if: ${{ inputs.upload_artifacts == true }} uses: actions/upload-artifact@v4 diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index 37bbc32..1c7d1aa 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -81,7 +81,7 @@ set_target_properties(${TRAA_LIBRARY_MAIN} PROPERTIES # platform flags if(APPLE) - set(TRAA_LIBRARY_IDENTIFIER "io.traa.core") + set(TRAA_LIBRARY_IDENTIFIER "org.opentraa.traa") target_link_libraries(${TRAA_LIBRARY_MAIN} PRIVATE "${TRAA_LIBRARY_FRAMEWORKS}") diff --git a/tests/smoke_test/CMakeLists.txt b/tests/smoke_test/CMakeLists.txt index e6bcec3..8d1fb53 100644 --- a/tests/smoke_test/CMakeLists.txt +++ b/tests/smoke_test/CMakeLists.txt @@ -52,7 +52,7 @@ set_target_properties(${TRAA_SMOKE_TEST} PROPERTIES # platform flags if(APPLE) - set(TRAA_SMOKE_TEST_IDENTIFIER "io.traa.smoketest") + set(TRAA_SMOKE_TEST_IDENTIFIER "org.opentraa.traa.smoketest") target_link_libraries(${TRAA_SMOKE_TEST} PRIVATE "${TRAA_LIBRARY_FRAMEWORKS}") diff --git a/tests/unit_test/CMakeLists.txt b/tests/unit_test/CMakeLists.txt index 37b55e5..fbd4593 100644 --- a/tests/unit_test/CMakeLists.txt +++ b/tests/unit_test/CMakeLists.txt @@ -163,7 +163,7 @@ set_target_properties(${TRAA_UNIT_TEST} PROPERTIES # platform flags if(APPLE) - set(TRAA_UNIT_TEST_IDENTIFIER "io.traa.unittest") + set(TRAA_UNIT_TEST_IDENTIFIER "org.opentraa.traa.unittest") target_link_libraries(${TRAA_UNIT_TEST} PRIVATE "${TRAA_LIBRARY_FRAMEWORKS}")