|
1 | 1 | import Path, Dir, File from require "ice.core.fs" |
| 2 | +import Version from require "ice.core.version" |
2 | 3 | import Exec, Where from require "ice.tools.exec" |
3 | 4 | import Zip from require "ice.tools.zip" |
4 | 5 | import Wget from require "ice.tools.wget" |
@@ -149,11 +150,17 @@ class Android |
149 | 150 | cmdline_tools_basepath = Path\join sdk_root, "cmdline-tools" |
150 | 151 | cmdline_tools_version = (Setting\get "android.sdk.cmdline_tools_version") or "latest" |
151 | 152 | 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}" |
| 153 | + unless Dir\exists Path\join cmdline_tools_basepath, cmdline_tools_version |
| 154 | + cmdline_tools_version = Version\from_str '0.0' |
| 155 | + |
| 156 | + -- Run over each path and compare versions |
| 157 | + for path, m in Dir\list cmdline_tools_basepath, recursive:false |
| 158 | + path_ver = Version\from_str path |
| 159 | + if path_ver and path_ver\newer cmdline_tools_version |
| 160 | + cmdline_tools_version = path_ver |
| 161 | + Log\verbose "Selecting new version for android command-line tools: #{cmdline_tools_version}" |
| 162 | + |
| 163 | + Log\info "Selectied version for android command-line tools: #{cmdline_tools_version}" |
157 | 164 |
|
158 | 165 | possible_paths = { |
159 | 166 | { deprecated:true, source:'tools', location:Path\join sdk_root, "tools", "bin", "sdkmanager.bat" } |
|
0 commit comments