Skip to content

Commit b93b96c

Browse files
Remove deprecated GMA C++ SDK and references
This change removes the Google Mobile Ads (GMA) C++ SDK, which has been deprecated. Modifications include: - Deletion of the 'gma' directory. - Removal of GMA references from CMakeLists, Gradle files, and other build scripts across all platforms (Android, iOS, Desktop). - Updates to workflow configurations and helper scripts to exclude GMA. - Adjustments to documentation (readme.md) to reflect the removal of GMA, while preserving its mention in historical release notes.
1 parent 55644d3 commit b93b96c

File tree

166 files changed

+10348
-453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+10348
-453
lines changed

.github/workflows/android.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
env:
1414
CCACHE_DIR: ${{ github.workspace }}/ccache_dir
1515
GITHUB_TOKEN: ${{ github.token }}
16-
xcodeVersion: "14.1" # Only affects Mac runners, and only for prerequisites.
16+
xcodeVersion: "16.2" # Only affects Mac runners, and only for prerequisites.
1717

1818
concurrency:
1919
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -50,13 +50,30 @@ jobs:
5050
os: ${{ fromJson(needs.prepare_matrix.outputs.matrix_os) }}
5151
architecture: ${{ fromJson(needs.prepare_matrix.outputs.matrix_architecture) }}
5252
python_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_python_version) }}
53+
exclude:
54+
# Do not attempt to use arm64 on Windows or Linux.
55+
- os: windows-latest
56+
architecture: arm64
57+
- os: ubuntu-22.04
58+
architecture: arm64
59+
# Do not attempt to use x64 on Mac.
60+
- os: macos-14
61+
architecture: x64
5362
steps:
63+
- uses: lukka/get-cmake@latest
64+
with:
65+
cmakeVersion: "~3.31.0"
5466
- name: setup Xcode version (macos)
5567
if: runner.os == 'macOS'
5668
run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
5769
- name: Force Java 11
70+
if: runner.os != 'macOS'
5871
shell: bash
5972
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
73+
- name: Force Java 11 (mac)
74+
if: runner.os == 'macOS'
75+
shell: bash
76+
run: echo "JAVA_HOME=${JAVA_HOME_11_arm64}" >> $GITHUB_ENV
6077
- name: Store git credentials for all git commands
6178
# Forces all git commands to use authenticated https, to prevent throttling.
6279
shell: bash

.github/workflows/build-report.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
schedule:
66
- cron: "0 21 * * *" # 9pm UTC = 1pm PST / 2pm PDT, 12 hours after testapps run
77

8+
permissions: write-all
9+
810
env:
911
GITHUB_TOKEN: ${{ github.token }}
1012
numDays: 7

.github/workflows/checks.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
pull_request:
55
types: [opened, reopened, synchronize, labeled, unlabeled]
66

7+
permissions: write-all
8+
79
env:
810
triggerLabelFull: "tests-requested: full"
911
triggerLabelQuick: "tests-requested: quick"
@@ -51,6 +53,9 @@ jobs:
5153
# This check succeeds if Doxygen documentation generates without errors.
5254
runs-on: ubuntu-22.04
5355
steps:
56+
- uses: lukka/get-cmake@latest
57+
with:
58+
cmakeVersion: "~3.31.0"
5459
- uses: actions/checkout@v3
5560
with:
5661
submodules: false

.github/workflows/checks_secure.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
pull_request_target:
66
types: [synchronize]
77

8+
permissions: write-all
9+
810
concurrency:
911
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
1012
cancel-in-progress: true

.github/workflows/cpp-packaging.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ env:
3232
demumbleVer: "df938e45c2b0e064fb5323d88b692d03b451d271"
3333
# Use SHA256 for hashing files.
3434
hashCommand: "sha256sum"
35-
# Xcode version 15.1 is the version we build the SDK with.
35+
# Xcode version 16.2 is the version we build the SDK with.
3636
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
37-
xcodeVersion: "15.1"
37+
xcodeVersion: "16.2"
3838
# LLVM version with ARM MachO support has no version number yet.
3939
llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534"
4040
GITHUB_TOKEN: ${{ github.token }}
@@ -79,17 +79,20 @@ jobs:
7979
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
8080
strategy:
8181
matrix:
82-
os: [ubuntu-22.04, macos-13]
82+
os: [ubuntu-22.04, macos-14]
8383
include:
8484
- os: ubuntu-22.04
8585
tools_platform: linux
8686
# Binutils 2.35.1 released Sep 19, 2020
8787
binutils_version: "2.35.1"
88-
- os: macos-13
88+
- os: macos-14
8989
tools_platform: darwin
9090
# Binutils 2.35.1 released Sep 19, 2020
9191
binutils_version: "2.35.1"
9292
steps:
93+
- uses: lukka/get-cmake@latest
94+
with:
95+
cmakeVersion: "~3.31.0"
9396
- name: setup Xcode version (macos)
9497
if: runner.os == 'macOS'
9598
run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
@@ -185,9 +188,12 @@ jobs:
185188

186189
build_and_package_ios_tvos:
187190
name: build-and-package-ios-tvos
188-
runs-on: macos-13
191+
runs-on: macos-14
189192
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
190193
steps:
194+
- uses: lukka/get-cmake@latest
195+
with:
196+
cmakeVersion: "~3.31.0"
191197
- name: Store git credentials for all git commands
192198
# Forces all git commands to use authenticated https, to prevent throttling.
193199
shell: bash
@@ -248,6 +254,9 @@ jobs:
248254
strategy:
249255
fail-fast: false
250256
steps:
257+
- uses: lukka/get-cmake@latest
258+
with:
259+
cmakeVersion: "~3.31.0"
251260
- name: Force Java 11
252261
shell: bash
253262
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
@@ -308,7 +317,7 @@ jobs:
308317
strategy:
309318
fail-fast: false
310319
matrix:
311-
os: [windows-latest, ubuntu-22.04, macos-13]
320+
os: [windows-latest, ubuntu-22.04, macos-14]
312321
build_type: ["Release", "Debug"]
313322
architecture: ["x64", "x86", "arm64"]
314323
msvc_runtime: ["static", "dynamic"]
@@ -326,21 +335,21 @@ jobs:
326335
vcpkg_triplet_suffix: "linux"
327336
additional_build_flags: ""
328337
sdk_platform: "linux"
329-
- os: macos-13
338+
- os: macos-14
330339
vcpkg_triplet_suffix: "osx"
331340
additional_build_flags: "--target_format libraries"
332341
sdk_platform: "darwin"
333342

334343
exclude:
335344
- os: windows-latest
336345
linux_abi: "c++11"
337-
- os: macos-13
346+
- os: macos-14
338347
architecture: "x86"
339-
- os: macos-13
348+
- os: macos-14
340349
msvc_runtime: "dynamic"
341-
- os: macos-13
350+
- os: macos-14
342351
linux_abi: "c++11"
343-
- os: macos-13
352+
- os: macos-14
344353
build_type: "Debug"
345354
- os: ubuntu-22.04
346355
msvc_runtime: "dynamic"
@@ -352,6 +361,9 @@ jobs:
352361
architecture: "arm64"
353362

354363
steps:
364+
- uses: lukka/get-cmake@latest
365+
with:
366+
cmakeVersion: "~3.31.0"
355367
- name: Store git credentials for all git commands
356368
# Forces all git commands to use authenticated https, to prevent throttling.
357369
shell: bash
@@ -492,7 +504,7 @@ jobs:
492504
suffix: '-x64-Debug-dynamic'
493505
runs_on_platform: ubuntu-22.04
494506
- sdk_platform: darwin
495-
runs_on_platform: macos-13
507+
runs_on_platform: macos-14
496508
exclude:
497509
- sdk_platform: windows
498510
suffix: ''

.github/workflows/desktop.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,13 @@ jobs:
7272
# msvc_runtime excludes
7373
- os: ubuntu-22.04
7474
msvc_runtime: "dynamic"
75-
- os: macos-13
75+
- os: macos-14
7676
msvc_runtime: "dynamic"
7777
# architecture excluees
78-
- os: macos-13
78+
- os: macos-14
7979
architecture: "x86"
80+
- os: macos-14
81+
architecture: "x64"
8082
# Xcode excludes -- allow only one on osx and linux
8183
- os: ubuntu-22.04
8284
xcode_version: "11.7"
@@ -95,6 +97,9 @@ jobs:
9597
- xcode_version: "11.7"
9698
architecture: "arm64"
9799
steps:
100+
- uses: lukka/get-cmake@latest
101+
with:
102+
cmakeVersion: "~3.31.0"
98103
- name: Store git credentials for all git commands
99104
# Forces all git commands to use authenticated https, to prevent throttling.
100105
shell: bash
@@ -165,9 +170,17 @@ jobs:
165170

166171
- name: Setup python
167172
uses: actions/setup-python@v4
173+
if: startsWith(matrix.os, 'ubuntu')
168174
with:
169175
python-version: ${{ matrix.python_version }}
170-
architecture: 'x64'
176+
architecture: x64
177+
178+
- name: Setup python (Mac)
179+
uses: actions/setup-python@v4
180+
if: startsWith(matrix.os, 'macos')
181+
with:
182+
python-version: ${{ matrix.python_version }}
183+
architecture: ${{ matrix.architecture }}
171184

172185
- name: Install Desktop SDK prerequisites
173186
uses: nick-invision/retry@v2
@@ -296,6 +309,9 @@ jobs:
296309
strategy:
297310
fail-fast: false
298311
steps:
312+
- uses: lukka/get-cmake@latest
313+
with:
314+
cmakeVersion: "~3.31.0"
299315
- uses: actions/checkout@v3
300316
with:
301317
ref: ${{needs.check_and_prepare.outputs.github_ref}}

0 commit comments

Comments
 (0)