robert.rozman/classroom
1
0
Fork 0
forked from rc/classroom
Code Pull requests Activity

Bump versions, fix installers

Browse source
This commit is contained in:
Gašper Fele-Žorž 2025-08-15 23:04:26 +02:00
parent fc56d17bb6
commit e845b92ce0
24 changed files with 267 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

17
roles/android_studio/tasks/androidsdk_packages.yml
View file

@ -2,9 +2,8 @@ AndroidSDK_packages:
- add-ons;addon-google_apis-google-24
- add-ons;addon-google_apis-google-24
- build-tools;34.0.0-rc3
- build-tools;35.0.0
- cmake;3.22.1
#- cmake;latest
- build-tools;36.0.0
- cmake;4.0.3
- cmdline-tools;latest
- emulator
- extras;android;m2repository
@ -22,15 +21,15 @@ AndroidSDK_packages:
# - patcher;v4
- platform-tools
- platforms;android-34
- platforms;android-35
- platforms;android-36
- platforms;android-32
- platforms;android-UpsideDownCakePrivacySandbox
# - platforms;android-UpsideDownCakePrivacySandbox
- skiaparser;3
- sources;android-35
- sources;android-36
- sources;android-34
- system-images;android-35;google_apis;x86_64
- system-images;android-36;google_apis;x86_64
- system-images;android-34;google_apis;x86_64
- system-images;android-32;google_apis;x86_64
- system-images;android-35;google_apis_playstore;x86_64
- system-images;android-36;google_apis_playstore;x86_64
- system-images;android-34;google_apis_playstore;x86_64
- system-images;android-UpsideDownCakePrivacySandbox;google_apis_playstore;x86_64
# - system-images;android-UpsideDownCakePrivacySandbox;google_apis_playstore;x86_64

18
roles/android_studio/tasks/main_win.yml
View file

@ -6,7 +6,7 @@
- name: Check Android Studio tools
win_stat:
path: "{{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager.bat"
path: "{{ sdk_path }}\\platform-tools\\adb.exe"
register: tools
- when: not tools.stat.exists
@ -19,20 +19,20 @@
- name: Extract Android Studio tools
win_unzip:
src: "C:\\commandlinetools-win-{{ tools_version }}.zip"
dest: "{{ sdk_path }}\\cmdline-tools"
src: "C:\\platform-tools-{{ tools_version }}-windows.zip"
dest: "{{ sdk_path }}\\"
delete_archive: yes
- name: Accept Android SDK licenses
win_shell: sh -c "yes | /c/android-sdk/cmdline-tools/cmdline-tools/bin/sdkmanager.bat --licenses"
# - name: Accept Android SDK licenses
# win_shell: sh -c "yes | /c/android-sdk/cmdline-tools/cmdline-tools/bin/sdkmanager.bat --licenses"
- name: Include Android SDK packages
include_vars: androidsdk_packages.yml
- name: Install Android SDK
win_shell: |
{{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager --install "{{ item }}"
loop: "{{ AndroidSDK_packages }}"
#- name: Install Android SDK
# win_shell: |
# {{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager --install "{{ item }}"
# loop: "{{ AndroidSDK_packages }}"
# {{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager --install "{{ AndroidSDK_packages | join(' ') }}"