Skip to content

Commit 594a7d0

Browse files
committed
Checks the for the latest Android cmdline-tools version by listing the directory.
1 parent 10db7ff commit 594a7d0

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
class IceBuildToolsConan(ConanFile):
1313
name = "ice-build-tools"
14-
version = "1.10.2"
14+
version = "1.10.3"
1515
user = "iceshard"
1616
channel = "stable"
1717

source/ice/platform/android.moon

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class Android
8282
@settings: {
8383
Setting "android.sdk_root" -- deprecated
8484
Setting "android.sdk.root"
85-
Setting "android.sdk.cmdline_tools_version", default:'13.0'
85+
Setting "android.sdk.cmdline_tools_version"
8686
Setting 'android.gradle.version', default:'8.14'
8787
Setting 'android.gradle.package_url', default:"https://downloads.gradle.org/distributions/gradle-{ver}-bin.zip"
8888
Setting 'android.gradle.local_install', default:'build/gradle'
@@ -146,10 +146,18 @@ class Android
146146

147147
Log\verbose "Selected Android SDK at location #{sdk_root}"
148148

149+
cmdline_tools_basepath = Path\join sdk_root, "cmdline-tools"
149150
cmdline_tools_version = (Setting\get "android.sdk.cmdline_tools_version") or "latest"
151+
if cmdline_tools_version == 'latest'
152+
cmdline_tools_version = '0.0'
153+
for path, m in Dir\list cmdline_tools_basepath, recursive:false
154+
if m == 'directory' and cmdline_tools_version < path
155+
cmdline_tools_version = path
156+
Log\verbose "Selecting new version for android command-line tools: #{cmdline_tools_version}"
157+
150158
possible_paths = {
151159
{ deprecated:true, source:'tools', location:Path\join sdk_root, "tools", "bin", "sdkmanager.bat" }
152-
{ source:'cmdline-tools', location:Path\join sdk_root, "cmdline-tools", cmdline_tools_version, "bin", "sdkmanager.bat" } -- This version is known to work better than latest
160+
{ source:'cmdline-tools', location:Path\join cmdline_tools_basepath, cmdline_tools_version, "bin", "sdkmanager.bat" } -- This version is known to work better than latest
153161
}
154162

155163
sdk_manager = nil

source/ice/platform/webasm.moon

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@ class WebAsm
6565
Log\verbose "Searching for WebAsm SDK in #{entry.source} path #{entry.location}..."
6666
Log\warning "Overriden WebAsm SDK location from #{sdk_root} to #{entry.location}" if sdk_root and sdk_root != entry.location
6767
sdk_root = entry.location
68-
Log\verbose "Selected WebAsm SDK at location #{sdk_root}"
6968

7069
return nil unless sdk_root
70+
Log\verbose "Selected WebAsm SDK at location #{sdk_root}"
71+
7172
emsdk_location = @find_webasm_sdk sdk_root
7273
return nil unless emsdk_location
7374
return { location: Path\join Dir\current!, emsdk_location }

0 commit comments

Comments
 (0)