Fix typo in GetSharedLibrariesDir() documentation
Fix error in wxMenuItem::GetDisabledBitmapBundle documentation Use the correct return type. Closes #25724.
Try running iOS build under macOS 14 The build doesn't work under macos-latest any more with xcodebuild complaining about not being to find iOS platform, so try running it under the previous versions. See #25727.
Try running iOS CI build under macOS 15 with Xcode 16.4 Explicitly select the Xcode version to use.
Merge branch 'ios-ci' Fix iOS CI after GitHub image changes. See #25728.
... | ... | @@ -90,14 +90,15 @@ jobs: |
90 | 90 | configuration: 'Release'
|
91 | 91 | project: samples/minimal/minimal_cocoa.xcodeproj
|
92 | 92 | - name: iOS static Debug
|
93 | - runner: macos-latest
|
|
93 | + runner: macos-15
|
|
94 | + xcode: Xcode_16.4
|
|
94 | 95 | scheme: 'static'
|
95 | 96 | destination: 'generic/platform=iOS'
|
96 | 97 | arch: x86_64
|
97 | 98 | configuration: 'Debug'
|
98 | 99 | project: build/osx/wxiphone.xcodeproj
|
99 | 100 | - name: iOS Simulator static
|
100 | - runner: macos-latest
|
|
101 | + runner: macos-15
|
|
101 | 102 | scheme: 'app-static'
|
102 | 103 | destination: 'generic/platform=iOS Simulator'
|
103 | 104 | arch: arm64
|
... | ... | @@ -114,6 +115,10 @@ jobs: |
114 | 115 | with:
|
115 | 116 | submodules: recursive
|
116 | 117 | |
118 | + - name: Configure Xcode
|
|
119 | + if: ${{ matrix.xcode }}
|
|
120 | + run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
|
|
121 | + |
|
117 | 122 | - name: Build
|
118 | 123 | run: |
|
119 | 124 | xcodebuild clean build ONLY_ACTIVE_ARCH=NO \
|
... | ... | @@ -224,7 +224,7 @@ public: |
224 | 224 | |
225 | 225 | @since 3.3.2
|
226 | 226 | */
|
227 | - wxBitmap GetDisabledBitmapBundle() const;
|
|
227 | + wxBitmapBundle GetDisabledBitmapBundle() const;
|
|
228 | 228 | |
229 | 229 | /**
|
230 | 230 | Returns the font associated with the menu item.
|
... | ... | @@ -442,7 +442,7 @@ public: |
442 | 442 | virtual wxString GetUserLocalDataDir() const;
|
443 | 443 | |
444 | 444 | /**
|
445 | - Return OS specific directory where project shared liraries are.
|
|
445 | + Return OS specific directory where project shared libraries are.
|
|
446 | 446 | |
447 | 447 | The function does the same thing as GetPluginsDir() under non-Mac platforms
|
448 | 448 | but differs from it under Mac, where plugins (shared libraries loaded by the
|
—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. Manage all notifications · Help