Skip to content

Commit 9a42624

Browse files
StuartFergusonStuartFerguson
committed
Update Android SDK to API level 35 and .NET target version
Updated the Android SDK setup in `android_e2e_tests.yml` and `android_navigation_tests.yml` to install API level 35 and its system images, along with updating build tools to version 35.0.0. Modified the iOS supported OS platform version from 11.0 to 12.2 in `TransactionMobile.Maui.BusinessLogic.csproj` and `TransactionMobile.Maui.csproj`, and added `NET9_TARGET` to the `DefineConstants` property to target .NET 9.0.
1 parent ec8fb6c commit 9a42624

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎.github/workflows/android_e2e_tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
# Accept licenses and install required components
4949
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
5050
# Install Android API level 34 and necessary system images
51-
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-34" "system-images;android-34;google_apis;x86_64"
51+
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-34;google_apis;x86_64"
5252
5353
# Export paths for future steps
5454
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
@@ -63,7 +63,7 @@ jobs:
6363

6464
- name: Create Android Emulator (x86)
6565
run: |
66-
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-34;google_apis;x86_64" --device "pixel_4"
66+
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
6767
6868
- name: List AVDs
6969
run: avdmanager list avd
@@ -124,7 +124,7 @@ jobs:
124124
- name: Install Android Build Tools
125125
run: |
126126
echo "Installing Android Build Tools..."
127-
sdkmanager "build-tools;34.0.0" # Updated to use Android 34 build tools
127+
sdkmanager "build-tools;35.0.0" # Updated to use Android 34 build tools
128128
sdkmanager --update
129129
130130
- name: Install MAUI workloads

‎.github/workflows/android_navigation_tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
# Accept licenses and install required components
4949
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
5050
# Install Android API level 34 and necessary system images
51-
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-34" "system-images;android-34;google_apis;x86_64"
51+
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
5252
5353
# Export paths for future steps
5454
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
@@ -63,7 +63,7 @@ jobs:
6363

6464
- name: Create Android Emulator (x86)
6565
run: |
66-
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-34;google_apis;x86_64" --device "pixel_4"
66+
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
6767
6868
- name: List AVDs
6969
run: avdmanager list avd
@@ -124,7 +124,7 @@ jobs:
124124
- name: Install Android Build Tools
125125
run: |
126126
echo "Installing Android Build Tools..."
127-
sdkmanager "build-tools;34.0.0" # Updated to use Android 34 build tools
127+
sdkmanager "build-tools;35.0.0" # Updated to use Android 34 build tools
128128
sdkmanager --update
129129
130130
- name: Install MAUI workloads
@@ -198,7 +198,7 @@ jobs:
198198
# Accept licenses and install required components
199199
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
200200
# Install Android API level 34 and necessary system images
201-
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-34" "system-images;android-34;google_apis;x86_64"
201+
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
202202
203203
# Export paths for future steps
204204
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
@@ -209,11 +209,11 @@ jobs:
209209
uses: actions/cache@v3
210210
with:
211211
path: ~/.android/avd
212-
key: android-emulator-x86-${{ runner.os }}-android-34
212+
key: android-emulator-x86-${{ runner.os }}-android-35
213213

214214
- name: Create Android Emulator (x86)
215215
run: |
216-
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-34;google_apis;x86_64" --device "pixel_4"
216+
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
217217
218218
- name: List AVDs
219219
run: avdmanager list avd
@@ -274,7 +274,7 @@ jobs:
274274
- name: Install Android Build Tools
275275
run: |
276276
echo "Installing Android Build Tools..."
277-
sdkmanager "build-tools;34.0.0" # Updated to use Android 34 build tools
277+
sdkmanager "build-tools;35.0.0" # Updated to use Android 34 build tools
278278
sdkmanager --update
279279
280280
- name: Install MAUI workloads

‎TransactionMobile.Maui.BusinessLogic/TransactionMobile.Maui.BusinessLogic.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<DebugType>Full</DebugType>
2424
<ImplicitUsings>enable</ImplicitUsings>
2525

26-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
26+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
2727
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
2828
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
2929
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
@@ -32,7 +32,7 @@
3232
</PropertyGroup>
3333

3434
<PropertyGroup Condition="$(TargetFramework) == 'net9.0'">
35-
<DefineConstants>$(DefineConstants);NET8_TARGET</DefineConstants>
35+
<DefineConstants>$(DefineConstants);NET9_TARGET</DefineConstants>
3636
</PropertyGroup>
3737

3838
<ItemGroup>

‎TransactionMobile.Maui/TransactionMobile.Maui.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<ApplicationDisplayVersion>1</ApplicationDisplayVersion>
3333

3434
<!-- Supported OS platform versions per platform -->
35-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
35+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
3636
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
3737
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
3838
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>

0 commit comments

Comments
 (0)