Skip to content

Commit

Permalink
Load Android SDK packages from a separate file
Browse files Browse the repository at this point in the history
  • Loading branch information
@ofalvai
ofalvai committed Jul 18, 2023
1 parent b82665c commit c54c68c
Show file tree
Hide file tree
Showing 18 changed files with 89 additions and 42 deletions.
1 change: 1 addition & 0 deletions content/stack_reports/osx-xcode-14.1.x-ventura.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Available runtimes and devices:
### Android development

{{< generic filepath="data/osx-xcode-14.1.x-ventura/android.json">}}
{{< android-sdk filepath="data/osx-xcode-14.1.x-ventura/android-sdk.txt" >}}

### Generic tools

Expand Down
1 change: 1 addition & 0 deletions content/stack_reports/osx-xcode-14.2.x-ventura.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Available runtimes and devices:
### Android development

{{< generic filepath="data/osx-xcode-14.2.x-ventura/android.json">}}
{{< android-sdk filepath="data/osx-xcode-14.2.x-ventura/android-sdk.txt" >}}

### Generic tools

Expand Down
1 change: 1 addition & 0 deletions content/stack_reports/osx-xcode-14.3.x-edge.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Available runtimes and devices:
### Android development

{{< generic filepath="data/osx-xcode-14.3.x-edge/android.json">}}
{{< android-sdk filepath="data/osx-xcode-14.3.x-edge/android-sdk.txt" >}}

### Generic tools

Expand Down
1 change: 1 addition & 0 deletions content/stack_reports/osx-xcode-14.3.x-ventura.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Available runtimes and devices:
### Android development

{{< generic filepath="data/osx-xcode-14.3.x-ventura/android.json">}}
{{< android-sdk filepath="data/osx-xcode-14.3.x-ventura/android-sdk.txt" >}}

### Generic tools

Expand Down
1 change: 1 addition & 0 deletions content/stack_reports/osx-xcode-15.0.x-edge.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Available runtimes and devices:
### Android development

{{< generic filepath="data/osx-xcode-15.0.x-edge/android.json">}}
{{< android-sdk filepath="data/osx-xcode-15.0.x-edge/android-sdk.txt" >}}

### Generic tools

Expand Down
13 changes: 13 additions & 0 deletions data/osx-xcode-14.0.x-ventura/android-sdk.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Path | Version | Description | Location
------- | ------- | ------- | -------
add-ons;addon-google_apis-google-24 | 1 | Google APIs | add-ons/addon-google_apis-google-24
build-tools;32.0.0 | 32.0.0 | Android SDK Build-Tools 32 | build-tools/32.0.0
build-tools;32.1.0-rc1 | 32.1.0 rc1 | Android SDK Build-Tools 32.1-rc1 | build-tools/32.1.0-rc1
cmake;3.10.2.4988404 | 3.10.2 | CMake 3.10.2.4988404 | cmake/3.10.2.4988404
cmake;3.22.1 | 3.22.1 | CMake 3.22.1 | cmake/3.22.1
emulator | 31.3.14 | Android Emulator | emulator
extras;google;google_play_services | 49 | Google Play services | extras/google/google_play_services
ndk-bundle | 24.0.8215888 | Android NDK | ndk-bundle
patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4
platform-tools | 33.0.3 | Android SDK Platform-Tools | platform-tools
platforms;android-32 | 1 | Android SDK Platform 32 | platforms/android-32
7 changes: 0 additions & 7 deletions data/osx-xcode-14.0.x-ventura/android.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
"category": "android",
"output": {
"items": [
{
"name": "Android SDK components",
"category": "android",
"version": "",
"raw_output": "Loading package information... \rLoading local repository... \r[========= ] 25% Loading local repository... \r[========= ] 25% Fetch remote repository... \r[=======================================] 100% Fetch remote repository... \rInstalled packages:\n Path | Version | Description | Location \n ------- | ------- | ------- | ------- \n add-ons;addon-google_apis-google-24 | 1 | Google APIs | add-ons/addon-google_apis-google-24 \n build-tools;32.0.0 | 32.0.0 | Android SDK Build-Tools 32 | build-tools/32.0.0 \n build-tools;32.1.0-rc1 | 32.1.0 rc1 | Android SDK Build-Tools 32.1-rc1 | build-tools/32.1.0-rc1 \n cmake;3.10.2.4988404 | 3.10.2 | CMake 3.10.2.4988404 | cmake/3.10.2.4988404 \n cmake;3.22.1 | 3.22.1 | CMake 3.22.1 | cmake/3.22.1 \n emulator | 31.3.14 | Android Emulator | emulator \n extras;android;m2repository | 47.0.0 | Android Support Repository | extras/android/m2repository \n extras;google;google_play_services | 49 | Google Play services | extras/google/google_play_services \n extras;google;m2repository | 58 | Google Repository | extras/google/m2repository \n extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1 | 1 | Solver for ConstraintLayout 1.0.1 | extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1\n extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2 | 1 | Solver for ConstraintLayout 1.0.2 | extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2\n extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 | 1 | ConstraintLayout for Android 1.0.1 | extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1 \n extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 | 1 | ConstraintLayout for Android 1.0.2 | extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2 \n ndk-bundle | 24.0.8215888 | Android NDK | ndk-bundle \n patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4 \n platform-tools | 33.0.3 | Android SDK Platform-Tools | platform-tools \n platforms;android-32 | 1 | Android SDK Platform 32 | platforms/android-32",
"executed_command": "sdkmanager --list_installed"
},
{
"name": "Emulator version",
"category": "android",
Expand Down
13 changes: 13 additions & 0 deletions data/osx-xcode-14.1.x-ventura/android-sdk.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Path | Version | Description | Location
------- | ------- | ------- | -------
add-ons;addon-google_apis-google-24 | 1 | Google APIs | add-ons/addon-google_apis-google-24
build-tools;32.0.0 | 32.0.0 | Android SDK Build-Tools 32 | build-tools/32.0.0
build-tools;32.1.0-rc1 | 32.1.0 rc1 | Android SDK Build-Tools 32.1-rc1 | build-tools/32.1.0-rc1
cmake;3.10.2.4988404 | 3.10.2 | CMake 3.10.2.4988404 | cmake/3.10.2.4988404
cmake;3.22.1 | 3.22.1 | CMake 3.22.1 | cmake/3.22.1
emulator | 31.3.14 | Android Emulator | emulator
extras;google;google_play_services | 49 | Google Play services | extras/google/google_play_services
ndk-bundle | 24.0.8215888 | Android NDK | ndk-bundle
patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4
platform-tools | 33.0.3 | Android SDK Platform-Tools | platform-tools
platforms;android-32 | 1 | Android SDK Platform 32 | platforms/android-32
7 changes: 0 additions & 7 deletions data/osx-xcode-14.1.x-ventura/android.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
"category": "android",
"output": {
"items": [
{
"name": "Android SDK components",
"category": "android",
"version": "",
"raw_output": "Loading package information... \rLoading local repository... \r[========= ] 25% Loading local repository... \r[========= ] 25% Fetch remote repository... \r[=======================================] 100% Fetch remote repository... \rInstalled packages:\n Path | Version | Description | Location \n ------- | ------- | ------- | ------- \n add-ons;addon-google_apis-google-24 | 1 | Google APIs | add-ons/addon-google_apis-google-24 \n build-tools;32.0.0 | 32.0.0 | Android SDK Build-Tools 32 | build-tools/32.0.0 \n build-tools;32.1.0-rc1 | 32.1.0 rc1 | Android SDK Build-Tools 32.1-rc1 | build-tools/32.1.0-rc1 \n cmake;3.10.2.4988404 | 3.10.2 | CMake 3.10.2.4988404 | cmake/3.10.2.4988404 \n cmake;3.22.1 | 3.22.1 | CMake 3.22.1 | cmake/3.22.1 \n emulator | 31.3.14 | Android Emulator | emulator \n extras;android;m2repository | 47.0.0 | Android Support Repository | extras/android/m2repository \n extras;google;google_play_services | 49 | Google Play services | extras/google/google_play_services \n extras;google;m2repository | 58 | Google Repository | extras/google/m2repository \n extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1 | 1 | Solver for ConstraintLayout 1.0.1 | extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1\n extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2 | 1 | Solver for ConstraintLayout 1.0.2 | extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2\n extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 | 1 | ConstraintLayout for Android 1.0.1 | extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1 \n extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 | 1 | ConstraintLayout for Android 1.0.2 | extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2 \n ndk-bundle | 24.0.8215888 | Android NDK | ndk-bundle \n patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4 \n platform-tools | 33.0.3 | Android SDK Platform-Tools | platform-tools \n platforms;android-32 | 1 | Android SDK Platform 32 | platforms/android-32",
"executed_command": "sdkmanager --list_installed"
},
{
"name": "Emulator version",
"category": "android",
Expand Down
13 changes: 13 additions & 0 deletions data/osx-xcode-14.2.x-ventura/android-sdk.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Path | Version | Description | Location
------- | ------- | ------- | -------
add-ons;addon-google_apis-google-24 | 1 | Google APIs | add-ons/addon-google_apis-google-24
build-tools;32.0.0 | 32.0.0 | Android SDK Build-Tools 32 | build-tools/32.0.0
build-tools;32.1.0-rc1 | 32.1.0 rc1 | Android SDK Build-Tools 32.1-rc1 | build-tools/32.1.0-rc1
cmake;3.10.2.4988404 | 3.10.2 | CMake 3.10.2.4988404 | cmake/3.10.2.4988404
cmake;3.22.1 | 3.22.1 | CMake 3.22.1 | cmake/3.22.1
emulator | 31.3.14 | Android Emulator | emulator
extras;google;google_play_services | 49 | Google Play services | extras/google/google_play_services
ndk-bundle | 24.0.8215888 | Android NDK | ndk-bundle
patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4
platform-tools | 33.0.3 | Android SDK Platform-Tools | platform-tools
platforms;android-32 | 1 | Android SDK Platform 32 | platforms/android-32
Loading

0 comments on commit c54c68c

Please sign in to comment.